From: Roland McGrath <roland@hack.frob.com>
Date: Wed, 15 Oct 2014 20:32:33 +0000 (-0700)
Subject: shlib-versions revamp
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0669f237aeff5d8a48e9ba9900aa76db3a356eae;p=thirdparty%2Fglibc.git

shlib-versions revamp
---

diff --git a/sysdeps/arm/nacl/shlib-versions b/sysdeps/arm/nacl/shlib-versions
new file mode 100644
index 00000000000..9d94784282e
--- /dev/null
+++ b/sysdeps/arm/nacl/shlib-versions
@@ -0,0 +1,4 @@
+# Library=version		Earliest symbol set (optional)
+# ---------------		------------------------------
+
+ld=ld-nacl-arm.so.1
diff --git a/sysdeps/nacl/shlib-versions b/sysdeps/nacl/shlib-versions
index 2ab1f3cca13..dc122bf3f54 100644
--- a/sysdeps/nacl/shlib-versions
+++ b/sysdeps/nacl/shlib-versions
@@ -1,17 +1,9 @@
-# Configuration		DEFAULT			Earliest symbol set
-# -------------		---------------		------------------------------
-.*-.*-nacl.*		DEFAULT			GLIBC_2.19
+# DEFAULT			Earliest symbol set
+# -------			-------------------
+DEFAULT				GLIBC_2.20
 
-# Configuration		ABI			Identifier for ABI data files
-# -------------		----------		-----------------------------
-.*-.*-nacl.*		ABI			nacl
+# Library=version		Earliest symbol set (optional)
+# ---------------		------------------------------
 
-# Configuration		Library=version		Earliest symbol set (optional)
-# -------------		---------------		------------------------------
-
-.*-.*-nacl.*		libc=1
-.*-.*-nacl.*		libm=1
-
-arm.*-.*-nacl.*		ld=ld-nacl-arm.so.1
-i.86-.*-nacl.*		ld=ld-nacl-x86-32.so.1
-x86_64-.*-nacl.*	ld=ld-nacl-x86-64.so.1
+libc=1
+libm=1