diff options
Diffstat (limited to 'm4/openssh.m4')
| -rw-r--r-- | m4/openssh.m4 | 116 |
1 files changed, 65 insertions, 51 deletions
diff --git a/m4/openssh.m4 b/m4/openssh.m4 index 8c33c701b..5d4c56280 100644 --- a/m4/openssh.m4 +++ b/m4/openssh.m4 @@ -1,30 +1,38 @@ dnl OpenSSH-specific autoconf macros dnl -dnl OSSH_CHECK_CFLAG_COMPILE(check_flag[, define_flag]) -dnl Check that $CC accepts a flag 'check_flag'. If it is supported append -dnl 'define_flag' to $CFLAGS. If 'define_flag' is not specified, then append -dnl 'check_flag'. -AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ - AC_MSG_CHECKING([if $CC supports compile flag $1]) - saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $WERROR $1" - _define_flag="$2" - test "x$_define_flag" = "x" && _define_flag="$1" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ +dnl The test program that is used to try to trigger various compiler +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 */ -void f(int n) {} +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], *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; double m = l / 0.5; long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; - f(0); - printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); + 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 @@ -37,15 +45,35 @@ int main(int argc, char **argv) { } exit(0); } - ]])], + ]])] +) + +dnl OSSH_CHECK_CFLAG_COMPILE(check_flag[, define_flag]) +dnl Check that $CC accepts a flag 'check_flag'. If it is supported append +dnl 'define_flag' to $CFLAGS. If 'define_flag' is not specified, then append +dnl 'check_flag'. +AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ + AC_MSG_CHECKING([if $CC supports compile flag $1]) + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $WERROR $1" + _define_flag="$2" + test "x$_define_flag" = "x" && _define_flag="$1" + AC_COMPILE_IFELSE([OSSH_COMPILER_FLAG_TEST_PROGRAM], [ if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null then AC_MSG_RESULT([no]) CFLAGS="$saved_CFLAGS" else - AC_MSG_RESULT([yes]) - CFLAGS="$saved_CFLAGS $_define_flag" + dnl If we are compiling natively, try running the program. + AC_RUN_IFELSE([OSSH_COMPILER_FLAG_TEST_PROGRAM], + [ AC_MSG_RESULT([yes]) + CFLAGS="$saved_CFLAGS $_define_flag" ], + [ AC_MSG_RESULT([no, fails at run time]) + CFLAGS="$saved_CFLAGS" ], + [ AC_MSG_RESULT([yes]) + CFLAGS="$saved_CFLAGS $_define_flag" ], + ) fi], [ AC_MSG_RESULT([no]) CFLAGS="$saved_CFLAGS" ] @@ -62,29 +90,22 @@ AC_DEFUN([OSSH_CHECK_CFLAG_LINK], [{ CFLAGS="$CFLAGS $WERROR $1" _define_flag="$2" test "x$_define_flag" = "x" && _define_flag="$1" - AC_LINK_IFELSE([AC_LANG_SOURCE([[ -#include <stdlib.h> -#include <stdio.h> -int main(int argc, char **argv) { - (void)argv; - /* Some math to catch -ftrapv problems in the toolchain */ - int i = 123 * argc, j = 456 + argc, k = 789 - argc; - float l = i * 2.1; - double m = l / 0.5; - long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; - long long int p = n * o; - printf("%d %d %d %f %f %lld %lld %lld\n", i, j, k, l, m, n, o, p); - exit(0); -} - ]])], + AC_LINK_IFELSE([OSSH_COMPILER_FLAG_TEST_PROGRAM], [ if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null then AC_MSG_RESULT([no]) CFLAGS="$saved_CFLAGS" else - AC_MSG_RESULT([yes]) - CFLAGS="$saved_CFLAGS $_define_flag" + dnl If we are compiling natively, try running the program. + AC_RUN_IFELSE([OSSH_COMPILER_FLAG_TEST_PROGRAM], + [ AC_MSG_RESULT([yes]) + CFLAGS="$saved_CFLAGS $_define_flag" ], + [ AC_MSG_RESULT([no, fails at run time]) + CFLAGS="$saved_CFLAGS" ], + [ AC_MSG_RESULT([yes]) + CFLAGS="$saved_CFLAGS $_define_flag" ], + ) fi], [ AC_MSG_RESULT([no]) CFLAGS="$saved_CFLAGS" ] @@ -101,29 +122,22 @@ AC_DEFUN([OSSH_CHECK_LDFLAG_LINK], [{ LDFLAGS="$LDFLAGS $WERROR $1" _define_flag="$2" test "x$_define_flag" = "x" && _define_flag="$1" - AC_LINK_IFELSE([AC_LANG_SOURCE([[ -#include <stdlib.h> -#include <stdio.h> -int main(int argc, char **argv) { - (void)argv; - /* Some math to catch -ftrapv problems in the toolchain */ - int i = 123 * argc, j = 456 + argc, k = 789 - argc; - float l = i * 2.1; - double m = l / 0.5; - long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; - long long p = n * o; - printf("%d %d %d %f %f %lld %lld %lld\n", i, j, k, l, m, n, o, p); - exit(0); -} - ]])], + AC_LINK_IFELSE([OSSH_COMPILER_FLAG_TEST_PROGRAM], [ if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null then AC_MSG_RESULT([no]) LDFLAGS="$saved_LDFLAGS" else - AC_MSG_RESULT([yes]) - LDFLAGS="$saved_LDFLAGS $_define_flag" + dnl If we are compiling natively, try running the program. + AC_RUN_IFELSE([OSSH_COMPILER_FLAG_TEST_PROGRAM], + [ AC_MSG_RESULT([yes]) + LDFLAGS="$saved_LDFLAGS $_define_flag" ], + [ AC_MSG_RESULT([no, fails at run time]) + LDFLAGS="$saved_LDFLAGS" ], + [ AC_MSG_RESULT([yes]) + LDFLAGS="$saved_LDFLAGS $_define_flag" ] + ) fi ], [ AC_MSG_RESULT([no]) LDFLAGS="$saved_LDFLAGS" ] |