about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2015-12-07 15:40:01 +0100
committerMike Frysinger <vapier@gentoo.org>2016-01-24 03:54:02 -0500
commit5b4ed59d74ed8ff011fc9a7a08c27d616b7fe528 (patch)
tree6ccc59cd9cd640d445eb8a566126f5204511c64a
parent23f12d0a815e55ab60a0e6d973fc3f4730ca6980 (diff)
downloadglibc-5b4ed59d74ed8ff011fc9a7a08c27d616b7fe528.tar.gz
glibc-5b4ed59d74ed8ff011fc9a7a08c27d616b7fe528.tar.xz
glibc-5b4ed59d74ed8ff011fc9a7a08c27d616b7fe528.zip
alpha/hppa: fix libc.abilist sorting wrt fmemopen
Commit fdb7d390 introduced the fmemopen symbol at the wrong location
in alpha/libc.abilist and hppa/libc.abilist. The file needs to keep
sorted, fix that.

Note: this is for 2.22 only, for master the format has been changed in
commit 8c77b6ad.

	* sysdeps/unix/sysv/linux/alpha/libc.abilist [GLIBC_2.22]: Move
	to keep the file sorted.
	* sysdeps/unix/sysv/linux/hppa/libc.abilist [GLIBC_2.22]: Likewise.

(cherry picked from commit 3b54d911809643fb6a293807333b7f2cf15a3b50)
-rw-r--r--sysdeps/unix/sysv/linux/alpha/libc.abilist6
-rw-r--r--sysdeps/unix/sysv/linux/hppa/libc.abilist6
2 files changed, 6 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 58c8b32dac..aa20e22dea 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1822,9 +1822,6 @@ GLIBC_2.17
 GLIBC_2.18
  GLIBC_2.18 A
  __cxa_thread_atexit_impl F
-GLIBC_2.22
- GLIBC_2.22 A
- fmemopen F
 GLIBC_2.2
  GLIBC_2.2 A
  _IO_adjust_wcolumn F
@@ -2015,6 +2012,9 @@ GLIBC_2.2.4
 GLIBC_2.2.6
  GLIBC_2.2.6 A
  __nanosleep F
+GLIBC_2.22
+ GLIBC_2.22 A
+ fmemopen F
 GLIBC_2.3
  GLIBC_2.3 A
  __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index cf0ad90275..224e1f36ca 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -95,9 +95,6 @@ GLIBC_2.18
 GLIBC_2.19
  GLIBC_2.19 A
  fanotify_mark F
-GLIBC_2.22
- GLIBC_2.22 A
- fmemopen F
 GLIBC_2.2
  GLIBC_2.2 A
  _Exit F
@@ -1863,6 +1860,9 @@ GLIBC_2.2.4
 GLIBC_2.2.6
  GLIBC_2.2.6 A
  __nanosleep F
+GLIBC_2.22
+ GLIBC_2.22 A
+ fmemopen F
 GLIBC_2.3
  GLIBC_2.3 A
  __ctype_b_loc F