Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 673c2c34 authored Jul 08, 2015 by 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: Chris Metcalf <cmetcalf@ezchip.com>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>

parent d770e558

arch/tile/lib/memcpy_user_64.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		#define _ST(p, inst, v) \
		({ \
		asm("1: " #inst " %0, %1;" \
		".pushsection .coldtext.memcpy,\"ax\";" \
		".pushsection .coldtext,\"ax\";" \
		"2: { move r0, %2; jrp lr };" \
		".section __ex_table,\"a\";" \
		".align 8;" \
		@@ -41,7 +41,7 @@
		({ \
		unsigned long __v; \
		asm("1: " #inst " %0, %1;" \
		".pushsection .coldtext.memcpy,\"ax\";" \
		".pushsection .coldtext,\"ax\";" \
		"2: { move r0, %2; jrp lr };" \
		".section __ex_table,\"a\";" \
		".align 8;" \

scripts/mod/modpost.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -886,7 +886,8 @@ static void check_section(const char modname, struct elf_info elf,
		#define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \
		".kprobes.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 MEM_INIT_SECTIONS ".meminit.*"