parisc: Unbreak bootloader due to gcc-7 optimizations

PATCH New Helge Deller 1 participant 1 message Sep 22, 2017 PA-RISC architecture

Share & tools

Helge Deller

author maintainer

2017-09-22 19:57 UTC #0 lore raw

PATCH 1/1 parisc: Unbreak bootloader due to gcc-7 optimizations

gcc-7 optimizes the byte-wise accesses of get_unaligned_le32() into word-wise accesses if the 32-bit integer output_len is declared as external. This panics then the bootloader since we don't have the unaligned access fault trap handler installed during boot time.

Avoid this optimization by declaring output_len as byte-aligned and thus unbreak the bootloader code.

Additionally, compile the boot code optimized for size.

Signed-off-by Helge Deller <[email protected]>

arch/parisc/boot/compressed/Makefile +1 -1

index 5450a11c9d10..7d7e594bda36 100644
@@ -15,7 +15,7 @@ targets += misc.o piggy.o sizes.h head.o real2.o firmware.o
 KBUILD_CFLAGS := -D__KERNEL__ -O2 -DBOOTLOADER
 KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
 KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks
-KBUILD_CFLAGS += -fno-PIE -mno-space-regs -mdisable-fpregs
+KBUILD_CFLAGS += -fno-PIE -mno-space-regs -mdisable-fpregs -Os
 ifndef CONFIG_64BIT
 KBUILD_CFLAGS += -mfast-indirect-calls
 endif

arch/parisc/boot/compressed/misc.c +2 -1

index 13a4bf9ac4da..a32325914429 100644
@@ -24,7 +26,8 @@
 /* Symbols defined by linker scripts */
 extern char input_data[];
 extern int input_len;
-extern __le32 output_len;	/* at unaligned address, little-endian */
+/* output_len is inserted by the linker possibly at an unaligned address */
+extern __le32 output_len __aligned(1);
 extern char _text, _end;
 extern char _bss, _ebss;
 extern char _startcode_end;