aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-11-12 12:48:01 -0800
committerDavid S. Miller <davem@davemloft.net>2013-11-12 16:15:34 -0500
commit2293d2b10a583486cd22ce578796848f4c3a8b6d (patch)
tree690d89b988eb4f0dc984bf67d5ab205f5315c16c
parent2216e48645dbd297cdc0f4050fdfc0b52e2a4ab8 (diff)
downloadtermbaud-2293d2b10a583486cd22ce578796848f4c3a8b6d.tar.gz
termbaud-2293d2b10a583486cd22ce578796848f4c3a8b6d.tar.xz
termbaud-2293d2b10a583486cd22ce578796848f4c3a8b6d.zip
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.
-rw-r--r--ChangeLog10
-rw-r--r--NEWS2
-rw-r--r--sysdeps/sparc/sparc64/multiarch/add_n.S2
-rw-r--r--sysdeps/sparc/sparc64/multiarch/addmul_1.S2
-rw-r--r--sysdeps/sparc/sparc64/multiarch/mul_1.S2
-rw-r--r--sysdeps/sparc/sparc64/multiarch/sub_n.S2
-rw-r--r--sysdeps/sparc/sparc64/multiarch/submul_1.S2
7 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 01ce02c751f..1e5efa74c03 100644
--- 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 1b04db605af..df97235ac8c 100644
--- 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.
Version 2.18
diff --git a/sysdeps/sparc/sparc64/multiarch/add_n.S b/sysdeps/sparc/sparc64/multiarch/add_n.S
index 25cae3977a4..22c6e583d0c 100644
--- 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 a1659e40e3e..a65c934d9b8 100644
--- 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 25f51bf810f..811754ed8b1 100644
--- 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 5e15bea1019..39637905f35 100644
--- 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 68552e9af03..6c4c3a36cf0 100644
--- 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