From 9c7bd91af7c94d7628b2fa3f8be2e0098f4a2692 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Tue, 26 Apr 2011 15:42:17 +0000 Subject: [PATCH] iris6.h (LOCAL_LABEL_PREFIX): Don't test TARGET_NEWABI. * config/mips/iris6.h (LOCAL_LABEL_PREFIX): Don't test TARGET_NEWABI. (WINT_TYPE_SIZE): Use INT_TYPE_SIZE. (TARGET_OS_CPP_BUILTINS): Remove TARGET_IRIX6 guards. From-SVN: r172976 --- gcc/ChangeLog | 7 +++++++ gcc/config/mips/iris6.h | 11 +++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index af485995ea1..29296bd632a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-04-26 Rainer Orth + + * config/mips/iris6.h (LOCAL_LABEL_PREFIX): Don't test + TARGET_NEWABI. + (WINT_TYPE_SIZE): Use INT_TYPE_SIZE. + (TARGET_OS_CPP_BUILTINS): Remove TARGET_IRIX6 guards. + 2011-04-26 Rainer Orth * config/mips/mips.h (DBX_OUTPUT_SOURCE_LINE): Remove. diff --git a/gcc/config/mips/iris6.h b/gcc/config/mips/iris6.h index 8995ab99cf6..1443d7bc3f1 100644 --- a/gcc/config/mips/iris6.h +++ b/gcc/config/mips/iris6.h @@ -77,7 +77,7 @@ along with GCC; see the file COPYING3. If not see while (0) #undef LOCAL_LABEL_PREFIX -#define LOCAL_LABEL_PREFIX (TARGET_NEWABI ? "." : "$") +#define LOCAL_LABEL_PREFIX "." #undef ASM_DECLARE_OBJECT_NAME #define ASM_DECLARE_OBJECT_NAME mips_declare_object_name @@ -104,7 +104,7 @@ along with GCC; see the file COPYING3. If not see #define WINT_TYPE (Pmode == DImode ? "int" : "long int") #undef WINT_TYPE_SIZE -#define WINT_TYPE_SIZE 32 +#define WINT_TYPE_SIZE INT_TYPE_SIZE /* C99 stdint.h types. */ #define INT8_TYPE "signed char" @@ -175,16 +175,15 @@ along with GCC; see the file COPYING3. If not see /* IRIX 6.5.18 and above provide many ISO C99 \ features protected by the __c99 macro. \ libstdc++ v3 needs them as well. */ \ - if (TARGET_IRIX6) \ - if (flag_isoc99 || c_dialect_cxx ()) \ - builtin_define ("__c99"); \ + if (flag_isoc99 || c_dialect_cxx ()) \ + builtin_define ("__c99"); \ \ /* The GNU C++ standard library requires that \ __EXTENSIONS__ and _SGI_SOURCE be defined on at \ least IRIX 6.2 and probably all IRIX 6 prior to 6.5. \ We don't need this on IRIX 6.5 itself, but it \ shouldn't hurt other than the namespace pollution. */ \ - if (!flag_iso || (TARGET_IRIX6 && c_dialect_cxx ())) \ + if (!flag_iso || c_dialect_cxx ()) \ { \ builtin_define ("__EXTENSIONS__"); \ builtin_define ("_SGI_SOURCE"); \ -- 2.30.2