Commit 673c2c34 authored by Chris Metcalf's avatar Chris Metcalf

modpost: work correctly with tile coldtext sections

The tilegx and tilepro compilers use .coldtext for their unlikely
executed text section name, so an __attribute__((cold)) function
will (when compiled with higher optimization levels) land in
the .coldtext section.

Modify modpost to add .coldtext to the set of OTHER_TEXT_SECTIONS
so we don't get warnings about referencing such a section in an
__ex_table block, and then also modify arch/tile/lib/memcpy_user_64.c
so that it uses plain ".coldtext" instead of ".coldtext.memcpy".
The latter naming is a relic of an earlier use of -ffunction-sections,
which we no longer use by default.
Signed-off-by: default avatarChris Metcalf <cmetcalf@ezchip.com>
Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent d770e558
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#define _ST(p, inst, v) \ #define _ST(p, inst, v) \
({ \ ({ \
asm("1: " #inst " %0, %1;" \ asm("1: " #inst " %0, %1;" \
".pushsection .coldtext.memcpy,\"ax\";" \ ".pushsection .coldtext,\"ax\";" \
"2: { move r0, %2; jrp lr };" \ "2: { move r0, %2; jrp lr };" \
".section __ex_table,\"a\";" \ ".section __ex_table,\"a\";" \
".align 8;" \ ".align 8;" \
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
({ \ ({ \
unsigned long __v; \ unsigned long __v; \
asm("1: " #inst " %0, %1;" \ asm("1: " #inst " %0, %1;" \
".pushsection .coldtext.memcpy,\"ax\";" \ ".pushsection .coldtext,\"ax\";" \
"2: { move r0, %2; jrp lr };" \ "2: { move r0, %2; jrp lr };" \
".section __ex_table,\"a\";" \ ".section __ex_table,\"a\";" \
".align 8;" \ ".align 8;" \
......
...@@ -886,7 +886,8 @@ static void check_section(const char *modname, struct elf_info *elf, ...@@ -886,7 +886,8 @@ static void check_section(const char *modname, struct elf_info *elf,
#define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \ #define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \
".kprobes.text" ".kprobes.text"
#define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \ #define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \
".fixup", ".entry.text", ".exception.text", ".text.*" ".fixup", ".entry.text", ".exception.text", ".text.*", \
".coldtext"
#define INIT_SECTIONS ".init.*" #define INIT_SECTIONS ".init.*"
#define MEM_INIT_SECTIONS ".meminit.*" #define MEM_INIT_SECTIONS ".meminit.*"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment