[rtems commit] bsps/aarch64: Resolve usage of SUBALIGN()

[Joel Sherrill]

Module:    rtems
Branch:    master
Commit:    6bfbfb5a3d01ee2b413364c22d056b916d0dfe1d
Changeset: http://git.rtems.org/rtems/commit/?id=6bfbfb5a3d01ee2b413364c22d056b916d0dfe1d

Author:    Kinsey Moore <kinsey.moore at oarcorp.com>
Date:      Fri Feb 19 08:34:48 2021 -0600

bsps/aarch64: Resolve usage of SUBALIGN()

Remove usage of SUBALIGN() in aarch64 linkcmds which works around a
difference in behavior on AArch64 platforms. This is no longer necessary
since alignment is now enforced explicitly.

Closes #4178.

---

 bsps/aarch64/shared/start/linkcmds.base                  | 6 ++----
 spec/build/bsps/aarch64/a53/linkcmds_ilp32.yml           | 1 -
 spec/build/bsps/aarch64/xilinx-zynqmp/linkcmds_ilp32.yml | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/bsps/aarch64/shared/start/linkcmds.base b/bsps/aarch64/shared/start/linkcmds.base
index 2943908..a560b10 100644
--- a/bsps/aarch64/shared/start/linkcmds.base
+++ b/bsps/aarch64/shared/start/linkcmds.base
@@ -43,8 +43,6 @@ STARTUP (start.o)
 
 bsp_stack_align = DEFINED (bsp_stack_align) ? bsp_stack_align : 16;
 
-bsp_set_align = DEFINED (bsp_set_align) ? bsp_set_align : 8;
-
 bsp_stack_exception_size = DEFINED (bsp_stack_exception_size) ? bsp_stack_exception_size : 0;
 bsp_stack_exception_size = ALIGN (bsp_stack_exception_size, bsp_stack_align);
 
@@ -245,7 +243,7 @@ SECTIONS {
 	.got : ALIGN_WITH_INPUT {
 		*(.got.plt) *(.igot.plt) *(.got) *(.igot)
 	} > REGION_RODATA AT > REGION_RODATA_LOAD
-	.rtemsroset : ALIGN_WITH_INPUT SUBALIGN(bsp_set_align) {
+	.rtemsroset : ALIGN_WITH_INPUT {
 		/* Special FreeBSD linker set sections */
 		__start_set_sysctl_set = .;
 		*(set_sysctl_*);
@@ -299,7 +297,7 @@ SECTIONS {
 	.data1 : ALIGN_WITH_INPUT {
 		*(.data1)
 	} > REGION_DATA AT > REGION_DATA_LOAD
-	.rtemsrwset : ALIGN_WITH_INPUT SUBALIGN(bsp_set_align) {
+	.rtemsrwset : ALIGN_WITH_INPUT {
 		KEEP (*(SORT(.rtemsrwset.*)))
 		bsp_section_data_end = .;
 	} > REGION_DATA AT > REGION_DATA_LOAD
diff --git a/spec/build/bsps/aarch64/a53/linkcmds_ilp32.yml b/spec/build/bsps/aarch64/a53/linkcmds_ilp32.yml
index 4bcf2eb..958a140 100644
--- a/spec/build/bsps/aarch64/a53/linkcmds_ilp32.yml
+++ b/spec/build/bsps/aarch64/a53/linkcmds_ilp32.yml
@@ -60,7 +60,6 @@ content: |
 
   OUTPUT_FORMAT ("elf32-littleaarch64")
   OUTPUT_ARCH (aarch64:ilp32)
-  bsp_set_align = 4;
 
   INCLUDE linkcmds.base
 copyrights:
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/linkcmds_ilp32.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/linkcmds_ilp32.yml
index aea07cd..f0d9f71 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/linkcmds_ilp32.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/linkcmds_ilp32.yml
@@ -60,7 +60,6 @@ content: |
 
   OUTPUT_FORMAT ("elf32-littleaarch64")
   OUTPUT_ARCH (aarch64:ilp32)
-  bsp_set_align = 4;
 
   INCLUDE linkcmds.base
 copyrights: