From: Romain Naour <romain.na...@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=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e
[2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html

Signed-off-by: Romain Naour <romain.na...@gmail.com>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Cc: Alan Modra <amo...@gmail.com>
Cc: Bin Meng <bin.m...@windriver.com>
Cc: Chen Zhou <chenzho...@huawei.com>
Cc: Geert Uytterhoeven <geert+rene...@glider.be>
Cc: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>
Cc: Krzysztof Kozlowski <k...@kernel.org>
Cc: Kuninori Morimoto <kuninori.morimoto...@renesas.com>
Cc: Rich Felker <dal...@libc.org>
Cc: Sam Ravnborg <s...@ravnborg.org>
Cc: Yoshinori Sato <ys...@users.sourceforge.jp>
Cc: Arnd Bergmann <a...@arndb.de>
Cc: <sta...@vger.kernel.org>
Link: https://marc.info/?l=linux-sh&m=158429470221261
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 include/asm-generic/vmlinux.lds.h |    1 +
 1 file changed, 1 insertion(+)

--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -375,6 +375,7 @@
  */
 #ifndef RO_AFTER_INIT_DATA
 #define RO_AFTER_INIT_DATA                                             \
+       . = ALIGN(8);                                                   \
        __start_ro_after_init = .;                                      \
        *(.data..ro_after_init)                                         \
        JUMP_TABLE_DATA                                                 \


Reply via email to