re PR target/60610 (ICE in convert_regs_1, at reg-stack.c:3064)

	PR target/60610
	* config/i386/i386.h (TARGET_64BIT_P): If not TARGET_BI_ARCH,
	redefine to 1 or 0.
	* config/i386/darwin.h (TARGET_64BIT_P): Redefine to
	TARGET_ISA_64BIT_P(x).

From-SVN: r208756

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7cddeabb750bf95b5ea7d551354115f27b217358..ba749275b1a77915482dd56d081778fdffb6580e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-21  Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/60610
+       * config/i386/i386.h (TARGET_64BIT_P): If not TARGET_BI_ARCH,
+       redefine to 1 or 0.
+       * config/i386/darwin.h (TARGET_64BIT_P): Redefine to
+       TARGET_ISA_64BIT_P(x).
+
 2014-03-21  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
        * config/rs6000/rs6000.c (rs6000_expand_vector_set): Generate a

diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h
index 5c9b073b680b25a720c0e8da0a6d79d9d4aae350..a85aa42d5fc5a28299c2fd5f2857f034d5d0a31e 100644 (file)
--- a/gcc/config/i386/darwin.h
+++ b/gcc/config/i386/darwin.h
@@ -26,7 +26,9 @@ along with GCC; see the file COPYING3.  If not see
 #define DARWIN_X86 1
 
 #undef  TARGET_64BIT
+#undef TARGET_64BIT_P
 #define TARGET_64BIT TARGET_ISA_64BIT
+#define        TARGET_64BIT_P(x) TARGET_ISA_64BIT_P(x)
 
 #ifdef IN_LIBGCC2
 #undef TARGET_64BIT

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index c5c1d5886caeb960e08fdadcf0f1421aa3bb8ce5..51659deb309f709b6c971b54e1cea8436e5b121f 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -284,10 +284,13 @@ extern const struct processor_costs ix86_size_cost;
 #else
 #ifndef TARGET_BI_ARCH
 #undef TARGET_64BIT
+#undef TARGET_64BIT_P
 #if TARGET_64BIT_DEFAULT
 #define TARGET_64BIT 1
+#define TARGET_64BIT_P(x) 1
 #else
 #define TARGET_64BIT 0
+#define TARGET_64BIT_P(x) 0
 #endif
 #endif
 #endif