GNU C Library master sources branch master updated. glibc-2.27.9000-573-g31e422c

[hjl at sourceware dot org]

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, master has been updated
       via  31e422ca9680bbe412aa56b23f058c10eaee7be8 (commit)
      from  faaee1f07ed25b2779bfd935ffb29f431b80d6d3 (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=31e422ca9680bbe412aa56b23f058c10eaee7be8

commit 31e422ca9680bbe412aa56b23f058c10eaee7be8
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Sun Jul 15 08:48:40 2018 -0700

    x86_64: Undef SHADOW_STACK_POINTER_OFFSET last
    
    Since SHADOW_STACK_POINTER_OFFSET is defined in jmp_buf-ssp.h, we must
    undef SHADOW_STACK_POINTER_OFFSET after including <jmp_buf-ssp.h>.
    
    	* sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S: Undef
    	SHADOW_STACK_POINTER_OFFSET after including <jmp_buf-ssp.h>.

diff --git a/ChangeLog b/ChangeLog
index c984482..89052e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S: Undef
+	SHADOW_STACK_POINTER_OFFSET after including <jmp_buf-ssp.h>.
+
 2018-07-14  Igor Tsimbalist  <igor.v.tsimbalist@intel.com>
 	    H.J. Lu  <hongjiu.lu@intel.com>
 
diff --git a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
index 7eb26fa..5d2d275 100644
--- a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
+++ b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
@@ -19,15 +19,14 @@
 #include <jmpbuf-offsets.h>
 #include <asm-syntax.h>
 #include <stap-probe.h>
+#include <sigaltstack-offsets.h>
+#include <jmp_buf-ssp.h>
 
 /* Don't restore shadow stack register if shadow stack isn't enabled.  */
 #if !SHSTK_ENABLED
 # undef SHADOW_STACK_POINTER_OFFSET
 #endif
 
-#include <sigaltstack-offsets.h>
-#include <jmp_buf-ssp.h>
-
 	.section .rodata.str1.1,"aMS",@progbits,1
 	.type	longjmp_msg,@object
 longjmp_msg:

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

Summary of changes:
 ChangeLog                                        |    5 +++++
 sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S |    5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources