[PATCH 08/12] Rewrite abi-note.S in C.

[Szabolcs Nagy <szabolcs.nagy@arm.com>]

[-- Attachment #1: 0008-Rewrite-abi-note.S-in-C.patch --]
[-- Type: text/x-diff, Size: 1863 bytes --]

From 0647d5658df82f89d8bf73dec65ef4aa6a4b77a9 Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Wed, 1 Apr 2020 16:02:03 +0100
Subject: [PATCH 08/12] Rewrite abi-note.S in C.

Using C code with __asm() allows the compiler to add target
specific object file markings based on CFLAGS.

This is e.g. needed for building glibc with branch-protection
on AArch64.
---
 csu/{abi-note.S => abi-note.c} | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)
 rename csu/{abi-note.S => abi-note.c} (85%)

diff --git a/csu/abi-note.S b/csu/abi-note.c
similarity index 85%
rename from csu/abi-note.S
rename to csu/abi-note.c
index 2b4b5f8824..5d86b452d9 100644
--- a/csu/abi-note.S
+++ b/csu/abi-note.c
@@ -56,17 +56,21 @@ offset	length	contents
 #include <config.h>
 #include <abi-tag.h>		/* OS-specific ABI tag value */
 
+#define STRINGIFY(...) STRINGIFY_1 (__VA_ARGS__)
+#define STRINGIFY_1(...) #__VA_ARGS__
+
 /* The linker (GNU ld 2.8 and later) recognizes an allocated section whose
    name begins with `.note' and creates a PT_NOTE program header entry
    pointing at it. */
 
-	.section ".note.ABI-tag", "a"
-	.p2align 2
-	.long 1f - 0f		/* name length */
-	.long 3f - 2f		/* data length */
-	.long  1		/* note type */
-0:	.asciz "GNU"		/* vendor name */
-1:	.p2align 2
-2:	.long __ABI_TAG_OS	/* note data: the ABI tag */
-	.long __ABI_TAG_VERSION
-3:	.p2align 2		/* pad out section */
+__asm (
+  "	.section \".note.ABI-tag\", \"a\"\n"
+  "	.p2align 2\n"
+  "	.long 1f - 0f\n"	/* name length */
+  "	.long 3f - 2f\n"	/* data length */
+  "	.long  1\n"		/* note type */
+  "0:	.asciz \"GNU\"\n"	/* vendor name */
+  "1:	.p2align 2\n"
+  "2:	.long " STRINGIFY (__ABI_TAG_OS) "\n"	/* note data: the ABI tag */
+  "	.long " STRINGIFY (__ABI_TAG_VERSION) "\n"
+  "3:	.p2align 2");		/* pad out section */
-- 
2.17.1