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 01ce02c751fa8bc69b30082aaadb54b91a68f927..1e5efa74c03661940980ab5864463c4a738ac892 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-06  David S. Miller  <davem@davemloft.net>
 
        [BZ #15985]

diff --git a/NEWS b/NEWS
index 1b04db605af8e7ad3e08b5e35dadcc207ff9924e..df97235ac8cbf96491ce64da982c4e5ebd05fffa 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.18.1
 
 * The following bugs are resolved with this release:
 
-  15909, 15996.
+  15909, 15996, 16150.
 \f
 Version 2.18
 

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