This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-387-gcaa6c9d
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 18 Oct 2011 09:47:54 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-387-gcaa6c9d
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via caa6c9d8454e81d365f039c835abd3cb54c06a05 (commit)
from 99ce7b04edf17821a6abd19844f10e8c1cd3c724 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=caa6c9d8454e81d365f039c835abd3cb54c06a05
commit caa6c9d8454e81d365f039c835abd3cb54c06a05
Author: Andreas Schwab <schwab@redhat.com>
Date: Tue Oct 18 10:37:56 2011 +0200
Fix linkage conflict with feraiseexcept
diff --git a/ChangeLog b/ChangeLog
index ad7db01..cd6264b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-18 Andreas Schwab <schwab@redhat.com>
+
+ * sysdeps/x86_64/fpu/bits/fenv.h: Add C linkage markers.
+ (__feraiseexcept_renamed): Add __THROW.
+ (feraiseexcept): Add __THROW. Rename local variables to fix
+ namespace violations.
+
2011-10-17 Ulrich Drepper <drepper@gmail.com>
* sysdeps/ieee754/dbl-64/e_exp2.c (__ieee754_exp2): Small optimization.
diff --git a/sysdeps/x86_64/fpu/bits/fenv.h b/sysdeps/x86_64/fpu/bits/fenv.h
index be2518d..b344d0a 100644
--- a/sysdeps/x86_64/fpu/bits/fenv.h
+++ b/sysdeps/x86_64/fpu/bits/fenv.h
@@ -98,9 +98,11 @@ fenv_t;
#ifdef __OPTIMIZE__
+__BEGIN_DECLS
+
/* Optimized versions. */
-extern int __feraiseexcept_renamed (int) __asm__ ("feraiseexcept");
-__extern_inline int feraiseexcept (int __excepts)
+extern int __feraiseexcept_renamed (int) __THROW __asm__ ("feraiseexcept");
+__extern_inline int feraiseexcept (int __excepts) __THROW
{
if (__builtin_constant_p (__excepts)
&& (__excepts & ~(FE_INVALID | FE_DIVBYZERO)) == 0)
@@ -115,11 +117,11 @@ __extern_inline int feraiseexcept (int __excepts)
}
if ((FE_DIVBYZERO & __excepts) != 0)
{
- float f = 1.0;
- float g = 0.0;
+ float __f = 1.0;
+ float __g = 0.0;
- __asm__ __volatile__ ("divss %1, %0" : : "x" (f), "x" (g));
- (void) &f;
+ __asm__ __volatile__ ("divss %1, %0" : : "x" (__f), "x" (__g));
+ (void) &__f;
}
return 0;
@@ -127,4 +129,6 @@ __extern_inline int feraiseexcept (int __excepts)
return __feraiseexcept_renamed (__excepts);
}
+
+__END_DECLS
#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
sysdeps/x86_64/fpu/bits/fenv.h | 16 ++++++++++------
2 files changed, 17 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources