diff options
| author | Damien Miller <djm@mindrot.org> | 2023-12-18 14:49:11 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-12-18 14:49:11 +1100 |
| commit | 59d691b886c79e70b1d1c4ab744e81fd176222fd (patch) | |
| tree | cd06e8849c605bac35706a60db7e9c65dd75d8cc | |
| parent | aa7b21708511a6d4aed3839fc9f6e82e849dd4a1 (diff) | |
| download | openssh-59d691b886c79e70b1d1c4ab744e81fd176222fd.tar.gz | |
better detection of broken -fzero-call-used-regs
Use OSSH_CHECK_CFLAG_LINK() for detection of these flags and extend
test program to exercise varargs, which seems to catch more stuff.
ok dtucker@
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | m4/openssh.m4 | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 36e1028e1..379cd746b 100644 --- a/configure.ac +++ b/configure.ac @@ -234,9 +234,9 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then # clang 17 has a different bug that causes an ICE when using this # flag at all (https://bugzilla.mindrot.org/show_bug.cgi?id=3629) case "$CLANG_VER" in - apple-15*) OSSH_CHECK_CFLAG_COMPILE([-fzero-call-used-regs=used]) ;; + apple-15*) OSSH_CHECK_CFLAG_LINK([-fzero-call-used-regs=used]) ;; 17*) ;; - *) OSSH_CHECK_CFLAG_COMPILE([-fzero-call-used-regs=used]) ;; + *) OSSH_CHECK_CFLAG_LINK([-fzero-call-used-regs=used]) ;; esac OSSH_CHECK_CFLAG_COMPILE([-ftrivial-auto-var-init=zero]) fi diff --git a/m4/openssh.m4 b/m4/openssh.m4 index 6a1fa9b0e..5d4c56280 100644 --- a/m4/openssh.m4 +++ b/m4/openssh.m4 @@ -6,13 +6,23 @@ dnl behaviours. AC_DEFUN([OSSH_COMPILER_FLAG_TEST_PROGRAM], [AC_LANG_SOURCE([[ #include <stdlib.h> +#include <stdarg.h> #include <stdio.h> +#include <string.h> #include <unistd.h> /* Trivial function to help test for -fzero-call-used-regs */ int f(int n) {return rand() % n;} +char *f2(char *s, ...) { + char ret[64]; + va_list args; + va_start(args, s); + vsnprintf(ret, sizeof(ret), s, args); + va_end(args); + return strdup(ret); +} int main(int argc, char **argv) { (void)argv; - char b[256]; + char b[256], *cp; /* Some math to catch -ftrapv problems in the toolchain */ int i = 123 * argc, j = 456 + argc, k = 789 - argc; float l = i * 2.1; @@ -21,6 +31,8 @@ int main(int argc, char **argv) { f(1); snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); if (write(1, b, 0) == -1) exit(0); + cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); + free(cp); /* * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does * not understand comments and we don't use the "fallthrough" attribute |