* [PATCH, ARM] fix bootstrap on trunk
@ 2009-11-17 23:27 Robert Nelson
2009-11-18 17:38 ` Richard Earnshaw
0 siblings, 1 reply; 4+ messages in thread
From: Robert Nelson @ 2009-11-17 23:27 UTC (permalink / raw)
To: gcc-patches
On both my arm gcc builders (Sheevaplug & Beagleboard). I've been
getting this error on trunk while trying run the gcc bootstrap script:
/opt/trunk/gcc/config/arm/arm.c:814:3: error: enum conversion in
initialization is invalid in C++
/opt/trunk/gcc/config/arm/arm.c:815:3: error: enum conversion in
initialization is invalid in C++
/opt/trunk/gcc/config/arm/arm.c:816:3: error: enum conversion in
initialization is invalid in C++
/opt/trunk/gcc/config/arm/arm.c: In function 'aapcs_vfp_is_return_candidate':
/opt/trunk/gcc/config/arm/arm.c:3886:7: error: passing argument 4 of
'aapcs_vfp_is_call_or_return_candidate' from incompatible pointer type
/opt/trunk/gcc/config/arm/arm.c:3838:1: note: expected 'int *' but
argument is of type 'enum machine_mode *'
/opt/trunk/gcc/config/arm/arm.c: In function 'aapcs_vfp_is_call_candidate':
/opt/trunk/gcc/config/arm/arm.c:3898:7: error: passing argument 4 of
'aapcs_vfp_is_call_or_return_candidate' from incompatible pointer type
/opt/trunk/gcc/config/arm/arm.c:3838:1: note: expected 'int *' but
argument is of type 'enum machine_mode *'
/opt/trunk/gcc/config/arm/arm.c: In function 'aapcs_vfp_allocate_return_reg':
/opt/trunk/gcc/config/arm/arm.c:3969:11: error: passing argument 4 of
'aapcs_vfp_is_call_or_return_candidate' from incompatible pointer type
/opt/trunk/gcc/config/arm/arm.c:3838:1: note: expected 'int *' but
argument is of type 'enum machine_mode *'
Sheevaplug: http://rcn-ee.homeip.net:81/dl/gcc/SVN-154188-trunk-armv5tel/trunk-error.log
Beagleboard: http://rcn-ee.homeip.net:81/dl/gcc/SVN-154200-trunk-c-armv7l-256/trunk-c-error.log
This patch fixes these errors on the Sheevaplug and Beagleboard.
Sheevaplug Full Build (2.5M), now running the testsuit:
http://rcn-ee.homeip.net:81/dl/gcc/SVN-154250-patch-trunk-c-armv5tel/trunk-c-build.log
Beagleboard, Build still in progress, (should be complete in another
couple hours), but has passed that error:
http://rcn-ee.homeip.net:81/dl/gcc/SVN-154250-patch-trunk-c-armv7l/
Patch: http://rcn-ee.homeip.net:81/dl/gcc/SVN-154250-patch-trunk-c-armv5tel/trunk-c-patch.diff
Regards,
--
Robert Nelson
http://www.rcn-ee.com/
-----------------------------
Index: gcc/config/arm/arm.c
===================================================================
--- gcc/config/arm/arm.c (revision 154250)
+++ gcc/config/arm/arm.c (working copy)
@@ -810,10 +810,10 @@
static const struct arm_fpu_desc all_fpus[] =
{
- {"fpa", ARM_FP_MODEL_FPA, 0, 0, false, false},
- {"fpe2", ARM_FP_MODEL_FPA, 2, 0, false, false},
- {"fpe3", ARM_FP_MODEL_FPA, 3, 0, false, false},
- {"maverick", ARM_FP_MODEL_MAVERICK, 0, 0, false, false},
+ {"fpa", ARM_FP_MODEL_FPA, 0, VFP_NONE, false, false},
+ {"fpe2", ARM_FP_MODEL_FPA, 2, VFP_NONE, false, false},
+ {"fpe3", ARM_FP_MODEL_FPA, 3, VFP_NONE, false, false},
+ {"maverick", ARM_FP_MODEL_MAVERICK, 0, VFP_NONE, false, false},
{"vfp", ARM_FP_MODEL_VFP, 2, VFP_REG_D16, false, false},
{"vfpv3", ARM_FP_MODEL_VFP, 3, VFP_REG_D32, false, false},
{"vfpv3-fp16", ARM_FP_MODEL_VFP, 3, VFP_REG_D32, false, true},
@@ -3840,7 +3840,7 @@
static bool
aapcs_vfp_is_call_or_return_candidate (enum arm_pcs pcs_variant,
enum machine_mode mode, const_tree type,
- int *base_mode, int *count)
+ enum machine_mode *base_mode, int *count)
{
enum machine_mode new_mode = VOIDmode;
Index: gcc/config/arm/arm.h
===================================================================
--- gcc/config/arm/arm.h (revision 154250)
+++ gcc/config/arm/arm.h (working copy)
@@ -307,6 +307,7 @@
enum vfp_reg_type
{
+ VFP_NONE,
VFP_REG_D16,
VFP_REG_D32,
VFP_REG_SINGLE
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH, ARM] fix bootstrap on trunk
2009-11-17 23:27 [PATCH, ARM] fix bootstrap on trunk Robert Nelson
@ 2009-11-18 17:38 ` Richard Earnshaw
2009-11-18 19:56 ` Robert Nelson
0 siblings, 1 reply; 4+ messages in thread
From: Richard Earnshaw @ 2009-11-18 17:38 UTC (permalink / raw)
To: Robert Nelson; +Cc: gcc-patches
On Tue, 2009-11-17 at 17:19 -0600, Robert Nelson wrote:
> On both my arm gcc builders (Sheevaplug & Beagleboard). I've been
> getting this error on trunk while trying run the gcc bootstrap script:
Your patch is missing a ChangeLog entry.
R.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH, ARM] fix bootstrap on trunk
2009-11-18 17:38 ` Richard Earnshaw
@ 2009-11-18 19:56 ` Robert Nelson
2009-11-25 11:51 ` Richard Earnshaw
0 siblings, 1 reply; 4+ messages in thread
From: Robert Nelson @ 2009-11-18 19:56 UTC (permalink / raw)
To: Richard Earnshaw, gcc-patches
On Wed, Nov 18, 2009 at 11:36 AM, Richard Earnshaw <rearnsha@arm.com> wrote:
>
> On Tue, 2009-11-17 at 17:19 -0600, Robert Nelson wrote:
>> On both my arm gcc builders (Sheevaplug & Beagleboard). I've been
>> getting this error on trunk while trying run the gcc bootstrap script:
>
> Your patch is missing a ChangeLog entry.
>
Thanks, updated with a Changelog..
--
Robert Nelson
http://www.rcn-ee.com/
--------------------------
Index: gcc/ChangeLog
===================================================================
--- gcc/ChangeLog (revision 154304)
+++ gcc/ChangeLog (working copy)
@@ -1,3 +1,11 @@
+2009-11-18 Robert Nelson <robert.nelson@digikey.com>
+
+ Fix arm bootstrap
+ * config/arm/arm.c
+ aapcs_vfp_is_call_or_return_candidate: incompatible pointer
+ * config/arm/arm.h
+ vfp_reg_type: Add VFP_NONE.
+
2009-11-18 Daniel Jacobowitz <dan@codesourcery.com>
* doc/arm-neon-intrinsics.texi: Regenerated.
Index: gcc/config/arm/arm.c
===================================================================
--- gcc/config/arm/arm.c (revision 154304)
+++ gcc/config/arm/arm.c (working copy)
@@ -817,10 +817,10 @@
static const struct arm_fpu_desc all_fpus[] =
{
- {"fpa", ARM_FP_MODEL_FPA, 0, 0, false, false},
- {"fpe2", ARM_FP_MODEL_FPA, 2, 0, false, false},
- {"fpe3", ARM_FP_MODEL_FPA, 3, 0, false, false},
- {"maverick", ARM_FP_MODEL_MAVERICK, 0, 0, false, false},
+ {"fpa", ARM_FP_MODEL_FPA, 0, VFP_NONE, false, false},
+ {"fpe2", ARM_FP_MODEL_FPA, 2, VFP_NONE, false, false},
+ {"fpe3", ARM_FP_MODEL_FPA, 3, VFP_NONE, false, false},
+ {"maverick", ARM_FP_MODEL_MAVERICK, 0, VFP_NONE, false, false},
{"vfp", ARM_FP_MODEL_VFP, 2, VFP_REG_D16, false, false},
{"vfpv3", ARM_FP_MODEL_VFP, 3, VFP_REG_D32, false, false},
{"vfpv3-fp16", ARM_FP_MODEL_VFP, 3, VFP_REG_D32, false, true},
@@ -3848,7 +3848,7 @@
static bool
aapcs_vfp_is_call_or_return_candidate (enum arm_pcs pcs_variant,
enum machine_mode mode, const_tree type,
- int *base_mode, int *count)
+ enum machine_mode *base_mode, int *count)
{
enum machine_mode new_mode = VOIDmode;
Index: gcc/config/arm/arm.h
===================================================================
--- gcc/config/arm/arm.h (revision 154304)
+++ gcc/config/arm/arm.h (working copy)
@@ -307,6 +307,7 @@
enum vfp_reg_type
{
+ VFP_NONE,
VFP_REG_D16,
VFP_REG_D32,
VFP_REG_SINGLE
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH, ARM] fix bootstrap on trunk
2009-11-18 19:56 ` Robert Nelson
@ 2009-11-25 11:51 ` Richard Earnshaw
0 siblings, 0 replies; 4+ messages in thread
From: Richard Earnshaw @ 2009-11-25 11:51 UTC (permalink / raw)
To: Robert Nelson; +Cc: gcc-patches
[-- Attachment #1: Type: text/plain, Size: 1055 bytes --]
On Wed, 2009-11-18 at 13:55 -0600, Robert Nelson wrote:
> On Wed, Nov 18, 2009 at 11:36 AM, Richard Earnshaw <rearnsha@arm.com> wrote:
> >
> > On Tue, 2009-11-17 at 17:19 -0600, Robert Nelson wrote:
> >> On both my arm gcc builders (Sheevaplug & Beagleboard). I've been
> >> getting this error on trunk while trying run the gcc bootstrap script:
> >
> > Your patch is missing a ChangeLog entry.
> >
>
> Thanks, updated with a Changelog..
>
Sorry for the delay replying (work, you know ... :-)
The ChangeLog wasn't quite suitable (take a look at the style of
existing entries and read the style guide for what they need to be), and
there was one more tiny change that I wanted to make, so I've committed
the following:
2009-11-25 Robert Nelson <robert.nelson@digikey.com>
Richard Earnshaw <rearnsha@arm.com>
* arm.h (enum vfp_reg_type): Add VFP_NONE.
* arm.c (all_fpus): Use it for floating point units that aren't based
on the VFP architecture.
(aapcs_vfp_is_call_or_return_candidate): Make base_mode a pointer to
enum machine_mode.
[-- Attachment #2: vfp.patch --]
[-- Type: text/x-patch, Size: 1918 bytes --]
*** config/arm/arm.c (revision 154660)
--- config/arm/arm.c (local)
*************** char arm_arch_name[] = "__ARM_ARCH_0UNK_
*** 821,830 ****
static const struct arm_fpu_desc all_fpus[] =
{
! {"fpa", ARM_FP_MODEL_FPA, 0, 0, false, false},
! {"fpe2", ARM_FP_MODEL_FPA, 2, 0, false, false},
! {"fpe3", ARM_FP_MODEL_FPA, 3, 0, false, false},
! {"maverick", ARM_FP_MODEL_MAVERICK, 0, 0, false, false},
{"vfp", ARM_FP_MODEL_VFP, 2, VFP_REG_D16, false, false},
{"vfpv3", ARM_FP_MODEL_VFP, 3, VFP_REG_D32, false, false},
{"vfpv3-fp16", ARM_FP_MODEL_VFP, 3, VFP_REG_D32, false, true},
--- 821,830 ----
static const struct arm_fpu_desc all_fpus[] =
{
! {"fpa", ARM_FP_MODEL_FPA, 0, VFP_NONE, false, false},
! {"fpe2", ARM_FP_MODEL_FPA, 2, VFP_NONE, false, false},
! {"fpe3", ARM_FP_MODEL_FPA, 3, VFP_NONE, false, false},
! {"maverick", ARM_FP_MODEL_MAVERICK, 0, VFP_NONE, false, false},
{"vfp", ARM_FP_MODEL_VFP, 2, VFP_REG_D16, false, false},
{"vfpv3", ARM_FP_MODEL_VFP, 3, VFP_REG_D32, false, false},
{"vfpv3-fp16", ARM_FP_MODEL_VFP, 3, VFP_REG_D32, false, true},
*************** use_vfp_abi (enum arm_pcs pcs_variant, b
*** 3853,3859 ****
static bool
aapcs_vfp_is_call_or_return_candidate (enum arm_pcs pcs_variant,
enum machine_mode mode, const_tree type,
! int *base_mode, int *count)
{
enum machine_mode new_mode = VOIDmode;
--- 3853,3859 ----
static bool
aapcs_vfp_is_call_or_return_candidate (enum arm_pcs pcs_variant,
enum machine_mode mode, const_tree type,
! enum machine_mode *base_mode, int *count)
{
enum machine_mode new_mode = VOIDmode;
*** config/arm/arm.h (revision 154660)
--- config/arm/arm.h (local)
*************** enum arm_fp_model
*** 307,312 ****
--- 307,313 ----
enum vfp_reg_type
{
+ VFP_NONE = 0,
VFP_REG_D16,
VFP_REG_D32,
VFP_REG_SINGLE
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-11-25 11:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-17 23:27 [PATCH, ARM] fix bootstrap on trunk Robert Nelson
2009-11-18 17:38 ` Richard Earnshaw
2009-11-18 19:56 ` Robert Nelson
2009-11-25 11:51 ` Richard Earnshaw
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).