This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch hjl/cet/property updated. glibc-2.25-641-g26043c4

From: hjl at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 29 Jun 2017 14:02:19 -0000
Subject: GNU C Library master sources branch hjl/cet/property updated. glibc-2.25-641-g26043c4
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, hjl/cet/property has been updated
       via  26043c4897df607a5f41c751e7aa2a3acaa36955 (commit)
       via  8fd94904c3268e741e927b131373021d514ac4b0 (commit)
       via  c12f8de81127b2e0fc7db5d1c2179ddc4e665461 (commit)
      from  0bd2f09c4ef647328e84be3ffd51b81f057197b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=26043c4897df607a5f41c751e7aa2a3acaa36955

commit 26043c4897df607a5f41c751e7aa2a3acaa36955
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Jun 29 07:02:08 2017 -0700

    tab

diff --git a/sysdeps/unix/sysv/linux/x86/configure b/sysdeps/unix/sysv/linux/x86/configure
index fb28c5d..f35c9a5 100644
--- a/sysdeps/unix/sysv/linux/x86/configure
+++ b/sysdeps/unix/sysv/linux/x86/configure
@@ -8,7 +8,7 @@ $as_echo_n "checking whether CET is default... " >&6; }
 if ${libc_cv_x86_cet+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  		 cat > conftest.c <<EOF
+  cat > conftest.c <<EOF
 #if !defined __IBT__ || !defined __SHSTK__
 # error CET isn't enabled.
 #endif
diff --git a/sysdeps/unix/sysv/linux/x86/configure.ac b/sysdeps/unix/sysv/linux/x86/configure.ac
index 5f5003d..07e7354 100644
--- a/sysdeps/unix/sysv/linux/x86/configure.ac
+++ b/sysdeps/unix/sysv/linux/x86/configure.ac
@@ -5,7 +5,7 @@ if test x"$enable_cet" = xdefault || test x"$enable_cet" = xyes; then
   # See whether CET is default.
   AC_CACHE_CHECK(whether CET is default,
 		 libc_cv_x86_cet, [dnl
-		 cat > conftest.c <<EOF
+cat > conftest.c <<EOF
 #if !defined __IBT__ || !defined __SHSTK__
 # error CET isn't enabled.
 #endif

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8fd94904c3268e741e927b131373021d514ac4b0

commit 8fd94904c3268e741e927b131373021d514ac4b0
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Jun 29 06:58:57 2017 -0700

    Another fix

diff --git a/sysdeps/unix/sysv/linux/x86/Makefile b/sysdeps/unix/sysv/linux/x86/Makefile
index 7748bb8..2fb41ab 100644
--- a/sysdeps/unix/sysv/linux/x86/Makefile
+++ b/sysdeps/unix/sysv/linux/x86/Makefile
@@ -33,6 +33,5 @@ sysdep_headers += sys/cet.h
 
 # Build relocatable objects from assembly codes with <sys/cet.h> if CET
 # is enabled.
-asm-CPPFLAGS += $(cet_cflags) \
-		-include $(..)sysdeps/unix/sysv/linux/x86/sys/cet.h
+asm-CPPFLAGS += -include $(..)sysdeps/unix/sysv/linux/x86/sys/cet.h
 endif

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c12f8de81127b2e0fc7db5d1c2179ddc4e665461

commit c12f8de81127b2e0fc7db5d1c2179ddc4e665461
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Jun 29 06:58:11 2017 -0700

    libc_cv_x86_cet_cflags

diff --git a/sysdeps/unix/sysv/linux/x86/Makefile b/sysdeps/unix/sysv/linux/x86/Makefile
index 0ecc4f3..7748bb8 100644
--- a/sysdeps/unix/sysv/linux/x86/Makefile
+++ b/sysdeps/unix/sysv/linux/x86/Makefile
@@ -23,15 +23,16 @@ ifeq ($(subdir),elf)
 sysdep_routines += dl-vdso
 endif
 
-ifneq ($(cet_cflags),)
+ifeq ($(enable-cet),yes)
 ifeq ($(subdir),elf)
 sysdep_routines += dl-cet-nonshared
 sysdep-dl-routines += dl-cet
 endif
 
+sysdep_headers += sys/cet.h
+
 # Build relocatable objects from assembly codes with <sys/cet.h> if CET
 # is enabled.
 asm-CPPFLAGS += $(cet_cflags) \
 		-include $(..)sysdeps/unix/sysv/linux/x86/sys/cet.h
-+cflags += $(cet_cflags)
 endif
diff --git a/sysdeps/unix/sysv/linux/x86/configure b/sysdeps/unix/sysv/linux/x86/configure
index f7134f4..fb28c5d 100644
--- a/sysdeps/unix/sysv/linux/x86/configure
+++ b/sysdeps/unix/sysv/linux/x86/configure
@@ -2,22 +2,26 @@
  # Local configure fragment for sysdeps/unix/sysv/linux/x86.
 
 if test x"$enable_cet" = xdefault || test x"$enable_cet" = xyes; then
-  # See whether GCC supports CET.
-  libc_cv_x86_cet_cflags="-mibt -mshstk"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $libc_cv_x86_cet_cflags" >&5
-$as_echo_n "checking whether $CC supports $libc_cv_x86_cet_cflags... " >&6; }
+  # See whether CET is default.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CET is default" >&5
+$as_echo_n "checking whether CET is default... " >&6; }
 if ${libc_cv_x86_cet+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  		 echo 'void foo (void) { }' > conftest.c
-		 libc_cv_x86_cet=no
-		 if { ac_try='${CC-cc} -S $CFLAGS conftest.c $libc_cv_x86_cet_cflags -o conftest.s 1>&5'
+  		 cat > conftest.c <<EOF
+#if !defined __IBT__ || !defined __SHSTK__
+# error CET isn't enabled.
+#endif
+EOF
+		 if { ac_try='${CC-cc} -S $CFLAGS conftest.c -o conftest.s 1>&5'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
 		   libc_cv_x86_cet=yes
+		 else
+		   libc_cv_x86_cet=no
 		 fi
 		 rm -rf conftest*
 fi
@@ -32,12 +36,9 @@ $as_echo "$libc_cv_x86_cet" >&6; }
     if test x"$enable_cet" = xdefault; then
       enable_cet=no
     else
-      as_fn_error $? "$CC doesn't support $libc_cv_x86_cet_cflags" "$LINENO" 5
+      as_fn_error $? "$CC doesn't default to CET" "$LINENO" 5
     fi
-    libc_cv_x86_cet_cflags=
   fi
-else
-  libc_cv_x86_cet_cflags=
 fi
 if test $enable_cet = yes; then
 
@@ -45,4 +46,4 @@ $as_echo "#define ENABLE_CET 1" >>confdefs.h
 
 fi
 config_vars="$config_vars
-cet_cflags = $libc_cv_x86_cet_cflags"
+enable-cet = $enable_cet"
diff --git a/sysdeps/unix/sysv/linux/x86/configure.ac b/sysdeps/unix/sysv/linux/x86/configure.ac
index 0702232..5f5003d 100644
--- a/sysdeps/unix/sysv/linux/x86/configure.ac
+++ b/sysdeps/unix/sysv/linux/x86/configure.ac
@@ -2,14 +2,18 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/unix/sysv/linux/x86.
 
 if test x"$enable_cet" = xdefault || test x"$enable_cet" = xyes; then
-  # See whether GCC supports CET.
-  libc_cv_x86_cet_cflags="-mibt -mshstk"
-  AC_CACHE_CHECK(whether $CC supports $libc_cv_x86_cet_cflags,
+  # See whether CET is default.
+  AC_CACHE_CHECK(whether CET is default,
 		 libc_cv_x86_cet, [dnl
-		 echo 'void foo (void) { }' > conftest.c
-		 libc_cv_x86_cet=no
-		 if AC_TRY_COMMAND(${CC-cc} -S $CFLAGS conftest.c $libc_cv_x86_cet_cflags -o conftest.s 1>&AS_MESSAGE_LOG_FD); then
+		 cat > conftest.c <<EOF
+#if !defined __IBT__ || !defined __SHSTK__
+# error CET isn't enabled.
+#endif
+EOF
+		 if AC_TRY_COMMAND(${CC-cc} -S $CFLAGS conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD); then
 		   libc_cv_x86_cet=yes
+		 else
+		   libc_cv_x86_cet=no
 		 fi
 		 rm -rf conftest*])
 
@@ -21,15 +25,12 @@ if test x"$enable_cet" = xdefault || test x"$enable_cet" = xyes; then
     if test x"$enable_cet" = xdefault; then
       enable_cet=no
     else
-      AC_MSG_ERROR([$CC doesn't support $libc_cv_x86_cet_cflags])
+      AC_MSG_ERROR([$CC doesn't default to CET])
     fi
-    libc_cv_x86_cet_cflags=
   fi
-else
-  libc_cv_x86_cet_cflags=
 fi
 if test $enable_cet = yes; then
   AC_DEFINE(ENABLE_CET, 1,
 	    [Enable Intel Control-flow Enforcement Technology (CET)])
 fi
-LIBC_CONFIG_VAR([cet_cflags], [$libc_cv_x86_cet_cflags])
+LIBC_CONFIG_VAR([enable-cet], [$enable_cet])

-----------------------------------------------------------------------

Summary of changes:
 sysdeps/unix/sysv/linux/x86/Makefile     |    8 ++++----
 sysdeps/unix/sysv/linux/x86/configure    |   25 +++++++++++++------------
 sysdeps/unix/sysv/linux/x86/configure.ac |   23 ++++++++++++-----------
 3 files changed, 29 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]