Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove x86_64 __GNUC_PREREQ (4, 6) conditional.
This patch removes a conditional on __GNUC_PREREQ (4, 6) in x86_64
code.

Tested for x86_64 that installed shared libraries are unchanged by
this patch.  Committed (I think this file reasonably comes under math
maintainership).

	* sysdeps/x86_64/fpu/dla.h [__FMA4__ && __GNUC_PREREQ (4, 6)]
	(DLA_FMS): Make definition conditional only on [__FMA4__].
	[__FMA4__ && !__GNUC_PREREQ (4, 6)] (DLA_FMS): Remove conditional
	definition.
  • Loading branch information
Joseph Myers committed Nov 14, 2014
1 parent 6a0dd47 commit 5ae4fe6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
@@ -1,5 +1,10 @@
2014-11-14 Joseph Myers <joseph@codesourcery.com>

* sysdeps/x86_64/fpu/dla.h [__FMA4__ && __GNUC_PREREQ (4, 6)]
(DLA_FMS): Make definition conditional only on [__FMA4__].
[__FMA4__ && !__GNUC_PREREQ (4, 6)] (DLA_FMS): Remove conditional
definition.

* sysdeps/arm/sysdep.h [PROF && __GNUC_PREREQ(4,4)] (CALL_MCOUNT):
Make definition conditional only on [PROF].
[PROF && !__GNUC_PREREQ(4,4)] (CALL_MCOUNT): Remove conditional
Expand Down
11 changes: 1 addition & 10 deletions sysdeps/x86_64/fpu/dla.h
@@ -1,17 +1,8 @@
#include <features.h>

#ifdef __FMA4__
# if __GNUC_PREREQ (4, 6)
# define DLA_FMS(x,y,z) \
# define DLA_FMS(x,y,z) \
__builtin_fma (x, y, -(z))
# else
# define DLA_FMS(x,y,z) \
({ double __z; \
asm ("vfmsubsd %3, %2, %1, %0" \
: "=x" (__z) \
: "x" ((double) (x)), "xm" ((double) (y)) , "x" ((double) (z))); \
__z; })
# endif
#endif

#include "sysdeps/ieee754/dbl-64/dla.h"

0 comments on commit 5ae4fe6

Please sign in to comment.