diff options
| author | Stuart Hastings <stuart@apple.com> | 2006-02-28 21:51:25 +0000 |
|---|---|---|
| committer | Stuart Hastings <stuart@apple.com> | 2006-02-28 21:51:25 +0000 |
| commit | edc37131db2bd9650617f7334ef1548644f5ee92 (patch) | |
| tree | df9ae10cf2b1ad1d29d15b3049d39525e38cda0f | |
| parent | 62d4dfc9f61ef5efe2c7241d5c35bf572164c6cb (diff) | |
* gcc/function.c (APPLE LOCAL) Fix.
* gcc/config/i386/darwin.h (BASIC_STACK_BOUNDARY): Delete.
* gcc/config/i386/i386.c (BASIC_STACK_BOUNDARY): Delete.
(APPLE LOCAL) Fix.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/apple-local-200502-branch@111576 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog.apple-ppc | 7 | ||||
| -rw-r--r-- | gcc/config/i386/darwin.h | 4 | ||||
| -rw-r--r-- | gcc/config/i386/i386.c | 12 | ||||
| -rw-r--r-- | gcc/function.c | 4 |
4 files changed, 13 insertions, 14 deletions
diff --git a/gcc/ChangeLog.apple-ppc b/gcc/ChangeLog.apple-ppc index aaac274b4fb..29a538cc88e 100644 --- a/gcc/ChangeLog.apple-ppc +++ b/gcc/ChangeLog.apple-ppc @@ -1,3 +1,10 @@ +2006-02-28 Stuart Hastings <stuart@apple.com> + + * gcc/function.c (APPLE LOCAL) Fix. + * gcc/config/i386/darwin.h (BASIC_STACK_BOUNDARY): Delete. + * gcc/config/i386/i386.c (BASIC_STACK_BOUNDARY): Delete. + (APPLE LOCAL) Fix. + 2006-02-28 Devang Patel <dpatel@apple.com> Dorit Nuzman <dorit@apple.com> diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h index fd2c3376424..df376659f95 100644 --- a/gcc/config/i386/darwin.h +++ b/gcc/config/i386/darwin.h @@ -205,10 +205,6 @@ extern void darwin_x86_file_end (void); else fprintf (FILE, "\tcall mcount\n"); \ } while (0) -/* APPLE LOCAL begin SSE stack alignment */ -#define BASIC_STACK_BOUNDARY (128) -/* APPLE LOCAL end SSE stack alignment */ - /* APPLE LOCAL CW asm blocks */ extern int flag_cw_asm_blocks; /* APPLE LOCAL begin fix-and-continue x86 */ diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index a4e3cd10b07..5e232aee022 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -1132,12 +1132,6 @@ static void init_ext_80387_constants (void); #undef TARGET_ADDRESS_COST #define TARGET_ADDRESS_COST ix86_address_cost -/* APPLE LOCAL begin SSE stack alignment */ -#ifndef BASIC_STACK_BOUNDARY -#define BASIC_STACK_BOUNDARY (32) -#endif -/* APPLE LOCAL end SSE stack alignment */ - #undef TARGET_FIXED_CONDITION_CODE_REGS #define TARGET_FIXED_CONDITION_CODE_REGS ix86_fixed_condition_code_regs #undef TARGET_CC_MODES_COMPATIBLE @@ -1545,7 +1539,7 @@ override_options (void) ix86_preferred_stack_boundary = (TARGET_64BIT ? 128 : ((optimize_size || flag_apple_kext) - ? BASIC_STACK_BOUNDARY + ? 32 : 128)); /* APPLE LOCAL end SSE stack alignment */ if (ix86_preferred_stack_boundary_string) @@ -2092,7 +2086,7 @@ ix86_comp_type_attributes (tree type1, tree type2) static int ix86_function_regparm (tree type, tree decl) { - /* APPLE LOCAL mainline 2006-02-17 4356747 stack realign (function body) */ + /* APPLE LOCAL begin mainline 2006-02-17 4356747 stack realign (function body) */ tree attr; int local_regparm = ix86_regparm; bool user_convention = false; @@ -2136,7 +2130,7 @@ ix86_function_regparm (tree type, tree decl) } } return local_regparm; - /* APPLE LOCAL end 4356747 stack realign (function body) */ + /* APPLE LOCAL end mainline 2006-02-17 4356747 stack realign (function body) */ } /* APPLE LOCAL begin mainline 2005-09-20 4205103 */ diff --git a/gcc/function.c b/gcc/function.c index 5ea2def46d4..2e6be8086ac 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -4083,7 +4083,9 @@ init_function_for_compilation (void) void expand_main_function (void) { - /* APPLE LOCAL deletion mainline 2006-02-17 4356747 stack realign */ + /* APPLE LOCAL begin mainline 2006-02-17 4356747 stack realign */ + /* deletion */ + /* APPLE LOCAL end mainline 2006-02-17 4356747 stack realign */ #ifndef HAS_INIT_SECTION emit_library_call (init_one_libfunc (NAME__MAIN), LCT_NORMAL, VOIDmode, 0); #endif |