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 ae2868ffe0fd8cb2e628cbdf3cfb563fc5a482c1..1d71d936c8a68bb49dee75e41615b36d55a0fa7a 100644 (file)
--- 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 a2dfa322edb2ee305d7c182591e4dd330b11f1c6..9e665d4c26c3a9a4d9ca1fb5ffa5fd684a212bd1 100644 (file)
--- 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 7be44aad7ac00adec5b0eba9007dd157993399b0..36e23b466a622f438207a53284bdec1d7bd0ba7f 100644 (file)
--- 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 a437f85e6efb3fa868f5ef07068e00dab8544010..e94758b23643a9056ae176f3a18d7f46686049b0 100644 (file)
--- 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 {