This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 10/12] Move __fentry__ version definition to sysdeps/{i386,x86_64}
- From: Ilya Leoshkevich <iii at linux dot ibm dot com>
- To: libc-alpha at sourceware dot org
- Cc: stli at linux dot ibm dot com, Ilya Leoshkevich <iii at linux dot ibm dot com>
- Date: Thu, 2 Aug 2018 09:57:33 +0200
- Subject: [PATCH 10/12] Move __fentry__ version definition to sysdeps/{i386,x86_64}
- References: <20180802075735.3457-1-iii@linux.ibm.com>
__fentry__ symbol is currently not defined for other architectures.
Attempts to introduce it cause abicheck to fail, because it will be
available since 2.29 earliest, and not 2.13, which is the case for
Intel. With the new code, abicheck passes for i686-linux-gnu,
x86_64-linux-gnu and x86_64-linux-gnu32 triples.
* stdlib/Versions: Remove __fentry__.
* sysdeps/i386/Versions: Add __fentry__.
* sysdeps/x86_64/Versions: Add __fentry__.
---
stdlib/Versions | 3 ---
sysdeps/i386/Versions | 3 +++
sysdeps/x86_64/Versions | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/stdlib/Versions b/stdlib/Versions
index a2dfa322ed..9e665d4c26 100644
--- a/stdlib/Versions
+++ b/stdlib/Versions
@@ -105,9 +105,6 @@ libc {
GLIBC_2.10 {
quick_exit; __cxa_at_quick_exit;
}
- GLIBC_2.13 {
- __fentry__;
- }
GLIBC_2.17 {
secure_getenv;
}
diff --git a/sysdeps/i386/Versions b/sysdeps/i386/Versions
index 7be44aad7a..36e23b466a 100644
--- a/sysdeps/i386/Versions
+++ b/sysdeps/i386/Versions
@@ -25,6 +25,9 @@ libc {
__strpbrk_cg; __strpbrk_g; __strrchr_c; __strrchr_g; __strspn_c1;
__strspn_cg; __strspn_g; __strstr_cg; __strstr_g;
}
+ GLIBC_2.13 {
+ __fentry__;
+ }
}
libm {
GLIBC_2.1 {
diff --git a/sysdeps/x86_64/Versions b/sysdeps/x86_64/Versions
index a437f85e6e..e94758b236 100644
--- a/sysdeps/x86_64/Versions
+++ b/sysdeps/x86_64/Versions
@@ -2,6 +2,9 @@ libc {
GLIBC_2.14 {
memcpy;
}
+ GLIBC_2.13 {
+ __fentry__;
+ }
}
libm {
GLIBC_2.1 {
--
2.18.0