diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/ia64/fpu/libm-symbols.h | 38 |
2 files changed, 25 insertions, 18 deletions
@@ -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 |