Fix libm mpone, mptwo namespace (bug 17616).

libm uses symbols mpone and mptwo for internal purposes.  This patch
moves them to the implementation namespace (__mpone and __mptwo).

Tested for x86_64 (testsuite, and that installed stripped shared
libraries are unchanged by the patch).

	[BZ #17616]
	* sysdeps/ieee754/dbl-64/mpa.c (mpone): Rename to __mpone.
	(mptwo): Rename to __mptwo.
	(__inv): Use __mptwo instead of mptwo.
	* sysdeps/ieee754/dbl-64/mpa.h (mpone): Rename to __mpone.
	(mptwo): Rename to __mptwo.
	* sysdeps/ieee754/dbl-64/mpatan.c (__mpatan): Use __mpone instead
	of mpone and __mptwo instead of mptwo.
	* sysdeps/ieee754/dbl-64/mpatan2.c (__mpatan2): Use __mpone
	instead of mpone.
	* sysdeps/ieee754/dbl-64/mpexp.c (__mpexp): Likewise.
	* sysdeps/ieee754/dbl-64/mplog.c (__mplog): Likewise.
	* sysdeps/ieee754/dbl-64/sincos32.c (__c32): Use __mpone instead
	of mpone and __mptwo instead of mptwo.
	(__mpranred): Use __mpone instead of mpone.
	* conform/Makefile (test-xfail-ISO/math.h/linknamespace): Remove
	variable.
	(test-xfail-ISO99/complex.h/linknamespace): Likewise.
	(test-xfail-ISO99/math.h/linknamespace): Likewise.
	(test-xfail-ISO99/tgmath.h/linknamespace): Likewise.
	(test-xfail-ISO11/complex.h/linknamespace): Likewise.
	(test-xfail-ISO11/math.h/linknamespace): Likewise.
	(test-xfail-ISO11/tgmath.h/linknamespace): Likewise.
	(test-xfail-XPG3/math.h/linknamespace): Likewise.
	(test-xfail-XPG4/math.h/linknamespace): Likewise.
	(test-xfail-POSIX/math.h/linknamespace): Likewise.
	(test-xfail-UNIX98/math.h/linknamespace): Likewise.
	(test-xfail-XOPEN2K/complex.h/linknamespace): Likewise.
	(test-xfail-XOPEN2K/math.h/linknamespace): Likewise.
	(test-xfail-XOPEN2K/tgmath.h/linknamespace): Likewise.
	(test-xfail-POSIX2008/complex.h/linknamespace): Likewise.
	(test-xfail-POSIX2008/math.h/linknamespace): Likewise.
	(test-xfail-POSIX2008/tgmath.h/linknamespace): Likewise.
	(test-xfail-XOPEN2K8/complex.h/linknamespace): Likewise.
	(test-xfail-XOPEN2K8/math.h/linknamespace): Likewise.
	(test-xfail-XOPEN2K8/tgmath.h/linknamespace): Likewise.

7 files changed, 13 insertions, 13 deletions

diff --git a/sysdeps/ieee754/dbl-64/mpa.c b/sysdeps/ieee754/dbl-64/mpa.c
index 9f7f44fa48..44659ccff4 100644
--- a/sysdeps/ieee754/dbl-64/mpa.c
+++ b/sysdeps/ieee754/dbl-64/mpa.c
@@ -50,8 +50,8 @@
 #endif
 
 #ifndef NO__CONST
-const mp_no mpone = { 1, { 1.0, 1.0 } };
-const mp_no mptwo = { 1, { 1.0, 2.0 } };
+const mp_no __mpone = { 1, { 1.0, 1.0 } };
+const mp_no __mptwo = { 1, { 1.0, 2.0 } };
 #endif
 
 #ifndef NO___ACR
@@ -877,7 +877,7 @@ __inv (const mp_no *x, mp_no *y, int p)
     {
       __cpy (y, &w, p);
       __mul (x, &w, y, p);
-      __sub (&mptwo, y, &z, p);
+      __sub (&__mptwo, y, &z, p);
       __mul (&w, &z, y, p);
     }
 }
diff --git a/sysdeps/ieee754/dbl-64/mpa.h b/sysdeps/ieee754/dbl-64/mpa.h
index bf1ad873d1..a4fb1d4f65 100644
--- a/sysdeps/ieee754/dbl-64/mpa.h
+++ b/sysdeps/ieee754/dbl-64/mpa.h
@@ -71,8 +71,8 @@ typedef union
   double d;
 } number;
 
-extern const mp_no mpone;
-extern const mp_no mptwo;
+extern const mp_no __mpone;
+extern const mp_no __mptwo;
 
 #define  X   x->d
 #define  Y   y->d
diff --git a/sysdeps/ieee754/dbl-64/mpatan.c b/sysdeps/ieee754/dbl-64/mpatan.c
index 49ecdd2d85..2f2c544458 100644
--- a/sysdeps/ieee754/dbl-64/mpatan.c
+++ b/sysdeps/ieee754/dbl-64/mpatan.c
@@ -83,10 +83,10 @@ __mpatan (mp_no *x, mp_no *y, int p)
     {
       for (i = 0; i < m; i++)
 	{
-	  __add (&mpone, &mpsm, &mpt1, p);
+	  __add (&__mpone, &mpsm, &mpt1, p);
 	  __mpsqrt (&mpt1, &mpt2, p);
 	  __add (&mpt2, &mpt2, &mpt1, p);
-	  __add (&mptwo, &mpsm, &mpt2, p);
+	  __add (&__mptwo, &mpsm, &mpt2, p);
 	  __add (&mpt1, &mpt2, &mpt3, p);
 	  __dvd (&mpsm, &mpt3, &mpt1, p);
 	  __cpy (&mpt1, &mpsm, p);
diff --git a/sysdeps/ieee754/dbl-64/mpatan2.c b/sysdeps/ieee754/dbl-64/mpatan2.c
index 5249492666..c84a4b3cdb 100644
--- a/sysdeps/ieee754/dbl-64/mpatan2.c
+++ b/sysdeps/ieee754/dbl-64/mpatan2.c
@@ -52,7 +52,7 @@ __mpatan2 (mp_no *y, mp_no *x, mp_no *z, int p)
       __mul (&mpt1, &mpt1, &mpt2, p);
       if (mpt1.d[0] != 0)
 	mpt1.d[0] = 1;
-      __add (&mpt2, &mpone, &mpt3, p);
+      __add (&mpt2, &__mpone, &mpt3, p);
       __mpsqrt (&mpt3, &mpt2, p);
       __add (&mpt1, &mpt2, &mpt3, p);
       mpt3.d[0] = Y[0];
diff --git a/sysdeps/ieee754/dbl-64/mpexp.c b/sysdeps/ieee754/dbl-64/mpexp.c
index 0096afb836..4a4ccdb032 100644
--- a/sysdeps/ieee754/dbl-64/mpexp.c
+++ b/sysdeps/ieee754/dbl-64/mpexp.c
@@ -140,7 +140,7 @@ __mpexp (mp_no *x, mp_no *y, int p)
     }
   __dbl_mp (kf, &mpk, p);
   __dvd (&mpt2, &mpk, &mpt1, p);
-  __add (&mpone, &mpt1, &mpt2, p);
+  __add (&__mpone, &mpt1, &mpt2, p);
 
   /* Raise polynomial value to the power of 2**m. Put result in y.  */
   for (k = 0, j = 0; k < m;)
diff --git a/sysdeps/ieee754/dbl-64/mplog.c b/sysdeps/ieee754/dbl-64/mplog.c
index 75adac9df6..a0a37793bd 100644
--- a/sysdeps/ieee754/dbl-64/mplog.c
+++ b/sysdeps/ieee754/dbl-64/mplog.c
@@ -58,7 +58,7 @@ __mplog (mp_no *x, mp_no *y, int p)
       mpt1.d[0] = -mpt1.d[0];
       __mpexp (&mpt1, &mpt2, p);
       __mul (x, &mpt2, &mpt1, p);
-      __sub (&mpt1, &mpone, &mpt2, p);
+      __sub (&mpt1, &__mpone, &mpt2, p);
       __add (y, &mpt2, &mpt1, p);
       __cpy (&mpt1, y, p);
     }
diff --git a/sysdeps/ieee754/dbl-64/sincos32.c b/sysdeps/ieee754/dbl-64/sincos32.c
index 6b2fa878a4..52f7bbc728 100644
--- a/sysdeps/ieee754/dbl-64/sincos32.c
+++ b/sysdeps/ieee754/dbl-64/sincos32.c
@@ -118,11 +118,11 @@ __c32 (mp_no *x, mp_no *y, mp_no *z, int p)
       __mul (&c, &s, &t, p);
       __sub (&s, &t, &t1, p);
       __add (&t1, &t1, &s, p);
-      __sub (&mptwo, &c, &t1, p);
+      __sub (&__mptwo, &c, &t1, p);
       __mul (&t1, &c, &t2, p);
       __add (&t2, &t2, &c, p);
     }
-  __sub (&mpone, &c, y, p);
+  __sub (&__mpone, &c, y, p);
   __cpy (&s, z, p);
 }
 
@@ -352,7 +352,7 @@ __mpranred (double x, mp_no *y, int p)
       if (c.d[1] >= HALFRAD)
 	{
 	  t += 1.0;
-	  __sub (&c, &mpone, &b, p);
+	  __sub (&c, &__mpone, &b, p);
 	  __mul (&b, &hp, y, p);
 	}
       else