[Xen-changelog] [xen master] x86/asm: add .file directives

[patchbot@xxxxxxx]

commit c39cf093fc7de5eb3c8bc2bee0cd3078d4049947
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Aug 17 14:45:14 2017 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Aug 17 14:45:14 2017 +0200

    x86/asm: add .file directives
    
    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>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/acpi/wakeup_prot.S    | 1 +
 xen/arch/x86/clear_page.S          | 2 ++
 xen/arch/x86/copy_page.S           | 2 ++
 xen/arch/x86/hvm/svm/entry.S       | 2 ++
 xen/arch/x86/hvm/vmx/entry.S       | 2 ++
 xen/arch/x86/pv/gpr_switch.S       | 2 ++
 xen/arch/x86/x86_64/compat/entry.S | 2 ++
 xen/arch/x86/x86_64/entry.S        | 2 ++
 xen/arch/x86/x86_64/kexec_reloc.S  | 3 +++
 9 files changed, 18 insertions(+)

diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S
index 7228637..361751d 100644
--- 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>
diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S
index 959c821..243a767 100644
--- 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
diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S
index f925a39..2da8112 100644
--- 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
diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S
index a4ab40a..4a72e38 100644
--- 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>
diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S
index 9f1755b..53eedc6 100644
--- 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>
diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S
index 217812b..6d26192 100644
--- 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)
diff --git a/xen/arch/x86/x86_64/compat/entry.S 
b/xen/arch/x86/x86_64/compat/entry.S
index 90bda09..ba6e941 100644
--- 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>
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index b6e2397..6066ed8 100644
--- 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>
diff --git a/xen/arch/x86/x86_64/kexec_reloc.S 
b/xen/arch/x86/x86_64/kexec_reloc.S
index 0b1f9a0..4d527db 100644
--- 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>
--
generated by git-patchbot for /home/xen/git/xen.git#master

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