diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2015-04-08 07:49:54 +0200 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2015-04-10 09:31:21 +0200 |
| commit | 834a316eeebcb75316c0a7d9088fa638c52dc584 (patch) | |
| tree | 5ba1a9de7e54f7c6ee8f3b749cae0866d72fc02b /arch/xtensa | |
| parent | Merge tag 'xtensa-for-next-20150304' of git://github.com/jcmvbkbc/linux-xtens... (diff) | |
| download | linux-834a316eeebcb75316c0a7d9088fa638c52dc584.tar.xz linux-834a316eeebcb75316c0a7d9088fa638c52dc584.zip | |
xtensa: Fix fix linker script transformation for .text / .text.fixup
Commit 779c88c94c34 ("ARM: 8321/1: asm-generic: introduce .text.fixup
input section") introduced a new .text.fixup section which is merged
with .text at link time. This causes xtensa builds to fail with lots
of error messages similar to the following.
lib/lib.a(kobject.o): In function `kobject_create':
(.text+0x498): dangerous relocation: l32r: literal placed after use:
(.literal+0x150)
Linker script transformation needs to be updated to detect and handle
the new section.
Fixes: 779c88c94c34 ("ARM: 8321/1: asm-generic: introduce .text.fixup
input section")
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile index 18d962a8c0c2..d3a0f0fd56dd 100644 --- a/arch/xtensa/kernel/Makefile +++ b/arch/xtensa/kernel/Makefile @@ -29,6 +29,7 @@ AFLAGS_head.o += -mtext-section-literals sed-y = -e 's/\*(\(\.[a-z]*it\|\.ref\|\)\.text)/*(\1.literal \1.text)/g' \ -e 's/\.text\.unlikely/.literal.unlikely .text.unlikely/g' \ + -e 's/\*(\(\.text .*\))/*(.literal \1)/g' \ -e 's/\*(\(\.text\.[a-z]*\))/*(\1.literal \1)/g' quiet_cmd__cpp_lds_S = LDS $@ |