about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2012-05-18 09:08:14 +0200
committerAndreas Jaeger <aj@suse.de>2012-05-18 09:08:14 +0200
commit7a185db2b7f9853d35fbd1396a56d0c7a64b4bd9 (patch)
treeb1137f4f210ccd1f79b6586b94648460f4a0f4d0
parent428bd7074c3db7f9258294189a92f1ec19956c6e (diff)
downloadglibc-7a185db2b7f9853d35fbd1396a56d0c7a64b4bd9.tar.gz
glibc-7a185db2b7f9853d35fbd1396a56d0c7a64b4bd9.tar.xz
glibc-7a185db2b7f9853d35fbd1396a56d0c7a64b4bd9.zip
Do not provide inlines for GCC build-in functions
-rw-r--r--ChangeLog21
-rw-r--r--sysdeps/x86_64/fpu/bits/mathinline.h7
2 files changed, 26 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a89c2dc9b..d36463942f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2012-05-18  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/x86_64/fpu/bits/mathinline.h (lrintf): Make inline
+	function only available for GCCs before 3.4 since GCC 3.4
+	introduced a builtin.
+	(lrint): Likewise.
+	(llrintf): Likewise.
+	(llrint): Likewise.
+	(fmaxf): Likewise.
+	(fmax): Likewise.
+	(fminf): Likewise.
+	(fmin): Likewise.
+	(rint): Likewise.
+	(rintf): Likewise.
+	(nearbyint): Likewise.
+	(nearbyintf): Likewise.
+	(ceil): Likewise.
+	(ceilf): Likewise.
+	(floor): Likewise.
+	(floorf): Likewise.
+
 2012-05-17  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/pselect.c (data): Use __syscall_ulong_t
diff --git a/sysdeps/x86_64/fpu/bits/mathinline.h b/sysdeps/x86_64/fpu/bits/mathinline.h
index 49a199b60b..7cfe688744 100644
--- a/sysdeps/x86_64/fpu/bits/mathinline.h
+++ b/sysdeps/x86_64/fpu/bits/mathinline.h
@@ -1,5 +1,5 @@
 /* Inline math functions for x86-64.
-   Copyright (C) 2002-2004,2007,2009,2011,2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -68,7 +68,10 @@ __END_NAMESPACE_C99
 #endif
 
 
-#if __GNUC_PREREQ (2, 8) && !defined __NO_MATH_INLINES && defined __OPTIMIZE__
+#if __GNUC_PREREQ (2, 8) && !__GNUC_PREREQ (3, 4) \
+    && !defined __NO_MATH_INLINES && defined __OPTIMIZE__
+/* GCC 3.4 introduced builtins for all functions below, so
+   there's no need to define any of these inline functions.  */
 
 # ifdef __USE_ISOC99
 __BEGIN_NAMESPACE_C99