From 1cd130b0467be2880d35f1e328c809e95c9f27c8 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Mon, 9 Jul 2012 19:21:59 +0000 Subject: [PATCH] re PR target/53283 (Many failures on x86_64-apple-darwin10 after revision 186789) PR target/53283 * config/i386/i386.c (ix86_fold_builtin): Call SUBTARGET_FOLD_BUILTIN if defined. * config/darwin.h: Rename TARGET_FOLD_BUILTIN to SUBTARGET_FOLD_BUILTIN. * config/rs6000/darwin.h: Map TARGET_FOLD_BUILTIN onto SUBTARGET_FOLD_BUILTIN. From-SVN: r189391 --- gcc/ChangeLog | 10 ++++++++++ gcc/config/darwin.h | 2 +- gcc/config/i386/i386.c | 4 ++++ gcc/config/rs6000/darwin.h | 4 ++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ed6c43905f5..7d80636ed2c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2012-07-09 Iain Sandoe + + PR target/53283 + * config/i386/i386.c (ix86_fold_builtin): Call SUBTARGET_FOLD_BUILTIN + if defined. + * config/darwin.h: Rename TARGET_FOLD_BUILTIN to + SUBTARGET_FOLD_BUILTIN. + * config/rs6000/darwin.h: Map TARGET_FOLD_BUILTIN onto + SUBTARGET_FOLD_BUILTIN. + 2012-07-09 Iain Sandoe * config/darwin.h (SUBTARGET_C_COMMON_OVERRIDE_OPTIONS): Move NeXT diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index ca3e0eb3aab..2b1a4268e3d 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -902,7 +902,7 @@ void add_framework_path (char *); #define TARGET_KEXTABI flag_apple_kext /* We have target-specific builtins. */ -#define TARGET_FOLD_BUILTIN darwin_fold_builtin +#define SUBTARGET_FOLD_BUILTIN darwin_fold_builtin #define TARGET_N_FORMAT_TYPES 1 #define TARGET_FORMAT_TYPES darwin_additional_format_types diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 24e4506d425..fbab32f3899 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -28097,6 +28097,10 @@ ix86_fold_builtin (tree fndecl, int n_args, } } +#ifdef SUBTARGET_FOLD_BUILTIN + return SUBTARGET_FOLD_BUILTIN (fndecl, n_args, args, ignore); +#endif + return NULL_TREE; } diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h index 3e311b40f54..17aa1842b92 100644 --- a/gcc/config/rs6000/darwin.h +++ b/gcc/config/rs6000/darwin.h @@ -422,3 +422,7 @@ do { \ rs6000_builtin_decls[(unsigned) (RS6000_BUILTIN_CFSTRING)] \ = darwin_init_cfstring_builtins ((unsigned) (RS6000_BUILTIN_CFSTRING)); \ } while(0) + +/* So far, there is no rs6000_fold_builtin, if one is introduced, then + this will need to be modified similar to the x86 case. */ +#define TARGET_FOLD_BUILTIN SUBTARGET_FOLD_BUILTIN -- 2.30.2