Changeset 544 for trunk/aclocal.m4

Timestamp:

Feb 17, 2019, 2:41:49 PM (6 years ago)

Author:

katerina

Message:

Fix for ticket #436 (new gcc compiler options, including LTO).

File:

• trunk/aclocal.m4 (modified) (2 diffs)

trunk/aclocal.m4

@@ -1125 +1125 @@
   AC_LANG_ASSERT(C)
   if test "X$CC" != "X"; then
-    AC_CACHE_CHECK([whether ${CC} accepts -fstack-protector-all],
+    AC_CACHE_CHECK([whether ${CC} accepts -fstack-protector-strong],
       ssp_cv_cc,
       [ssp_old_cflags="$CFLAGS"
-       CFLAGS="$CFLAGS -fstack-protector-all"
+       CFLAGS="$CFLAGS -fstack-protector-strong"
        AC_TRY_COMPILE(,, ssp_cv_cc=yes, ssp_cv_cc=no)
        CFLAGS="$ssp_old_cflags"
       ])
     if test $ssp_cv_cc = no; then
-      AC_CACHE_CHECK([whether ${CC} accepts -fstack-protector],
+      AC_CACHE_CHECK([whether ${CC} accepts -fstack-protector-all],
         ssp_cv_cc,
         [ssp_old_cflags="$CFLAGS"
-         CFLAGS="$CFLAGS -fstack-protector"
+         CFLAGS="$CFLAGS -fstack-protector-all"
          AC_TRY_COMPILE(,, ssp_cv_cc=yes, ssp_cv_cc=no)
          CFLAGS="$ssp_old_cflags"
         ])
-      if test $ssp_cv_cc = yes; then
-        CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector"
-        LDFLAGS="$LDFLAGS -fstack-protector"
-        AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
+      if test $ssp_cv_cc = no; then
+        AC_CACHE_CHECK([whether ${CC} accepts -fstack-protector],
+          ssp_cv_cc,
+          [ssp_old_cflags="$CFLAGS"
+           CFLAGS="$CFLAGS -fstack-protector"
+           AC_TRY_COMPILE(,, ssp_cv_cc=yes, ssp_cv_cc=no)
+           CFLAGS="$ssp_old_cflags"
+          ])
+        if test $ssp_cv_cc = yes; then
+          CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector"
+          LDFLAGS="$LDFLAGS -fstack-protector"
+          AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
+        fi
+      else
+        if test $ssp_cv_cc = yes; then
+          CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector-all"
+          LDFLAGS="$LDFLAGS -fstack-protector-all"
+          AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
+        fi
       fi
     else
       if test $ssp_cv_cc = yes; then
-        CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector-all"
-        LDFLAGS="$LDFLAGS -fstack-protector-all"
+        CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector-strong"
+        LDFLAGS="$LDFLAGS -fstack-protector-strong"
         AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
       fi
@@ -1211 +1226 @@
   AC_LANG_ASSERT(C)
   if test "X$CC" != "X"; then
-    AC_CACHE_CHECK([whether ${CC} accepts -fstack-check],
+    AC_CACHE_CHECK([whether ${CC} accepts -fstack-clash-protection],
       stackcheck_cv_cc,
       [stackcheck_old_cflags="$CFLAGS"
-       CFLAGS="$CFLAGS -fstack-check"
+       CFLAGS="$CFLAGS -fstack-clash-protection"
        AC_TRY_COMPILE(,, stackcheck_cv_cc=yes, stackcheck_cv_cc=no)
        CFLAGS="$stackcheck_old_cflags"
       ])
     if test $stackcheck_cv_cc = yes; then
-      CFLAGS="$CFLAGS -fstack-check"
+      CFLAGS="$CFLAGS -fstack-clash-protection"
     fi
   fi