|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen staging] Arm: drop ENFORCE_UNIQUE_SYMBOLS=y workaround again
commit e35ef4439b69de9ebbda355ec74a25e0487c52a7
Author: Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Sep 23 09:05:53 2026 +0200
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Sep 23 10:01:38 2026 +0200
Arm: drop ENFORCE_UNIQUE_SYMBOLS=y workaround again
Both arm<NN>/head.S and arm<NN>/mmu/head.S have a local symbol "fail".
Without a .file directive locals will be associated with the path-less
object filename (head.o). Hence the two symbol names collide. Add .file,
also in arm<NN>/mpu/head.S for consistency.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Reviewed-by: Michal Orzel <michal.orzel@xxxxxxx>
---
xen/arch/arm/Makefile | 3 ---
xen/arch/arm/arm32/head.S | 2 ++
xen/arch/arm/arm32/mmu/head.S | 2 ++
xen/arch/arm/arm32/mpu/head.S | 2 ++
xen/arch/arm/arm64/head.S | 2 ++
xen/arch/arm/arm64/mmu/head.S | 2 ++
xen/arch/arm/arm64/mpu/head.S | 2 ++
7 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index e9b003610b..eeb0efdb7e 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -91,9 +91,6 @@ include scripts/Makefile.link
# Suppress orphan section checking for the time being.
orphan-handling-y :=
-# Downgrade duplicate symbol errors to warnings for the time being.
-syms-warn-dup-$(CONFIG_ENFORCE_UNIQUE_SYMBOLS) := --warn-dup
-
.PHONY: include
include:
diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S
index 63453dd3a3..7d68e69c5e 100644
--- a/xen/arch/arm/arm32/head.S
+++ b/xen/arch/arm/arm32/head.S
@@ -17,6 +17,8 @@
* GNU General Public License for more details.
*/
+ .file __FILE__
+
#include <asm/page.h>
#include <asm/early_printk.h>
diff --git a/xen/arch/arm/arm32/mmu/head.S b/xen/arch/arm/arm32/mmu/head.S
index 3731322f7e..0999181de4 100644
--- a/xen/arch/arm/arm32/mmu/head.S
+++ b/xen/arch/arm/arm32/mmu/head.S
@@ -5,6 +5,8 @@
* Arm32 MMU specific start-of-day code.
*/
+ .file __FILE__
+
#include <asm/page.h>
#include <asm/early_printk.h>
diff --git a/xen/arch/arm/arm32/mpu/head.S b/xen/arch/arm/arm32/mpu/head.S
index 6a631626a7..3f5c404c4d 100644
--- a/xen/arch/arm/arm32/mpu/head.S
+++ b/xen/arch/arm/arm32/mpu/head.S
@@ -3,6 +3,8 @@
* Start-of-day code for an Armv8-R-AArch32 MPU system.
*/
+ .file __FILE__
+
#include <asm/arm32/macros.h>
#include <asm/arm32/sysregs.h>
#include <asm/cpregs.h>
diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S
index 72c7b24498..7d1e205353 100644
--- a/xen/arch/arm/arm64/head.S
+++ b/xen/arch/arm/arm64/head.S
@@ -20,6 +20,8 @@
* GNU General Public License for more details.
*/
+ .file __FILE__
+
#include <asm/page.h>
#include <asm/early_printk.h>
diff --git a/xen/arch/arm/arm64/mmu/head.S b/xen/arch/arm/arm64/mmu/head.S
index 8e514d2114..aabbd4f421 100644
--- a/xen/arch/arm/arm64/mmu/head.S
+++ b/xen/arch/arm/arm64/mmu/head.S
@@ -5,6 +5,8 @@
* Arm64 MMU specific start-of-day code.
*/
+ .file __FILE__
+
#include <asm/page.h>
#include <asm/early_printk.h>
diff --git a/xen/arch/arm/arm64/mpu/head.S b/xen/arch/arm/arm64/mpu/head.S
index 5df0af571e..960d20a841 100644
--- a/xen/arch/arm/arm64/mpu/head.S
+++ b/xen/arch/arm/arm64/mpu/head.S
@@ -3,6 +3,8 @@
* Start-of-day code for an Armv8-R MPU system.
*/
+ .file __FILE__
+
#include <asm/mpu/regions.inc>
/*
--
generated by git-patchbot for /home/xen/git/xen.git#staging
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |