svn commit: r334330 - stable/11/sys/amd64/include

[John Baldwin]

Author: jhb
Date: Tue May 29 13:54:34 2018
New Revision: 334330
URL: https://svnweb.freebsd.org/changeset/base/334330

Log:
  MFC 333606: Make the common interrupt entry point labels local labels.
  
  Kernel debuggers depend on symbol names to find stack frames with a
  trapframe rather than a normal stack frame.  The labels used for the
  shared interrupt entry point for the PTI and non-PTI cases did not
  match the existing patterns confusing debuggers.  Add the '.L' prefix
  to mark these symbols as local so they are not visible in the symbol
  table.
  
  Approved by:	re (kib)

Modified:
  stable/11/sys/amd64/include/asmacros.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/amd64/include/asmacros.h
==============================================================================
--- stable/11/sys/amd64/include/asmacros.h	Tue May 29 13:52:25 2018	(r334329)
+++ stable/11/sys/amd64/include/asmacros.h	Tue May 29 13:54:34 2018	(r334330)
@@ -218,9 +218,9 @@ X\name\()_pti:
 	.type	X\vec_name\()_pti, at function
 X\vec_name\()_pti:
 	testb	$SEL_RPL_MASK,PTI_CS-3*8(%rsp) /* err, %rax, %rdx not pushed */
-	jz	\vec_name\()_u
+	jz	.L\vec_name\()_u
 	PTI_UENTRY has_err=0
-	jmp	\vec_name\()_u
+	jmp	.L\vec_name\()_u
 	.endm
 
 	.macro	INTR_PUSH_FRAME vec_name
@@ -229,9 +229,9 @@ X\vec_name\()_pti:
 	.type	X\vec_name, at function
 X\vec_name:
 	testb	$SEL_RPL_MASK,PTI_CS-3*8(%rsp) /* come from kernel? */
-	jz	\vec_name\()_u		/* Yes, dont swapgs again */
+	jz	.L\vec_name\()_u		/* Yes, dont swapgs again */
 	swapgs
-\vec_name\()_u:
+.L\vec_name\()_u:
 	subq	$TF_RIP,%rsp	/* skip dummy tf_err and tf_trapno */
 	movq	%rdi,TF_RDI(%rsp)
 	movq	%rsi,TF_RSI(%rsp)