From 8e2fc0551b547d1ecb498d18fc599bc73289629f Mon Sep 17 00:00:00 2001 From: Igor Tsimbalist Date: Fri, 17 Nov 2017 23:29:19 +0100 Subject: [PATCH] Enable building libvtv with Intel CET libvtv/ * acinclude.m4: Add enable.m4 and cet.m4. * Makefile.in: Regenerate. * testsuite/Makefile.in: Likewise. * configure: Likewise. * configure.ac: Set CET_FLAGS. Update XCFLAGS. * testsuite/libvtv.cc/vtv.exp: Add scanlang.exp. From-SVN: r254897 --- libvtv/ChangeLog | 9 +++++ libvtv/Makefile.in | 3 +- libvtv/acinclude.m4 | 2 + libvtv/configure | 77 +++++++++++++++++++++++++++++++++++++- libvtv/configure.ac | 5 +++ libvtv/testsuite/Makefile.in | 3 +- libvtv/testsuite/libvtv.cc/vtv.exp | 1 + 7 files changed, 96 insertions(+), 4 deletions(-) diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog index be5d993..64fcafe 100644 --- a/libvtv/ChangeLog +++ b/libvtv/ChangeLog @@ -1,3 +1,12 @@ +2017-11-17 Igor Tsimbalist + + * acinclude.m4: Add enable.m4 and cet.m4. + * Makefile.in: Regenerate. + * testsuite/Makefile.in: Likewise. + * configure: Likewise. + * configure.ac: Set CET_FLAGS. Update XCFLAGS. + * testsuite/libvtv.cc/vtv.exp: Add scanlang.exp. + 2017-01-21 Jakub Jelinek PR other/79046 diff --git a/libvtv/Makefile.in b/libvtv/Makefile.in index 59d0b11..606b7c0 100644 --- a/libvtv/Makefile.in +++ b/libvtv/Makefile.in @@ -71,7 +71,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../config/enable.m4 \ + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/libvtv/acinclude.m4 b/libvtv/acinclude.m4 index 53e62d2..1113a3f 100644 --- a/libvtv/acinclude.m4 +++ b/libvtv/acinclude.m4 @@ -2,6 +2,8 @@ dnl ---------------------------------------------------------------------- dnl This whole bit snagged from libgfortran. sinclude(../libtool.m4) +sinclude(../config/enable.m4) +sinclude(../config/cet.m4) dnl The lines below arrange for aclocal not to bring an installed dnl libtool.m4 into aclocal.m4, while still arranging for automake to dnl add a definition of LIBTOOL to Makefile.in. diff --git a/libvtv/configure b/libvtv/configure index c3bed2d..aa8a301 100755 --- a/libvtv/configure +++ b/libvtv/configure @@ -760,6 +760,7 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +enable_cet with_gcc_major_version_only ' ac_precious_vars='build_alias @@ -1404,6 +1405,8 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-cet enable Intel CET in target libraries + [default=default] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -12066,7 +12069,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12069 "configure" +#line 12072 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12172,7 +12175,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12175 "configure" +#line 12178 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15456,6 +15459,76 @@ libtool_VERSION=1:0:0 XCFLAGS="-D_GNU_SOURCE -Wall -Wextra -fno-exceptions" +# Add CET specific flags if Intel 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 + +XCFLAGS="$XCFLAGS $CET_FLAGS" + + if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" diff --git a/libvtv/configure.ac b/libvtv/configure.ac index 33b1e79..ba3009e 100644 --- a/libvtv/configure.ac +++ b/libvtv/configure.ac @@ -151,6 +151,11 @@ libtool_VERSION=1:0:0 AC_SUBST(libtool_VERSION) XCFLAGS="-D_GNU_SOURCE -Wall -Wextra -fno-exceptions" + +# Add CET specific flags if Intel CET is enabled. +GCC_CET_FLAGS(CET_FLAGS) +XCFLAGS="$XCFLAGS $CET_FLAGS" + AC_SUBST(XCFLAGS) if test "${multilib}" = "yes"; then diff --git a/libvtv/testsuite/Makefile.in b/libvtv/testsuite/Makefile.in index b5dfd29..f631470 100644 --- a/libvtv/testsuite/Makefile.in +++ b/libvtv/testsuite/Makefile.in @@ -64,7 +64,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../config/enable.m4 \ + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs diff --git a/libvtv/testsuite/libvtv.cc/vtv.exp b/libvtv/testsuite/libvtv.cc/vtv.exp index 12ed774..2024fba 100644 --- a/libvtv/testsuite/libvtv.cc/vtv.exp +++ b/libvtv/testsuite/libvtv.cc/vtv.exp @@ -1,4 +1,5 @@ load_lib libvtv-dg.exp +load_gcc_lib scanlang.exp load_gcc_lib gcc-dg.exp global VTV_FLAGS -- 2.7.4