mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 5/7] X86: lds: remove unnecessary alignments
Date: Wed,  2 Oct 2019 16:44:28 +0200	[thread overview]
Message-ID: <20191002144430.14946-6-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20191002144430.14946-1-s.hauer@pengutronix.de>

We do not seem to need all these alignments in the rodata sections
except the one for the command array. Remove them and put the alignment
for the command array into the BAREBOX_CMDS define.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/sandbox/board/barebox.lds.S       | 8 --------
 arch/x86/mach-efi/elf_ia32_efi.lds.S   | 6 ------
 arch/x86/mach-efi/elf_x86_64_efi.lds.S | 6 ------
 include/asm-generic/barebox.lds.h      | 6 ++++++
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/arch/sandbox/board/barebox.lds.S b/arch/sandbox/board/barebox.lds.S
index bdce8ecbd6..862376dd0e 100644
--- a/arch/sandbox/board/barebox.lds.S
+++ b/arch/sandbox/board/barebox.lds.S
@@ -4,17 +4,9 @@ SECTIONS
 {
 	. = ALIGN(64);
 	.barebox_initcalls : { BAREBOX_INITCALLS }
-
-	. = ALIGN(64);
 	.barebox_exitcalls : { BAREBOX_EXITCALLS }
-
-	. = ALIGN(64);
 	.barebox_magicvar : { BAREBOX_MAGICVARS }
-
-	. = ALIGN(64);
 	__barebox_cmd : { BAREBOX_CMDS }
-
-	. = ALIGN(64);
 	__barebox_ratp_cmd : { BAREBOX_RATP_CMDS }
 }
 
diff --git a/arch/x86/mach-efi/elf_ia32_efi.lds.S b/arch/x86/mach-efi/elf_ia32_efi.lds.S
index a5874c448b..70d34f4871 100644
--- a/arch/x86/mach-efi/elf_ia32_efi.lds.S
+++ b/arch/x86/mach-efi/elf_ia32_efi.lds.S
@@ -54,14 +54,8 @@ SECTIONS
 
 	.barebox_initcalls : { BAREBOX_INITCALLS }
 	.barebox_exitcalls : { BAREBOX_EXITCALLS }
-
-	. = ALIGN(64);
 	.barebox_magicvar : { BAREBOX_MAGICVARS }
-
-	. = ALIGN(64);
 	__barebox_cmd : { BAREBOX_CMDS }
-
-	. = ALIGN(64);
 	__barebox_ratp_cmd : { BAREBOX_RATP_CMDS }
 
 	. = ALIGN(4096);
diff --git a/arch/x86/mach-efi/elf_x86_64_efi.lds.S b/arch/x86/mach-efi/elf_x86_64_efi.lds.S
index b00cb98c97..53de22d75c 100644
--- a/arch/x86/mach-efi/elf_x86_64_efi.lds.S
+++ b/arch/x86/mach-efi/elf_x86_64_efi.lds.S
@@ -56,14 +56,8 @@ SECTIONS
 
 	.barebox_initcalls : { BAREBOX_INITCALLS }
 	.barebox_exitcalls : { BAREBOX_EXITCALLS }
-
-	. = ALIGN(64);
 	.barebox_magicvar : { BAREBOX_MAGICVARS }
-
-	. = ALIGN(64);
 	__barebox_cmd : { BAREBOX_CMDS }
-
-	. = ALIGN(64);
 	__barebox_ratp_cmd : { BAREBOX_RATP_CMDS }
 
 	. = ALIGN(4096);
diff --git a/include/asm-generic/barebox.lds.h b/include/asm-generic/barebox.lds.h
index 2f8786356e..acf838e85f 100644
--- a/include/asm-generic/barebox.lds.h
+++ b/include/asm-generic/barebox.lds.h
@@ -46,7 +46,13 @@
 	KEEP(*(.exitcall.6))			\
 	__barebox_exitcalls_end = .;
 
+/* For some obscure reason X86_64 needs these 64bit aligned */
+#ifdef __x86_64__
+#define X86_64_ALIGN . = ALIGN(64);
+#endif
+
 #define BAREBOX_CMDS				\
+	X86_64_ALIGN				\
 	__barebox_cmd_start = .;		\
 	KEEP(*(SORT_BY_NAME(.barebox_cmd*)))	\
 	__barebox_cmd_end = .;
-- 
2.23.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2019-10-02 14:44 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-02 14:44 [PATCH 0/7] Cleanup linker scripts Sascha Hauer
2019-10-02 14:44 ` [PATCH 1/7] barebox.lds: Remove unnecessary braces Sascha Hauer
2019-10-02 14:44 ` [PATCH 2/7] ppc: remove unused variables from linker scripts Sascha Hauer
2019-10-02 14:44 ` [PATCH 3/7] lds: Move start/end address variables into defines Sascha Hauer
2019-10-02 18:46   ` Sam Ravnborg
2019-10-02 14:44 ` [PATCH 4/7] lds: create and use BAREBOX_PCI_FIXUP macro Sascha Hauer
2019-10-02 14:44 ` Sascha Hauer [this message]
2019-10-02 18:53   ` [PATCH 5/7] X86: lds: remove unnecessary alignments Sam Ravnborg
2019-10-14 10:05     ` [PATCH] command: Use array of pointers to commands Sascha Hauer
2019-10-14 10:08     ` [PATCH 5/7] X86: lds: remove unnecessary alignments Sascha Hauer
2019-10-02 14:44 ` [PATCH 6/7] lds: remove more " Sascha Hauer
2019-10-02 18:55   ` Sam Ravnborg
2019-10-02 14:44 ` [PATCH 7/7] lds: Add and use RO_DATA_SECTION macro Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191002144430.14946-6-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox