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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ed6c43905f5fb8449dcbe55eafcffbc76028ebad..7d80636ed2cb753e5331fe57dbb4318e414b9633 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+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

diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index ca3e0eb3aab7b115c47fa41c01345371892e42f5..2b1a4268e3d6f7b51f1709185c429d5a360e6ab5 100644 (file)
--- 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 24e4506d425697baa3108175d2df325c9130bf6b..fbab32f389938e7fea2026c87bf63397e06d58c5 100644 (file)
--- 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 3e311b40f54fd1b305ed51a6f44f392035c54ff8..17aa1842b92f80446700df16dd0b8d2a9fc210c4 100644 (file)
--- 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