Patchwork [ARM] Fix override of SUBTARGET_CPU_DEFAULT

login
register
mail settings
Submitter Ryan Mansfield
Date Sept. 2, 2010, 1:12 a.m.
Message ID <4C7EF9E0.3030907@qnx.com>
Download mbox | patch
Permalink /patch/63436/
State New
Headers show

Comments

Ryan Mansfield - Sept. 2, 2010, 1:12 a.m.
In the case where the user does not select a cpu and one is not 
configured, the cpu defined by SUBTARGET_CPU_DEFAULT is being overridden 
by the default of arm6.

2010-09-01  Ryan Mansfield  <rmansfield@qnx.com>
         * arm.c (arm_override_options): Use SUBTARGET_CPU_DEFAULT if 
defined.



OK?

Regards,

Ryan Mansfield
Richard Earnshaw - Sept. 2, 2010, 2:17 p.m.
On Wed, 2010-09-01 at 21:12 -0400, Ryan Mansfield wrote:
> In the case where the user does not select a cpu and one is not 
> configured, the cpu defined by SUBTARGET_CPU_DEFAULT is being overridden 
> by the default of arm6.
> 
> 2010-09-01  Ryan Mansfield  <rmansfield@qnx.com>
>          * arm.c (arm_override_options): Use SUBTARGET_CPU_DEFAULT if 
> defined.
> 
> 
> Index: config/arm/arm.c
> ===================================================================
> --- config/arm/arm.c	(revision 163753)
> +++ config/arm/arm.c	(working copy)
> @@ -1411,7 +1411,7 @@
>   	  arm_selected_cpu = &all_cores[SUBTARGET_CPU_DEFAULT];
>   #endif
>   	  /* Default to ARM6.  */
> -	  if (arm_selected_cpu->name)
> +	  if (!arm_selected_cpu->name)
>   	    arm_selected_cpu = &all_cores[arm6];
>   	}
> 
> 
> OK?

Yep, that's fine.

Wonder how long that's been wrong...

R.
Ryan Mansfield - Sept. 2, 2010, 2:50 p.m.
On 10-09-02 10:17 AM, Richard Earnshaw wrote:
>
> On Wed, 2010-09-01 at 21:12 -0400, Ryan Mansfield wrote:
>> In the case where the user does not select a cpu and one is not
>> configured, the cpu defined by SUBTARGET_CPU_DEFAULT is being overridden
>> by the default of arm6.
>>
>> 2010-09-01  Ryan Mansfield<rmansfield@qnx.com>
>>           * arm.c (arm_override_options): Use SUBTARGET_CPU_DEFAULT if
>> defined.
>>
>>
>> Index: config/arm/arm.c
>> ===================================================================
>> --- config/arm/arm.c	(revision 163753)
>> +++ config/arm/arm.c	(working copy)
>> @@ -1411,7 +1411,7 @@
>>    	  arm_selected_cpu =&all_cores[SUBTARGET_CPU_DEFAULT];
>>    #endif
>>    	  /* Default to ARM6.  */
>> -	  if (arm_selected_cpu->name)
>> +	  if (!arm_selected_cpu->name)
>>    	    arm_selected_cpu =&all_cores[arm6];
>>    	}
>>
>>
>> OK?
>
> Yep, that's fine.

Thanks. Could someone apply this on my behalf? I don't have commit access.

> Wonder how long that's been wrong...

Only since June (rev 160213).

Regards,

Ryan Mansfield
Richard Earnshaw - Sept. 2, 2010, 3:36 p.m.
On 02/09/10 15:50, Ryan Mansfield wrote:
> On 10-09-02 10:17 AM, Richard Earnshaw wrote:
>>
>> On Wed, 2010-09-01 at 21:12 -0400, Ryan Mansfield wrote:
>>> In the case where the user does not select a cpu and one is not
>>> configured, the cpu defined by SUBTARGET_CPU_DEFAULT is being overridden
>>> by the default of arm6.
>>>
>>> 2010-09-01  Ryan Mansfield<rmansfield@qnx.com>
>>>           * arm.c (arm_override_options): Use SUBTARGET_CPU_DEFAULT if
>>> defined.
>>>
>>>
>>> Index: config/arm/arm.c
>>> ===================================================================
>>> --- config/arm/arm.c    (revision 163753)
>>> +++ config/arm/arm.c    (working copy)
>>> @@ -1411,7 +1411,7 @@
>>>          arm_selected_cpu =&all_cores[SUBTARGET_CPU_DEFAULT];
>>>    #endif
>>>          /* Default to ARM6.  */
>>> -      if (arm_selected_cpu->name)
>>> +      if (!arm_selected_cpu->name)
>>>            arm_selected_cpu =&all_cores[arm6];
>>>        }
>>>
>>>
>>> OK?
>>
>> Yep, that's fine.
> 
> Thanks. Could someone apply this on my behalf? I don't have commit access.
> 

Done.

R.

Patch

Index: config/arm/arm.c
===================================================================
--- config/arm/arm.c	(revision 163753)
+++ config/arm/arm.c	(working copy)
@@ -1411,7 +1411,7 @@ 
  	  arm_selected_cpu = &all_cores[SUBTARGET_CPU_DEFAULT];
  #endif
  	  /* Default to ARM6.  */
-	  if (arm_selected_cpu->name)
+	  if (!arm_selected_cpu->name)
  	    arm_selected_cpu = &all_cores[arm6];
  	}