From 3fce03fd27d7123670e6622d56949ef593517ee0 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Wed, 28 Jan 2009 01:49:45 +0000 Subject: [PATCH] Remove the __BEOS__ builtin define. Also add an uppercase __ARM__ for the ARM config. git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@29068 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- gcc/gcc/config/arm/haiku.h | 2 +- gcc/gcc/config/i386/haiku.h | 1 - gcc/gcc/config/m68k/haiku.h | 1 - gcc/gcc/config/rs6000/haiku.h | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/gcc/gcc/config/arm/haiku.h b/gcc/gcc/config/arm/haiku.h index 206c4db..3275d4b 100644 --- a/gcc/gcc/config/arm/haiku.h +++ b/gcc/gcc/config/arm/haiku.h @@ -55,8 +55,8 @@ #define TARGET_OS_CPP_BUILTINS() \ do \ { \ - builtin_define ("__BEOS__"); \ builtin_define ("__HAIKU__"); \ + builtin_define ("__ARM__"); \ builtin_define ("__arm__"); \ builtin_define ("__stdcall=__attribute__((__stdcall__))"); \ builtin_define ("__cdecl=__attribute__((__cdecl__))"); \ diff --git a/gcc/gcc/config/i386/haiku.h b/gcc/gcc/config/i386/haiku.h index e865f31..08f7db1 100644 --- a/gcc/gcc/config/i386/haiku.h +++ b/gcc/gcc/config/i386/haiku.h @@ -46,7 +46,6 @@ #define TARGET_OS_CPP_BUILTINS() \ do \ { \ - builtin_define ("__BEOS__"); \ builtin_define ("__HAIKU__"); \ builtin_define ("__INTEL__"); \ builtin_define ("_X86_"); \ diff --git a/gcc/gcc/config/m68k/haiku.h b/gcc/gcc/config/m68k/haiku.h index 7ca2e6b..946d9b4 100644 --- a/gcc/gcc/config/m68k/haiku.h +++ b/gcc/gcc/config/m68k/haiku.h @@ -80,7 +80,6 @@ #define TARGET_OS_CPP_BUILTINS() \ do \ { \ - builtin_define ("__BEOS__"); \ builtin_define ("__HAIKU__"); \ builtin_define ("__M68K__"); \ builtin_define_std ("mc68000"); \ diff --git a/gcc/gcc/config/rs6000/haiku.h b/gcc/gcc/config/rs6000/haiku.h index 3c38dcd..6053596 100644 --- a/gcc/gcc/config/rs6000/haiku.h +++ b/gcc/gcc/config/rs6000/haiku.h @@ -47,7 +47,6 @@ #define TARGET_OS_CPP_BUILTINS() \ do \ { \ - builtin_define ("__BEOS__"); \ builtin_define ("__HAIKU__"); \ builtin_define ("__POWERPC__"); \ builtin_define ("__powerpc__"); \ -- gitore 0.2.2