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 c9844826b04661255d763bb5b129b6b12a53177a..89052e6a9f24562b2562b22105d0ad32bdeeddbc 100644 (file)
--- 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 7eb26fafca4827f8681a8bec692edc90406f4df9..5d2d275721681e351fb258727ceba44c36578e52 100644 (file)
--- 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: