aboutsummaryrefslogtreecommitdiff
path: root/libgfortran/configure
diff options
context:
space:
mode:
authorIgor Tsimbalist <igor.v.tsimbalist@intel.com>2017-11-17 23:44:59 +0100
committerIgor Tsimbalist <itsimbal@gcc.gnu.org>2017-11-17 23:44:59 +0100
commit26724ef992acda61f8d8f0b2bd84647177d491ce (patch)
tree81c3c0e07b0d7c694a6105f3d9008080bf50085f /libgfortran/configure
parent0495940618abcd98af709ba462c20c89bfd04fab (diff)
downloadgcc-26724ef992acda61f8d8f0b2bd84647177d491ce.zip
gcc-26724ef992acda61f8d8f0b2bd84647177d491ce.tar.gz
gcc-26724ef992acda61f8d8f0b2bd84647177d491ce.tar.bz2
Enable building libgfortran with Intel CET
libgfortran/ * acinclude.m4: Add enable.m4, cet.m4. * Makefile.in: Regenerate. * configure: Likewise. * configure.ac: Set CET_FLAGS. Update AM_FCFLAGS, AM_CFLAGS, CFLAGS. From-SVN: r254902
Diffstat (limited to 'libgfortran/configure')
-rwxr-xr-xlibgfortran/configure79
1 files changed, 77 insertions, 2 deletions
diff --git a/libgfortran/configure b/libgfortran/configure
index 87c83ca..60e18a7 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -773,6 +773,7 @@ enable_intermodule
enable_maintainer_mode
enable_multilib
enable_dependency_tracking
+enable_cet
enable_symvers
with_gnu_ld
enable_shared
@@ -1424,6 +1425,8 @@ Optional Features:
--enable-multilib build many library versions (default)
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
+ --enable-cet enable Intel CET in target libraries
+ [default=default]
--disable-symvers disable symbol versioning for libgfortran
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
@@ -5787,6 +5790,78 @@ if test "x$GCC" = "xyes"; then
CFLAGS="-std=gnu11 $CFLAGS"
fi
+# Add CET specific flags if CET is enabled
+ # Check whether --enable-cet was given.
+if test "${enable_cet+set}" = set; then :
+ enableval=$enable_cet;
+ case "$enableval" in
+ yes|no|default) ;;
+ *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
+ esac
+
+else
+ enable_cet=default
+fi
+
+
+case "$host" in
+ i[34567]86-*-linux* | x86_64-*-linux*)
+ case "$enable_cet" in
+ default)
+ # Check if assembler supports CET.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+asm ("setssbsy");
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ enable_cet=yes
+else
+ enable_cet=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ;;
+ yes)
+ # Check if assembler supports CET.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+asm ("setssbsy");
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ as_fn_error "assembler with CET support is required for --enable-cet" "$LINENO" 5
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ;;
+ esac
+ ;;
+ *)
+ enable_cet=no
+ ;;
+esac
+if test x$enable_cet = xyes; then
+ CET_FLAGS="-fcf-protection -mcet"
+fi
+
+AM_FCFLAGS="$AM_FCFLAGS $CET_FLAGS"
+AM_CFLAGS="$AM_CFLAGS $CET_FLAGS"
+CFLAGS="$CFLAGS $CET_FLAGS"
+
+
@@ -12423,7 +12498,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12426 "configure"
+#line 12501 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12529,7 +12604,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12532 "configure"
+#line 12607 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H