Merge lp:~cltang/gcc-linaro/lp-602745 into lp:gcc-linaro/4.4

[Chung-Lin Tang]

Backport from mainline: ARM soft/hard-float preprocessor symbol patch, for fixing Launchpad bug #602745.

[Andrew Stubbs (ams-codesourcery)]

This is good, thanks. :)

Andrew

review: Approve

=== modified file 'ChangeLog.linaro'
--- ChangeLog.linaro	2010-07-29 13:52:03 +0000
+++ ChangeLog.linaro	2010-08-03 10:02:03 +0000
@@ -1,3 +1,15 @@
[phone]  Chung-Lin Tang  <[e-mail]>
+
+	Backport from mainline for Launchpad Bug #602745:
+
+	2010-07-28  Chung-Lin Tang  <[e-mail]>
+
+	gcc/
+	* config/arm/arm.c (arm_pcs_default): Remove static.	
+	* config/arm/arm.h (TARGET_CPU_CPP_BUILTINS): Define __ARM_PCS or
+	__ARM_PCS_VFP to indicate soft/hard-float calling convention.
+	(arm_pcs_default): Declare.
+
 2010-07-23  Ulrich Weigand  <[e-mail]>
 
 	Revert most PowerPC-related patches:
 
=== modified file 'gcc/config/arm/arm.c'
--- gcc/config/arm/arm.c	2010-07-07 07:24:43 +0000
+++ gcc/config/arm/arm.c	2010-08-03 10:02:03 +0000
@@ -686,7 +686,7 @@
 /* The maximum number of insns to be used when loading a constant.  */
 static int arm_constant_limit = 3;
 
-static enum arm_pcs arm_pcs_default;
+enum arm_pcs arm_pcs_default;
 
 /* For an explanation of these variables, see final_prescan_insn below.  */
 int arm_ccfsm_state;
 
=== modified file 'gcc/config/arm/arm.h'
--- gcc/config/arm/arm.h	2010-06-17 08:44:15 +0000
+++ gcc/config/arm/arm.h	2010-08-03 10:02:03 +0000
@@ -84,7 +84,13 @@
 	if (arm_arch_iwmmxt)				\
 	  builtin_define ("__IWMMXT__");		\
 	if (TARGET_AAPCS_BASED)				\
-	  builtin_define ("__ARM_EABI__");		\
+ 	  {						\
+ 	    if (arm_pcs_default == ARM_PCS_AAPCS_VFP)	\
+ 	      builtin_define ("__ARM_PCS_VFP");		\
+ 	    else if (arm_pcs_default == ARM_PCS_AAPCS)	\
+ 	      builtin_define ("__ARM_PCS");		\
+ 	    builtin_define ("__ARM_EABI__");		\
+ 	  }						\
 	if (arm_tune_marvell_f)				\
 	  builtin_define ("__ARM_TUNE_MARVELL_F__");	\
 	if (low_irq_latency)				\
@@ -1682,6 +1688,9 @@
   ARM_PCS_UNKNOWN
 };
 
+/* Default procedure calling standard of current compilation unit. */
+extern enum arm_pcs arm_pcs_default;
+
 /* We can't define this inside a generator file because it needs enum
    machine_mode.  */
 /* A C type for declaring a variable that is used as the first argument of