From 4dd9ee924baa6c168c7c25d07e364d39729f4e8c Mon Sep 17 00:00:00 2001 From: Mike Stump Date: Sat, 20 Mar 2010 05:40:05 +0000 Subject: [PATCH] darwin.h (SUBTARGET32_DEFAULT_CPU): Add. * config/i386/darwin.h (SUBTARGET32_DEFAULT_CPU): Add. * config/i386/i386.c (SUBTARGET32_DEFAULT_CPU): Add. (override_options): Use SUBTARGET32_DEFAULT_CPU. From-SVN: r157589 --- gcc/ChangeLog | 6 ++++++ gcc/config/i386/darwin.h | 2 ++ gcc/config/i386/i386.c | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8684997..77cc3ce 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-03-19 Mike Stump + + * config/i386/darwin.h (SUBTARGET32_DEFAULT_CPU): Add. + * config/i386/i386.c (SUBTARGET32_DEFAULT_CPU): Add. + (override_options): Use SUBTARGET32_DEFAULT_CPU. + 2010-03-19 Andrew Pinski PR C/43211 diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h index 49863a6..21ffbc1 100644 --- a/gcc/config/i386/darwin.h +++ b/gcc/config/i386/darwin.h @@ -298,3 +298,5 @@ extern void darwin_x86_file_end (void); used in Mach-O. */ #undef MACHO_SYMBOL_FLAG_VARIABLE #define MACHO_SYMBOL_FLAG_VARIABLE ((SYMBOL_FLAG_MACH_DEP) << 3) + +#define SUBTARGET32_DEFAULT_CPU "i686" diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 5f560c4..9cc6661 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -1912,6 +1912,10 @@ static unsigned int ix86_minimum_incoming_stack_boundary (bool); static enum calling_abi ix86_function_abi (const_tree); +#ifndef SUBTARGET32_DEFAULT_CPU +#define SUBTARGET32_DEFAULT_CPU "i386" +#endif + /* The svr4 ABI for the i386 says that records and unions are returned in memory. */ #ifndef DEFAULT_PCC_STRUCT_RETURN @@ -2878,7 +2882,7 @@ override_options (bool main_args_p) } if (!ix86_arch_string) - ix86_arch_string = TARGET_64BIT ? "x86-64" : "i386"; + ix86_arch_string = TARGET_64BIT ? "x86-64" : SUBTARGET32_DEFAULT_CPU; else ix86_arch_specified = 1; -- 2.7.4