From: Szabolcs Nagy <szabolcs.nagy@arm.com>
To: libc-alpha@sourceware.org
Subject: [PATCH v7 01/14] Rewrite abi-note.S in C.
Date: Wed, 8 Jul 2020 13:10:26 +0100 [thread overview]
Message-ID: <c1210543a60c2ba95f27ee94ae648f74e27b1ad7.1594209990.git.szabolcs.nagy@arm.com> (raw)
In-Reply-To: <cover.1594209990.git.szabolcs.nagy@arm.com>
Using C code allows the compiler to add target specific object file
markings based on CFLAGS.
The arm specific abi-note.S is removed and similar object file fix
up will be avoided on AArch64 with standard branch protection.
---
csu/{abi-note.S => abi-note.c} | 25 +++++++++++++++----------
sysdeps/arm/abi-note.S | 8 --------
2 files changed, 15 insertions(+), 18 deletions(-)
rename csu/{abi-note.S => abi-note.c} (89%)
delete mode 100644 sysdeps/arm/abi-note.S
diff --git a/csu/abi-note.S b/csu/abi-note.c
similarity index 89%
rename from csu/abi-note.S
rename to csu/abi-note.c
index 2b4b5f8824..8febf4cac0 100644
--- a/csu/abi-note.S
+++ b/csu/abi-note.c
@@ -53,6 +53,8 @@ offset length contents
identify the earliest release of that OS that supports this ABI.
See abi-tags (top level) for details. */
+#include <link.h>
+#include <stdint.h>
#include <config.h>
#include <abi-tag.h> /* OS-specific ABI tag value */
@@ -60,13 +62,16 @@ offset length contents
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 */
+__attribute__ ((used, aligned (4), section (".note.ABI-tag")))
+static const struct
+{
+ ElfW(Nhdr) nhdr;
+ char name[4];
+ int32_t desc[4];
+} __abi_tag = {
+ { .n_namesz = sizeof __abi_tag.name,
+ .n_descsz = sizeof __abi_tag.desc,
+ .n_type = 1 },
+ "GNU",
+ { __ABI_TAG_OS, __ABI_TAG_VERSION }
+};
diff --git a/sysdeps/arm/abi-note.S b/sysdeps/arm/abi-note.S
deleted file mode 100644
index 07bd4c4619..0000000000
--- a/sysdeps/arm/abi-note.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Tag_ABI_align8_preserved: This code preserves 8-byte
- alignment in any callee. */
- .eabi_attribute 25, 1
-/* Tag_ABI_align8_needed: This code may require 8-byte alignment from
- the caller. */
- .eabi_attribute 24, 1
-
-#include <csu/abi-note.S>
--
2.17.1
next prev parent reply other threads:[~2020-07-08 12:10 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 12:10 [PATCH v7 00/14] aarch64: branch protection support Szabolcs Nagy
2020-07-08 12:10 ` Szabolcs Nagy [this message]
2020-07-08 12:15 ` [PATCH v7 01/14] Rewrite abi-note.S in C Florian Weimer
2020-07-08 12:10 ` [PATCH v7 02/14] aarch64: configure test for BTI support Szabolcs Nagy
2020-07-08 12:11 ` [PATCH v7 03/14] aarch64: Rename place holder .S files to .c Szabolcs Nagy
2020-07-08 12:11 ` [PATCH v7 04/14] aarch64: Add BTI support to assembly files Szabolcs Nagy
2020-07-08 12:11 ` [PATCH v7 05/14] aarch64: fix swapcontext for BTI Szabolcs Nagy
2020-07-08 12:12 ` [PATCH v7 06/14] aarch64: fix RTLD_START " Szabolcs Nagy
2020-07-08 12:12 ` [PATCH v7 07/14] rtld: Clean up PT_NOTE and add PT_GNU_PROPERTY handling Szabolcs Nagy
2020-07-08 13:23 ` H.J. Lu
2020-07-08 13:29 ` Szabolcs Nagy
2020-07-08 12:12 ` [PATCH v7 08/14] aarch64: enable BTI at runtime Szabolcs Nagy
2020-07-08 12:13 ` [PATCH v7 09/14] aarch64: ensure objects are BTI compatible Szabolcs Nagy
2021-09-20 8:58 ` Andreas Schwab
2021-09-20 9:43 ` Andreas Schwab
2021-09-20 10:49 ` Szabolcs Nagy
2021-09-20 10:58 ` Florian Weimer
2021-09-20 11:06 ` Florian Weimer
2021-09-20 11:34 ` Andreas Schwab
2021-09-20 11:40 ` Florian Weimer
2021-09-20 11:55 ` Andreas Schwab
2021-09-20 12:41 ` Szabolcs Nagy
2020-07-08 12:13 ` [PATCH v7 10/14] aarch64: configure check for pac-ret code generation Szabolcs Nagy
2020-07-08 12:13 ` [PATCH v7 11/14] aarch64: Add pac-ret support to assembly files Szabolcs Nagy
2020-07-08 12:13 ` [PATCH v7 12/14] aarch64: fix pac-ret support in _mcount Szabolcs Nagy
2020-07-08 12:14 ` [PATCH v7 13/14] aarch64: redefine RETURN_ADDRESS to strip PAC Szabolcs Nagy
2020-07-08 12:14 ` [PATCH v7 14/14] aarch64: add NEWS entry about branch protection support Szabolcs Nagy
2020-07-08 13:48 ` Adhemerval Zanella
2020-07-08 14:03 ` Szabolcs Nagy
2020-07-24 7:19 ` Florian Weimer
2020-07-24 7:50 ` Szabolcs Nagy
2020-07-24 8:06 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c1210543a60c2ba95f27ee94ae648f74e27b1ad7.1594209990.git.szabolcs.nagy@arm.com \
--to=szabolcs.nagy@arm.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).