From d075e8ba45d23ca4798cbe803cf4062a12246fe6 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 8 Jul 2005 22:26:24 +0000
Subject: [PATCH] * sysdeps/x86_64/fpu/s_sincosl.S: Use retq not ret.  Remove

	alignment.
	* sysdeps/x86_64/fpu/s_sincos.S: New file.
---
 ChangeLog                                      |  4 ++++
 sysdeps/x86_64/fpu/{s_sincosl.S => s_sincos.S} | 24 ++++++++++++------------
 sysdeps/x86_64/fpu/s_sincosl.S                 |  7 +++----
 3 files changed, 19 insertions(+), 16 deletions(-)
 copy sysdeps/x86_64/fpu/{s_sincosl.S => s_sincos.S} (82%)

diff --git a/ChangeLog b/ChangeLog
index 7011232c60..41c148f53a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-07-08  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/x86_64/fpu/s_sincosl.S: Use retq not ret.  Remove
+	alignment.
+	* sysdeps/x86_64/fpu/s_sincos.S: New file.
+
 	* include/fenv.h: Add libm_hidden_proto for fesetround and
 	feholdexcept.
 	* sysdeps/alpha/fpu/feholdexcpt.c: Add libm_hidden_def.
diff --git a/sysdeps/x86_64/fpu/s_sincosl.S b/sysdeps/x86_64/fpu/s_sincos.S
similarity index 82%
copy from sysdeps/x86_64/fpu/s_sincosl.S
copy to sysdeps/x86_64/fpu/s_sincos.S
index 9a3025ab5f..9a33615340 100644
--- a/sysdeps/x86_64/fpu/s_sincosl.S
+++ b/sysdeps/x86_64/fpu/s_sincos.S
@@ -1,5 +1,5 @@
 /* Compute sine and cosine of argument.
-   Copyright (C) 1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000, 2001, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -28,21 +28,21 @@
 #define COSP	SINP+PTR_SIZE
 
 	.text
-ENTRY (BP_SYM (__sincosl))
+ENTRY (BP_SYM (__sincos))
 	ENTER
 
-	fldt	8(%rsp)
+	movsd	%xmm0, -8(%rsp)
+	fldl	-8(%rsp)
 	fsincos
 	fnstsw	%ax
 	testl	$0x400,%eax
 	jnz	1f
-	fstpt	(%rsi)
-	fstpt	(%rdi)
+	fstpl	(%rsi)
+	fstpl	(%rdi)
 
 	LEAVE
-	ret
+	retq
 
-	.align ALIGNARG(4)
 1:	fldpi
 	fadd	%st(0)
 	fxch	%st(1)
@@ -52,10 +52,10 @@ ENTRY (BP_SYM (__sincosl))
 	jnz	2b
 	fstp	%st(1)
 	fsincos
-	fstpt	(%rsi)
-	fstpt	(%rdi)
+	fstpl	(%rsi)
+	fstpl	(%rdi)
 
 	LEAVE
-	ret
-END (BP_SYM (__sincosl))
-weak_alias (BP_SYM (__sincosl), BP_SYM (sincosl))
+	retq
+END (BP_SYM (__sincos))
+weak_alias (BP_SYM (__sincos), BP_SYM (sincos))
diff --git a/sysdeps/x86_64/fpu/s_sincosl.S b/sysdeps/x86_64/fpu/s_sincosl.S
index 9a3025ab5f..b17eabe767 100644
--- a/sysdeps/x86_64/fpu/s_sincosl.S
+++ b/sysdeps/x86_64/fpu/s_sincosl.S
@@ -1,5 +1,5 @@
 /* Compute sine and cosine of argument.
-   Copyright (C) 1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000, 2001, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -40,9 +40,8 @@ ENTRY (BP_SYM (__sincosl))
 	fstpt	(%rdi)
 
 	LEAVE
-	ret
+	retq
 
-	.align ALIGNARG(4)
 1:	fldpi
 	fadd	%st(0)
 	fxch	%st(1)
@@ -56,6 +55,6 @@ ENTRY (BP_SYM (__sincosl))
 	fstpt	(%rdi)
 
 	LEAVE
-	ret
+	retq
 END (BP_SYM (__sincosl))
 weak_alias (BP_SYM (__sincosl), BP_SYM (sincosl))
-- 
2.11.4.GIT