Fix build on pre-v9 32-bit Sparc.

We cannot use fnegd in this code, as fnegd was added in v9.
Only fnegs exists in v8 and earlier.

	[BZ #15985]
	* sysdeps/sparc/sparc32/fpu/s_fdim.S (__fdim): Do not use fnegd
	on pre-v9 cpus, use a fnegs+fmovs sequence instead.

diff --git a/ChangeLog b/ChangeLog
index 0dbefe37ffe9c701f866cf9c54a46d5a355e4dc9..01ce02c751fa8bc69b30082aaadb54b91a68f927 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-06  David S. Miller  <davem@davemloft.net>
+
+       [BZ #15985]
+       * sysdeps/sparc/sparc32/fpu/s_fdim.S (__fdim): Do not use fnegd
+       on pre-v9 cpus, use a fnegs+fmovs sequence instead.
+
 2013-09-06  David S. Miller  <davem@davemloft.net>
 
        * po/zh_TW.po: Update Chinese (traditional) translation from

diff --git a/NEWS b/NEWS
index fb6069d4d71120719ab043e6182938447baa2f12..1b04db605af8e7ad3e08b5e35dadcc207ff9924e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -28,7 +28,7 @@ Version 2.18
   15429, 15431, 15432, 15441, 15442, 15448, 15465, 15480, 15485, 15488,
   15490, 15492, 15493, 15497, 15506, 15529, 15536, 15553, 15577, 15583,
   15618, 15627, 15631, 15654, 15655, 15666, 15667, 15674, 15711, 15755,
-  15759.
+  15759, 15985.
 
 * CVE-2013-2207 Incorrectly granting access to another user's pseudo-terminal
   has been fixed by disabling the use of pt_chown (Bugzilla #15755).

diff --git a/sysdeps/sparc/sparc32/fpu/s_fdim.S b/sysdeps/sparc/sparc32/fpu/s_fdim.S
index 2f0c5ce58380d8cee6927c274ace091dac288113..22f69ce519486c56e6209f233ae723c8ed9e48fc 100644 (file)
--- a/sysdeps/sparc/sparc32/fpu/s_fdim.S
+++ b/sysdeps/sparc/sparc32/fpu/s_fdim.S
@@ -30,7 +30,8 @@ ENTRY(__fdim)
        fbug    1f
         st     %g0, [%sp + 76]
        ldd     [%sp + 72], %f0
-       fnegd   %f0, %f2
+       fnegs   %f0, %f2
+       fmovs   %f1, %f3
 1:     retl
         fsubd  %f0, %f2, %f0
 END(__fdim)