OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Igor Tsimbalist 2017-11-17 23:29:19 +01:00 committed by Igor Tsimbalist
parent 9069eb28d4
commit 8e2fc0551b
7 changed files with 96 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libvtv/ChangeLog
View File

@ -1,3 +1,12 @@
2017-11-17 Igor Tsimbalist <igor.v.tsimbalist@intel.com>
* 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 <jakub@redhat.com>
PR other/79046

3
libvtv/Makefile.in
View File

@ -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 \

2
libvtv/acinclude.m4
View File

@ -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.

77
libvtv/configure vendored
View File

@ -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"

5
libvtv/configure.ac
View File

@ -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

3
libvtv/testsuite/Makefile.in
View File

@ -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

1
libvtv/testsuite/libvtv.cc/vtv.exp
View File

@ -1,4 +1,5 @@
load_lib libvtv-dg.exp
load_gcc_lib scanlang.exp
load_gcc_lib gcc-dg.exp
global VTV_FLAGS