From: H.J. Lu <hjl.tools@gmail.com>
Date: Sun, 15 Jul 2018 15:48:40 +0000 (-0700)
Subject: x86_64: Undef SHADOW_STACK_POINTER_OFFSET last
X-Git-Tag: glibc-2.28~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31e422ca9680bbe412aa56b23f058c10eaee7be8;p=thirdparty%2Fglibc.git

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 c9844826b04..89052e6a9f2 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 7eb26fafca4..5d2d2757216 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: