From 31e422ca9680bbe412aa56b23f058c10eaee7be8 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sun, 15 Jul 2018 08:48:40 -0700
Subject: 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>.
---
 sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'sysdeps/unix')

diff --git a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
index 7eb26fafca..5d2d275721 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:
-- 
cgit 1.4.1