Fix sparc 64-bit GMP ifunc resolution in static builds.

	[BZ #16150]
	* sysdeps/sparc/sparc64/multiarch/add_n.S: Resolve to the correct generic
	symbol in the non-vis3 case in static builds.
	* sysdeps/sparc/sparc64/multiarch/addmul_1.S: Likewise.
	* sysdeps/sparc/sparc64/multiarch/mul_1.S: Likewise.
	* sysdeps/sparc/sparc64/multiarch/sub_n.S: Likewise.
	* sysdeps/sparc/sparc64/multiarch/submul_1.S: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 2d9785befad90c1086e91c3aa872fd7db8132cb3..ac141b84225cb39d03b761f5ff6c5d931b87e59c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-11-11  David S. Miller  <davem@davemloft.net>
+
+       [BZ #16150]
+       * sysdeps/sparc/sparc64/multiarch/add_n.S: Resolve to the correct generic
+       symbol in the non-vis3 case in static builds.
+       * sysdeps/sparc/sparc64/multiarch/addmul_1.S: Likewise.
+       * sysdeps/sparc/sparc64/multiarch/mul_1.S: Likewise.
+       * sysdeps/sparc/sparc64/multiarch/sub_n.S: Likewise.
+       * sysdeps/sparc/sparc64/multiarch/submul_1.S: Likewise.
+
 2013-11-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        [BZ #387]

diff --git a/NEWS b/NEWS
index dfab0dc76bf9fcbc25b3073a9763e69d02182a12..a6f25e19b9d9306dde34bb3158c8755d7f05f102 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,7 @@ Version 2.19
   15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887,
   15890, 15892, 15893, 15895, 15897, 15905, 15909, 15917, 15919, 15921,
   15923, 15939, 15948, 15963, 15966, 15985, 15988, 16032, 16034, 16036,
-  16037, 16041, 16071, 16072, 16074, 16078, 16112, 16153.
+  16037, 16041, 16071, 16072, 16074, 16078, 16112, 16150, 16153.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache

diff --git a/sysdeps/sparc/sparc64/multiarch/add_n.S b/sysdeps/sparc/sparc64/multiarch/add_n.S
index 25cae3977a4b8a842a7e27b765f1a75d03e434f5..22c6e583d0c87e843937063b19b708bbb59db37c 100644 (file)
--- a/sysdeps/sparc/sparc64/multiarch/add_n.S
+++ b/sysdeps/sparc/sparc64/multiarch/add_n.S
@@ -42,7 +42,7 @@ ENTRY(__mpn_add_n)
        sethi   %gdop_hix22(__mpn_add_n_generic), %o1
        xor     %o1, %gdop_lox10(__mpn_add_n_generic), %o1
 # else
-       set     __mpn_add_n_vis3, %o1
+       set     __mpn_add_n_generic, %o1
 # endif
 10:
 # ifdef SHARED

diff --git a/sysdeps/sparc/sparc64/multiarch/addmul_1.S b/sysdeps/sparc/sparc64/multiarch/addmul_1.S
index a1659e40e3ea3aca761103210767849652d70e4a..a65c934d9b8b2b05c1b0fb7da97b0464e486280f 100644 (file)
--- a/sysdeps/sparc/sparc64/multiarch/addmul_1.S
+++ b/sysdeps/sparc/sparc64/multiarch/addmul_1.S
@@ -42,7 +42,7 @@ ENTRY(__mpn_addmul_1)
        sethi   %gdop_hix22(__mpn_addmul_1_generic), %o1
        xor     %o1, %gdop_lox10(__mpn_addmul_1_generic), %o1
 # else
-       set     __mpn_addmul_1_vis3, %o1
+       set     __mpn_addmul_1_generic, %o1
 # endif
 10:
 # ifdef SHARED

diff --git a/sysdeps/sparc/sparc64/multiarch/mul_1.S b/sysdeps/sparc/sparc64/multiarch/mul_1.S
index 25f51bf810f9309a54a8eb08abee839d786803b1..811754ed8b1b15cd0e158798b6be73674fae3ab3 100644 (file)
--- a/sysdeps/sparc/sparc64/multiarch/mul_1.S
+++ b/sysdeps/sparc/sparc64/multiarch/mul_1.S
@@ -42,7 +42,7 @@ ENTRY(__mpn_mul_1)
        sethi   %gdop_hix22(__mpn_mul_1_generic), %o1
        xor     %o1, %gdop_lox10(__mpn_mul_1_generic), %o1
 # else
-       set     __mpn_mul_1_vis3, %o1
+       set     __mpn_mul_1_generic, %o1
 # endif
 10:
 # ifdef SHARED

diff --git a/sysdeps/sparc/sparc64/multiarch/sub_n.S b/sysdeps/sparc/sparc64/multiarch/sub_n.S
index 5e15bea10198788dd0125cae9a1604a89791746d..39637905f3546d0da3368eec2e58e0b38bf75e9a 100644 (file)
--- a/sysdeps/sparc/sparc64/multiarch/sub_n.S
+++ b/sysdeps/sparc/sparc64/multiarch/sub_n.S
@@ -42,7 +42,7 @@ ENTRY(__mpn_sub_n)
        sethi   %gdop_hix22(__mpn_sub_n_generic), %o1
        xor     %o1, %gdop_lox10(__mpn_sub_n_generic), %o1
 # else
-       set     __mpn_sub_n_vis3, %o1
+       set     __mpn_sub_n_generic, %o1
 # endif
 10:
 # ifdef SHARED

diff --git a/sysdeps/sparc/sparc64/multiarch/submul_1.S b/sysdeps/sparc/sparc64/multiarch/submul_1.S
index 68552e9af03d0ededc370f128dbdabcb0bcd8ec1..6c4c3a36cf00d414025ef05139dec7df52ea0383 100644 (file)
--- a/sysdeps/sparc/sparc64/multiarch/submul_1.S
+++ b/sysdeps/sparc/sparc64/multiarch/submul_1.S
@@ -42,7 +42,7 @@ ENTRY(__mpn_submul_1)
        sethi   %gdop_hix22(__mpn_submul_1_generic), %o1
        xor     %o1, %gdop_lox10(__mpn_submul_1_generic), %o1
 # else
-       set     __mpn_submul_1_vis3, %o1
+       set     __mpn_submul_1_generic, %o1
 # endif
 10:
 # ifdef SHARED