* sysdeps/generic/w_exp2.c [NO_LONG_DOUBLE]: Fix typos in alias names.

	Reported by Mark Mitchell <mark@codesourcery.com>.
	* Versions.def (libm): Define GLIBC_2.4 set.
	* math/Versions (libm: GLIBC_2.4): Add this set, with exp2l.
	* sysdeps/i386/Versions (libm: GLIBC_2.1): Add this set, with exp2l.
	* sysdeps/ia64/Versions: Likewise.
	* sysdeps/m68k/Versions: Likewise.
	* sysdeps/sparc/sparc64/Versions: Likewise.
	* sysdeps/x86_64/Versions: New file.
	* sysdeps/mips/mips64/Versions: New file.

10 files changed, 64 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f465a1d69a..15e1a3f003 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2005-03-28  Roland McGrath  <roland@redhat.com>
 
+	* sysdeps/generic/w_exp2.c [NO_LONG_DOUBLE]: Fix typos in alias names.
+	Reported by Mark Mitchell <mark@codesourcery.com>.
+	* Versions.def (libm): Define GLIBC_2.4 set.
+	* math/Versions (libm: GLIBC_2.4): Add this set, with exp2l.
+	* sysdeps/i386/Versions (libm: GLIBC_2.1): Add this set, with exp2l.
+	* sysdeps/ia64/Versions: Likewise.
+	* sysdeps/m68k/Versions: Likewise.
+	* sysdeps/sparc/sparc64/Versions: Likewise.
+	* sysdeps/x86_64/Versions: New file.
+	* sysdeps/mips/mips64/Versions: New file.
+
 	* locale/langinfo.h (_NL_LOCALE_NAME): New macro.
 	[__USE_GNU] (NL_LOCALE_NAME): New macro.
 	* locale/nl_langinfo.c: Grok special item value for _NL_LOCALE_NAME,
diff --git a/Versions.def b/Versions.def
index 81b31386bd..6ae43c79d6 100644
--- a/Versions.def
+++ b/Versions.def
@@ -44,6 +44,7 @@ libm {
   GLIBC_2.2
   GLIBC_2.2.3
   GLIBC_2.3.4
+  GLIBC_2.4
 }
 libnsl {
   GLIBC_2.0
diff --git a/math/Versions b/math/Versions
index bd24fc6698..39c47626f6 100644
--- a/math/Versions
+++ b/math/Versions
@@ -94,7 +94,7 @@ libm {
   }
   GLIBC_2.1 {
     # mathematical functions
-    exp2; exp2f; exp2l;
+    exp2; exp2f; # exp2l; -- bug omitted this until GLIBC_2.4 (below)
     exp10; exp10f; exp10l;
     fdim; fdimf; fdiml;
     fma; fmaf; fmal;
@@ -161,4 +161,11 @@ libm {
     # fp environment function
     feenableexcept; fedisableexcept; fegetexcept;
   }
+  GLIBC_2.4 {
+    # A bug in sysdeps/generic/w_exp2.c kept this from appearing
+    # in GLIBC_2.1 as it should have on platforms using that
+    # implementation file.  On others, sysdeps/CPU/Versions now
+    # puts exp2l in GLIBC_2.1, which will override this entry.
+    exp2l;
+  }
 }
diff --git a/sysdeps/generic/w_exp2.c b/sysdeps/generic/w_exp2.c
index 4e667d770e..ccf6a1cd6a 100644
--- a/sysdeps/generic/w_exp2.c
+++ b/sysdeps/generic/w_exp2.c
@@ -31,6 +31,6 @@ __exp2 (double x)		/* wrapper exp2 */
 }
 weak_alias (__exp2, exp2)
 #ifdef NO_LONG_DOUBLE
-strong_alias (__exp2, __expl2)
-weak_alias (__exp2, expl2)
+strong_alias (__exp2, __exp2l)
+weak_alias (__exp2, exp2l)
 #endif
diff --git a/sysdeps/i386/Versions b/sysdeps/i386/Versions
index b20d7cc027..b0230d31cf 100644
--- a/sysdeps/i386/Versions
+++ b/sysdeps/i386/Versions
@@ -20,3 +20,10 @@ libc {
     __strspn_cg; __strspn_g; __strstr_cg; __strstr_g;
   }
 }
+libm {
+  GLIBC_2.1 {
+    # A generic bug got this omitted from other configurations' version
+    # sets, but we always had it.
+    exp2l;
+  }
+}
diff --git a/sysdeps/ia64/Versions b/sysdeps/ia64/Versions
index 6910566ac9..56b417d614 100644
--- a/sysdeps/ia64/Versions
+++ b/sysdeps/ia64/Versions
@@ -12,3 +12,10 @@ libc {
     __multi3;
   }
 }
+libm {
+  GLIBC_2.1 {
+    # A generic bug got this omitted from other configurations' version
+    # sets, but we always had it.
+    exp2l;
+  }
+}
diff --git a/sysdeps/m68k/Versions b/sysdeps/m68k/Versions
index 2b020f8f58..f450291a9b 100644
--- a/sysdeps/m68k/Versions
+++ b/sysdeps/m68k/Versions
@@ -4,3 +4,10 @@ libc {
     __divdi3; __moddi3; __udivdi3; __umoddi3;
   }
 }
+libm {
+  GLIBC_2.1 {
+    # A generic bug got this omitted from other configurations' version
+    # sets, but we always had it.
+    exp2l;
+  }
+}
diff --git a/sysdeps/mips/mips64/Versions b/sysdeps/mips/mips64/Versions
new file mode 100644
index 0000000000..253a65f04e
--- /dev/null
+++ b/sysdeps/mips/mips64/Versions
@@ -0,0 +1,7 @@
+libm {
+  GLIBC_2.1 {
+    # A generic bug got this omitted from other configurations' version
+    # sets, but we always had it.
+    exp2l;
+  }
+}
diff --git a/sysdeps/sparc/sparc64/Versions b/sysdeps/sparc/sparc64/Versions
index 99fe741a12..4cef7bcc71 100644
--- a/sysdeps/sparc/sparc64/Versions
+++ b/sysdeps/sparc/sparc64/Versions
@@ -5,3 +5,10 @@ libc {
     __align_cpy_8; __align_cpy_16;
   }
 }
+libm {
+  GLIBC_2.1 {
+    # A generic bug got this omitted from other configurations' version
+    # sets, but we always had it.
+    exp2l;
+  }
+}
diff --git a/sysdeps/x86_64/Versions b/sysdeps/x86_64/Versions
new file mode 100644
index 0000000000..253a65f04e
--- /dev/null
+++ b/sysdeps/x86_64/Versions
@@ -0,0 +1,7 @@
+libm {
+  GLIBC_2.1 {
+    # A generic bug got this omitted from other configurations' version
+    # sets, but we always had it.
+    exp2l;
+  }
+}