From 215ca35bee52fd27a420a1f77abdc51a89602a66 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 27 Jul 2010 21:38:26 +0000 Subject: [PATCH] * revert 37775, as the define has a wrong value and it's probably better to do stuff like this somewhere in our libc headers. git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@37779 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- gcc/gcc/config/arm/haiku.h | 3 +-- gcc/gcc/config/i386/haiku.h | 1 - gcc/gcc/config/i386/haiku64.h | 6 ++---- gcc/gcc/config/mips/haiku.h | 1 - gcc/gcc/config/rs6000/haiku.h | 1 - legacy/gcc/gcc/config/i386/haiku.h | 1 - 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/gcc/gcc/config/arm/haiku.h b/gcc/gcc/config/arm/haiku.h index bd9abe3..df1d39b 100644 --- a/gcc/gcc/config/arm/haiku.h +++ b/gcc/gcc/config/arm/haiku.h @@ -63,7 +63,6 @@ instead of by pointer. */ \ builtin_define ("__GXX_MERGED_TYPEINFO_NAMES=0"); \ /*builtin_define ("__GXX_TYPEINFO_EQUALITY_INLINE=0"); done in bpabi: */\ - builtin_define ("__STDC_ISO_10646__"); \ TARGET_BPABI_CPP_BUILTINS(); \ } \ while (0) @@ -76,5 +75,5 @@ #undef LINK_SPEC #define LINK_SPEC "%{!o*:-o %b} -m armelf -shared -no-undefined -Bsymbolic %{nostart:-e 0} \ - %{mbig-endian:-EB} %{mlittle-endian:-EL} -X" + %{mbig-endian:-EB} %{mlittle-endian:-EL} -X" diff --git a/gcc/gcc/config/i386/haiku.h b/gcc/gcc/config/i386/haiku.h index 2181d4e..335c414 100644 --- a/gcc/gcc/config/i386/haiku.h +++ b/gcc/gcc/config/i386/haiku.h @@ -46,7 +46,6 @@ instead of by pointer. */ \ builtin_define ("__GXX_MERGED_TYPEINFO_NAMES=0"); \ builtin_define ("__GXX_TYPEINFO_EQUALITY_INLINE=0"); \ - builtin_define ("__STDC_ISO_10646__"); \ } \ while (0) diff --git a/gcc/gcc/config/i386/haiku64.h b/gcc/gcc/config/i386/haiku64.h index 89ce57b..24a44ad 100644 --- a/gcc/gcc/config/i386/haiku64.h +++ b/gcc/gcc/config/i386/haiku64.h @@ -27,9 +27,9 @@ #endif /* The SVR4 ABI for the i386 says that records and unions are returned - * in memory. + * in memory. * - * TODO: Linux64 doesn't use pcc_struct_return scheme. Does haiku? + * TODO: Linux64 doesn't use pcc_struct_return scheme. Does haiku? * If not this could be removed. */ #undef DEFAULT_PCC_STRUCT_RETURN @@ -54,7 +54,6 @@ instead of by pointer. */ \ builtin_define ("__GXX_MERGED_TYPEINFO_NAMES=0"); \ builtin_define ("__GXX_TYPEINFO_EQUALITY_INLINE=0"); \ - builtin_define ("__STDC_ISO_10646__"); \ } \ while (0) #else @@ -73,7 +72,6 @@ instead of by pointer. */ \ builtin_define ("__GXX_MERGED_TYPEINFO_NAMES=0"); \ builtin_define ("__GXX_TYPEINFO_EQUALITY_INLINE=0"); \ - builtin_define ("__STDC_ISO_10646__"); \ } \ while (0) #endif diff --git a/gcc/gcc/config/mips/haiku.h b/gcc/gcc/config/mips/haiku.h index a9841da..c4029b2 100644 --- a/gcc/gcc/config/mips/haiku.h +++ b/gcc/gcc/config/mips/haiku.h @@ -44,7 +44,6 @@ instead of by pointer. */ \ builtin_define ("__GXX_MERGED_TYPEINFO_NAMES=0"); \ builtin_define ("__GXX_TYPEINFO_EQUALITY_INLINE=0"); \ - builtin_define ("__STDC_ISO_10646__"); \ } \ while (0) diff --git a/gcc/gcc/config/rs6000/haiku.h b/gcc/gcc/config/rs6000/haiku.h index 24cb601..d306faa 100644 --- a/gcc/gcc/config/rs6000/haiku.h +++ b/gcc/gcc/config/rs6000/haiku.h @@ -50,7 +50,6 @@ instead of by pointer. */ \ builtin_define ("__GXX_MERGED_TYPEINFO_NAMES=0"); \ builtin_define ("__GXX_TYPEINFO_EQUALITY_INLINE=0"); \ - builtin_define ("__STDC_ISO_10646__"); \ } \ while (0) diff --git a/legacy/gcc/gcc/config/i386/haiku.h b/legacy/gcc/gcc/config/i386/haiku.h index 2be1f2c..faa2ea4 100644 --- a/legacy/gcc/gcc/config/i386/haiku.h +++ b/legacy/gcc/gcc/config/i386/haiku.h @@ -159,7 +159,6 @@ -D__stdcall=__attribute__((__stdcall__)) \ -D__cdecl=__attribute__((__cdecl__)) \ -D__declspec(x)=__attribute__((x)) \ --D__STDC_ISO_10646__ \ -Asystem(haiku)" #undef CPP_SPEC -- gitore 0.2.2