[RFC PATCH 1/6] linkage: add SYM_{ENTRY,START,END}_AT()

[Mark Rutland]

Currently, the SYM_{ENTRY,START,END}() helpers define symbols in terms
of the current position within the section. In subsequent patches we'll
need to define symbols after moving this position.

This patch splits the core out of SYM_{ENTRY,START,END}() into
SYM_{ENTRY,START,END}_AT() macros which take a location argument,
with SYM_{ENTRY,START,END}() passing the current position.

There should be no functional change as a result of this patch.

TODO:

* Handle tools/ copy

Signed-off-by: Mark Rutland <mark.rutland at arm.com>
Cc: Borislav Petkov <bp at alien8.de>
Cc: Jiri Slaby <jslaby at suse.cz>
Cc: Josh Poimboeuf <jpoimboe at redhat.com>
Cc: Peter Zijlstra <peterz at infradead.org>
---
 include/linux/linkage.h | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index dbf8506decca..45a4c0fcef7d 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -147,25 +147,42 @@
 
 /* === generic annotations === */
 
+#ifndef SYM_ENTRY_AT
+#define SYM_ENTRY_AT(name, location, linkage, align...)	\
+	linkage(name) ASM_NL				\
+	.set name, location ASM_NL
+#endif
+
 /* SYM_ENTRY -- use only if you have to for non-paired symbols */
 #ifndef SYM_ENTRY
 #define SYM_ENTRY(name, linkage, align...)		\
-	linkage(name) ASM_NL				\
 	align ASM_NL					\
-	name:
+	SYM_ENTRY_AT(name, ., linkage, align)
+#endif
+
+/* SYM_START_AT -- use only if you have to */
+#ifndef SYM_START_AT
+#define SYM_START_AT(name, location, linkage, align...)	\
+	SYM_ENTRY_AT(name, location, linkage, align)
 #endif
 
 /* SYM_START -- use only if you have to */
 #ifndef SYM_START
 #define SYM_START(name, linkage, align...)		\
-	SYM_ENTRY(name, linkage, align)
+	SYM_START_AT(name, ., linkage, align)
+#endif
+
+/* SYM_END_AT -- use only if you have to */
+#ifndef SYM_END_AT
+#define SYM_END_AT(name, location, sym_type)		\
+	.type name sym_type ASM_NL			\
+	.size name, location-name ASM_NL
 #endif
 
 /* SYM_END -- use only if you have to */
 #ifndef SYM_END
 #define SYM_END(name, sym_type)				\
-	.type name sym_type ASM_NL			\
-	.size name, .-name
+	SYM_END_AT(name, ., sym_type)
 #endif
 
 /* === code annotations === */
-- 
2.30.2