aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIain Sandoe <iain@codesourcery.com>2012-07-09 19:21:59 +0000
committerIain Sandoe <iains@gcc.gnu.org>2012-07-09 19:21:59 +0000
commit1cd130b0467be2880d35f1e328c809e95c9f27c8 (patch)
tree1d7e442a01dbfda195f184377c9c1a5a68e764a6 /gcc
parentf29234dfb10d3172e56e788b1de59a4d8cdf9241 (diff)
downloadgcc-1cd130b0467be2880d35f1e328c809e95c9f27c8.zip
gcc-1cd130b0467be2880d35f1e328c809e95c9f27c8.tar.gz
gcc-1cd130b0467be2880d35f1e328c809e95c9f27c8.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog10
-rw-r--r--gcc/config/darwin.h2
-rw-r--r--gcc/config/i386/i386.c4
-rw-r--r--gcc/config/rs6000/darwin.h4
4 files changed, 19 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ed6c439..7d80636 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,15 @@
2012-07-09 Iain Sandoe <iain@codesourcery.com>
+ 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 <iain@codesourcery.com>
+
* config/darwin.h (SUBTARGET_C_COMMON_OVERRIDE_OPTIONS): Move NeXT
runtime exceptions model setting from here ...
* config/darwin.c (darwin_override_options): ... to here.
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index ca3e0eb..2b1a426 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 24e4506..fbab32f 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 3e311b4..17aa184 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