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.24-417-g547e970
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 28 Nov 2016 23:13:12 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.24-417-g547e970
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 547e970409b18021b63bfded0ffd852b8dcc4d3a (commit)
from c9070e6305c08365c5f8b604bdca39c699d70cfa (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=547e970409b18021b63bfded0ffd852b8dcc4d3a
commit 547e970409b18021b63bfded0ffd852b8dcc4d3a
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Nov 28 23:12:49 2016 +0000
Fix sysdeps/ia64/fpu/libm-symbols.h for inclusion in testcases.
IA64 builds in math/ use "-include libm-symbols.h". This breaks the
signgam tests, which rely on undefining _LIBC and feature test macros
and defining _ISOMAC before including system headers to get them to
provide only ISO C declarations (libm-symbols.h ending up indirectly
including headers which result in this breaking); similarly, it breaks
C++ tests as some headers included from libm-symbols.h are not ready
for inclusion in C++ code. This patch disables the contents of
libm-symbols.h if __STRICT_ANSI__ or __cplusplus are defined to avoid
this problem (this header can only test symbols defined before the
source file is processed, so can't test _ISOMAC because that's defined
within the source file, after this header is included).
Tested (compilation only) for ia64.
* sysdeps/ia64/fpu/libm-symbols.h: Make contents conditional on
[!__STRICT_ANSI__ && !__cplusplus].
diff --git a/ChangeLog b/ChangeLog
index ec8b6d8..6d9b162 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-28 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/ia64/fpu/libm-symbols.h: Make contents conditional on
+ [!__STRICT_ANSI__ && !__cplusplus].
+
2016-11-28 H.J. Lu <hongjiu.lu@intel.com>
[BZ #20750]
diff --git a/sysdeps/ia64/fpu/libm-symbols.h b/sysdeps/ia64/fpu/libm-symbols.h
index 3cbc6c4..31d6f36 100644
--- a/sysdeps/ia64/fpu/libm-symbols.h
+++ b/sysdeps/ia64/fpu/libm-symbols.h
@@ -1,58 +1,60 @@
-#include <sysdep.h>
-#undef ret /* get rid of the stupid "ret" macro; it breaks br.ret */
+#if !defined __STRICT_ANSI__ && !defined __cplusplus
+# include <sysdep.h>
+# undef ret /* get rid of the stupid "ret" macro; it breaks br.ret */
/* Support for compatible assembler handling. */
-#define ASM_SIZE_DIRECTIVE(name) .size name,.-name
+# define ASM_SIZE_DIRECTIVE(name) .size name,.-name
-#define LOCAL_LIBM_ENTRY(name) \
+# define LOCAL_LIBM_ENTRY(name) \
.proc name; \
name:
-#define LOCAL_LIBM_END(name) \
+# define LOCAL_LIBM_END(name) \
.endp name; \
ASM_SIZE_DIRECTIVE(name)
-#define RODATA .rodata
-#define LOCAL_OBJECT_START(name) \
+# define RODATA .rodata
+# define LOCAL_OBJECT_START(name) \
name:; \
.type name, @object
-#define LOCAL_OBJECT_END(name) \
+# define LOCAL_OBJECT_END(name) \
ASM_SIZE_DIRECTIVE(name)
-#define GLOBAL_LIBM_ENTRY(name) \
+# define GLOBAL_LIBM_ENTRY(name) \
LOCAL_LIBM_ENTRY(name); \
.global name
-#define GLOBAL_LIBM_END(name) LOCAL_LIBM_END(name)
+# define GLOBAL_LIBM_END(name) LOCAL_LIBM_END(name)
-#define INTERNAL_LIBM_ENTRY(name) \
+# define INTERNAL_LIBM_ENTRY(name) \
GLOBAL_LIBM_ENTRY(__libm_##name); \
.global __libm_##name
-#define INTERNAL_LIBM_END(name) GLOBAL_LIBM_END(__libm_##name)
+# define INTERNAL_LIBM_END(name) GLOBAL_LIBM_END(__libm_##name)
-#define WEAK_LIBM_ENTRY(name) \
+# define WEAK_LIBM_ENTRY(name) \
.align 32; \
LOCAL_LIBM_ENTRY(__##name); \
.global __##name; \
__##name:
-#define WEAK_LIBM_END(name) \
+# define WEAK_LIBM_END(name) \
weak_alias (__##name, name); \
.hidden __##name; \
LOCAL_LIBM_END(__##name); \
ASM_SIZE_DIRECTIVE(__##name); \
.type __##name, @function
-#define GLOBAL_IEEE754_ENTRY(name) \
+# define GLOBAL_IEEE754_ENTRY(name) \
WEAK_LIBM_ENTRY(name); \
.global __ieee754_##name; \
.hidden __ieee754_##name; \
__ieee754_##name:
-#define GLOBAL_IEEE754_END(name) \
+# define GLOBAL_IEEE754_END(name) \
WEAK_LIBM_END(name); \
ASM_SIZE_DIRECTIVE(__ieee754_##name); \
.type __ieee754_##name, @function
-#if defined ASSEMBLER && IS_IN (libc)
-# define __libm_error_support HIDDEN_JUMPTARGET(__libm_error_support)
+# if defined ASSEMBLER && IS_IN (libc)
+# define __libm_error_support HIDDEN_JUMPTARGET(__libm_error_support)
+# endif
#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/ia64/fpu/libm-symbols.h | 38 ++++++++++++++++++++------------------
2 files changed, 25 insertions(+), 18 deletions(-)
hooks/post-receive
--
GNU C Library master sources