[Xen-devel] [PATCH] x86/asm: add .file directives

["Jan Beulich" <JBeulich@xxxxxxxx>]

Make sure local symbols are correctly associated with their source
files: I've just run across a cpufreq.c#create_bounce_frame stack trace
entry. Since we have multiple entry.S, don't use __FILE__ there to
fully disambiguate things.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>

--- a/xen/arch/x86/acpi/wakeup_prot.S
+++ b/xen/arch/x86/acpi/wakeup_prot.S
@@ -1,3 +1,4 @@
+        .file __FILE__
         .text
 
 #include <xen/multiboot.h>
--- a/xen/arch/x86/clear_page.S
+++ b/xen/arch/x86/clear_page.S
@@ -1,3 +1,5 @@
+        .file __FILE__
+
 #include <asm/page.h>
 
 #define ptr_reg %rdi
--- a/xen/arch/x86/copy_page.S
+++ b/xen/arch/x86/copy_page.S
@@ -1,3 +1,5 @@
+        .file __FILE__
+
 #include <asm/page.h>
 
 #define src_reg %rsi
--- a/xen/arch/x86/hvm/svm/entry.S
+++ b/xen/arch/x86/hvm/svm/entry.S
@@ -17,6 +17,8 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
+        .file "svm/entry.S"
+
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/types.h>
--- a/xen/arch/x86/hvm/vmx/entry.S
+++ b/xen/arch/x86/hvm/vmx/entry.S
@@ -16,6 +16,8 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
+        .file "vmx/entry.S"
+
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/types.h>
--- a/xen/arch/x86/pv/gpr_switch.S
+++ b/xen/arch/x86/pv/gpr_switch.S
@@ -5,6 +5,8 @@
  * Copyright (c) 2006, Novell, Inc.
  */
 
+        .file __FILE__
+
 #include <asm/asm_defns.h>
 
 ENTRY(host_to_guest_gpr_switch)
--- a/xen/arch/x86/x86_64/compat/entry.S
+++ b/xen/arch/x86/x86_64/compat/entry.S
@@ -2,6 +2,8 @@
  * Compatibility hypercall routines.
  */
 
+        .file "x86_64/compat/entry.S"
+
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/asm_defns.h>
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -4,6 +4,8 @@
  * Copyright (c) 2005, K A Fraser
  */
 
+        .file "x86_64/entry.S"
+
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/asm_defns.h>
--- a/xen/arch/x86/x86_64/kexec_reloc.S
+++ b/xen/arch/x86/x86_64/kexec_reloc.S
@@ -10,6 +10,9 @@
  * This source code is licensed under the GNU General Public License,
  * Version 2.  See the file COPYING for more details.
  */
+
+        .file __FILE__
+
 #include <xen/kimage.h>
 
 #include <asm/asm_defns.h>




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel