From: Joseph Myers <joseph@codesourcery.com>
To: <libc-alpha@sourceware.org>, <vapier@gentoo.org>
Subject: Fix sysdeps/ia64/fpu/libm-symbols.h for inclusion in testcases
Date: Wed, 09 Nov 2016 02:04:00 -0000 [thread overview]
Message-ID: <alpine.DEB.2.20.1611090203310.23898@digraph.polyomino.org.uk> (raw)
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.
2016-11-09 Joseph Myers <joseph@codesourcery.com>
* sysdeps/ia64/fpu/libm-symbols.h: Make contents conditional on
[!__STRICT_ANSI__ && !__cplusplus].
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
--
Joseph S. Myers
joseph@codesourcery.com
next reply other threads:[~2016-11-09 2:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-09 2:04 Joseph Myers [this message]
2016-11-15 21:52 ` Ping " Joseph Myers
2016-11-21 16:47 ` Ping^2 " Joseph Myers
2016-11-28 18:09 ` Ping^3 " Joseph Myers
2016-11-28 20:43 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1611090203310.23898@digraph.polyomino.org.uk \
--to=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).