From: Romain Naour romain.naour@gmail.com
commit 7f897acbe5d57995438c831670b7c400e9c0dc00 upstream.
Since the patch [1], building the kernel using a toolchain built with binutils 2.33.1 prevents booting a sh4 system under Qemu. Apply the patch provided by Alan Modra [2] that fix alignment of rodata.
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ebd2263ba9a9124d9... [2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html
Signed-off-by: Romain Naour romain.naour@gmail.com Signed-off-by: Andrew Morton akpm@linux-foundation.org Cc: Alan Modra amodra@gmail.com Cc: Bin Meng bin.meng@windriver.com Cc: Chen Zhou chenzhou10@huawei.com Cc: Geert Uytterhoeven geert+renesas@glider.be Cc: John Paul Adrian Glaubitz glaubitz@physik.fu-berlin.de Cc: Krzysztof Kozlowski krzk@kernel.org Cc: Kuninori Morimoto kuninori.morimoto.gx@renesas.com Cc: Rich Felker dalias@libc.org Cc: Sam Ravnborg sam@ravnborg.org Cc: Yoshinori Sato ysato@users.sourceforge.jp Cc: Arnd Bergmann arnd@arndb.de Cc: stable@vger.kernel.org Link: https://marc.info/?l=linux-sh&m=158429470221261 Signed-off-by: Linus Torvalds torvalds@linux-foundation.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- include/asm-generic/vmlinux.lds.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 95479f35e239d..4976f4d30f554 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -307,6 +307,7 @@ */ #ifndef RO_AFTER_INIT_DATA #define RO_AFTER_INIT_DATA \ + . = ALIGN(8); \ __start_ro_after_init = .; \ *(.data..ro_after_init) \ __end_ro_after_init = .;