From b9bb51c2403c432c9e99801a607bc022a8792f71 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Tue, 26 Aug 2014 15:01:41 -0700 Subject: [PATCH] rmodule: Fix rmodule.ld for 64-bit Fix the alignment for 64-bit systems BUG=chrome-os-partner:31615 BRANCH=None TEST=Compiles successfully and rmodule load and run for arm64 works fine Change-Id: I7fcb1683d760b96307759b7d44d8770dd49a02e3 Signed-off-by: Furquan Shaikh Reviewed-on: https://chromium-review.googlesource.com/214326 Reviewed-by: Aaron Durbin Tested-by: Furquan Shaikh Commit-Queue: Aaron Durbin --- src/lib/rmodule.ld | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/rmodule.ld b/src/lib/rmodule.ld index fded252fcb..009caa6835 100644 --- a/src/lib/rmodule.ld +++ b/src/lib/rmodule.ld @@ -30,21 +30,25 @@ SECTIONS __CTOR_LIST__ = .; *(.ctors); LONG(0); + LONG(0); __CTOR_END__ = .; /* The driver sections are to allow linking coreboot's * ramstage with the rmodule linker. Any changes made in * ramstage.ld should be made here as well. */ + . = ALIGN(8); console_drivers = .; *(.rodata.console_drivers) econsole_drivers = . ; - . = ALIGN(4); + . = ALIGN(8); pci_drivers = . ; *(.rodata.pci_driver) epci_drivers = . ; + . = ALIGN(8); cpu_drivers = . ; *(.rodata.cpu_driver) ecpu_drivers = . ; + . = ALIGN(8); _bs_init_begin = .; *(.bs_init) _bs_init_end = .;