From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Fri, 10 Aug 2018 07:07:44 +0000 (+0200)
Subject: Move __fentry__ version definition to sysdeps/{i386,x86_64}
X-Git-Tag: glibc-2.29~551
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d997d2253e742546db2b27c8ee56edbbe4c906c;p=thirdparty%2Fglibc.git

Move __fentry__ version definition to sysdeps/{i386,x86_64}

__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.

ChangeLog:

	* stdlib/Versions: Remove __fentry__.
	* sysdeps/i386/Versions: Add __fentry__.
	* sysdeps/x86_64/Versions: Add __fentry__.
---

diff --git a/ChangeLog b/ChangeLog
index ae2868ffe0f..1d71d936c8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-10  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	* stdlib/Versions: Remove __fentry__.
+	* sysdeps/i386/Versions: Add __fentry__.
+	* sysdeps/x86_64/Versions: Add __fentry__.
+
 2018-08-10  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	* sysdeps/s390/Makefile: Register the new tests.
diff --git a/stdlib/Versions b/stdlib/Versions
index a2dfa322edb..9e665d4c26c 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 7be44aad7ac..36e23b466a6 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 a437f85e6ef..e94758b2364 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 {