From 7ddace62b0ea4c733fec0a50b52dbdef64f40c9c Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 12 Nov 2013 12:48:01 -0800 Subject: [PATCH] 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. --- ChangeLog | 10 ++++++++++ NEWS | 2 +- sysdeps/sparc/sparc64/multiarch/add_n.S | 2 +- sysdeps/sparc/sparc64/multiarch/addmul_1.S | 2 +- sysdeps/sparc/sparc64/multiarch/mul_1.S | 2 +- sysdeps/sparc/sparc64/multiarch/sub_n.S | 2 +- sysdeps/sparc/sparc64/multiarch/submul_1.S | 2 +- 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d9785befad..ac141b84225 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2013-11-11 David S. Miller + + [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 [BZ #387] diff --git a/NEWS b/NEWS index dfab0dc76bf..a6f25e19b9d 100644 --- 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 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 -- 2.47.3