1 files changed, 82 insertions, 4 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 1b3bed790..1640683e1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.9 2013/06/02 21:31:27 tim Exp $
+dnl $Id: aclocal.m4,v 1.13 2014/01/22 10:30:12 djm Exp $
 dnl
 dnl OpenSSH-specific autoconf macros
 dnl
@@ -8,12 +8,24 @@ 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 $1])
+        AC_MSG_CHECKING([if $CC supports compile flag $1])
         saved_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $1"
+        CFLAGS="$CFLAGS $WERROR $1"
         _define_flag="$2"
         test "x$_define_flag" = "x" && _define_flag="$1"
-        AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(void) { return 0; }]])],
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **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;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+        ]])],
                 [
 if `grep -i "unrecognized option" conftest.err >/dev/null`
 then
@@ -28,6 +40,72 @@ fi],
         )
 }])
 
+dnl OSSH_CHECK_CFLAG_LINK(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_LINK], [{
+        AC_MSG_CHECKING([if $CC supports compile flag $1 and linking succeeds])
+        saved_CFLAGS="$CFLAGS"
+        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) {
+        /* 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;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+        ]])],
+                [
+if `grep -i "unrecognized option" conftest.err >/dev/null`
+then
+                AC_MSG_RESULT([no])
+                CFLAGS="$saved_CFLAGS"
+else
+                AC_MSG_RESULT([yes])
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi],
+                [ AC_MSG_RESULT([no])
+                  CFLAGS="$saved_CFLAGS" ]
+        )
+}])
+
+dnl OSSH_CHECK_LDFLAG_LINK(check_flag[, define_flag])
+dnl Check that $LD accepts a flag 'check_flag'. If it is supported append
+dnl 'define_flag' to $LDFLAGS. If 'define_flag' is not specified, then append
+dnl 'check_flag'.
+AC_DEFUN([OSSH_CHECK_LDFLAG_LINK], [{
+        AC_MSG_CHECKING([if $LD supports link flag $1])
+        saved_LDFLAGS="$LDFLAGS"
+        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) {
+        /* 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;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+                ]])],
+                [ AC_MSG_RESULT([yes])
+                  LDFLAGS="$saved_LDFLAGS $_define_flag"],
+                [ AC_MSG_RESULT([no])
+                  LDFLAGS="$saved_LDFLAGS" ]
+        )
+}])
 
 dnl OSSH_CHECK_HEADER_FOR_FIELD(field, header, symbol)
 dnl Does AC_EGREP_HEADER on 'header' for the string 'field'