From c0f454c68329301447fd258e47824f7d402f19e9 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 4 Jan 2023 23:19:26 +0000
Subject: [PATCH] link: Move the linker script to being common

... now that all x86-ism have been removed.  Fix some style bugs.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
 build/common.mk                 |  4 ++--
 {arch/x86 => common}/link.lds.S | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename {arch/x86 => common}/link.lds.S (93%)

diff --git a/build/common.mk b/build/common.mk
index 42d4c77..644961c 100644
--- a/build/common.mk
+++ b/build/common.mk
@@ -72,8 +72,8 @@ DEPS-$(1) = \
 	$$(obj-$(1):%.o=%-$(1).o) $$(obj-perenv:%.o=%-$(1).o)
 
 # Generate .lds with appropriate flags
-%/link-$(1).lds: %/link.lds.S
-	$$(CPP) $$(AFLAGS_$(1)) -P -C $$< -o $$@
+%/link-$(1).lds: $(ROOT)/common/link.lds.S
+	$$(CPP) $$(AFLAGS_$(1)) -P $$< -o $$@
 
 # Generate a per-arch .o from .S
 %-$($(1)_arch).o: %.S
diff --git a/arch/x86/link.lds.S b/common/link.lds.S
similarity index 93%
rename from arch/x86/link.lds.S
rename to common/link.lds.S
index 3a0907d..f5836b6 100644
--- a/arch/x86/link.lds.S
+++ b/common/link.lds.S
@@ -31,10 +31,10 @@ SECTIONS
                 *(.text.head)
                 *(.text)
 
-	. = ALIGN(PAGE_SIZE);
+        . = ALIGN(PAGE_SIZE);
         __start_user_text = .;
                 *(.text.user)
-	. = ALIGN(PAGE_SIZE);
+        . = ALIGN(PAGE_SIZE);
         __end_user_text = .;
 
         } :text = 0
@@ -47,7 +47,7 @@ SECTIONS
 
         __start_user_data = .;
                 *(.data.user)
-	. = ALIGN(PAGE_SIZE);
+        . = ALIGN(PAGE_SIZE);
         __end_user_data = .;
 
         }
@@ -75,7 +75,7 @@ SECTIONS
 
         __start_user_bss = .;
                 *(.bss.user.page_aligned)
-	. = ALIGN(PAGE_SIZE);
+        . = ALIGN(PAGE_SIZE);
         __end_user_bss = .;
         }
 
@@ -91,9 +91,9 @@ zeroptr = 0;
 ASSERT(IS_ALIGNED(__start_user_text, PAGE_SIZE), "__start_user_text misaligned");
 ASSERT(IS_ALIGNED(__end_user_text,   PAGE_SIZE), "__end_user_text misaligned");
 ASSERT(IS_ALIGNED(__start_user_data, PAGE_SIZE), "__start_user_data misaligned");
-ASSERT(IS_ALIGNED(__end_user_data,   PAGE_SIZE), "__end_user_data misaligned")
+ASSERT(IS_ALIGNED(__end_user_data,   PAGE_SIZE), "__end_user_data misaligned");
 ASSERT(IS_ALIGNED(__start_user_bss,  PAGE_SIZE), "__start_user_data misaligned");
-ASSERT(IS_ALIGNED(__end_user_bss,    PAGE_SIZE), "__end_user_data misaligned")
+ASSERT(IS_ALIGNED(__end_user_bss,    PAGE_SIZE), "__end_user_data misaligned");
 
 /* Architecture may provide any extra asserts. */
 #define LINKER_FOOTER
-- 
2.39.5