diff mbox series

[1/2] package/rustc: fix target names for i586 and i686

Message ID e2f23070c85c1d2fcf5ad74c88eae23723d18916.1658007000.git.yann.morin.1998@free.fr
State Changes Requested
Headers show
Series pacakge: drop remnants of $(HOST_DIR)/usr (branch yem/no-host-dir-usr) | expand

Commit Message

Yann E. MORIN July 16, 2022, 9:30 p.m. UTC
Commit d69d40c029dc (package/rustc: add support for Tier 1 and Tier 2
platforms) misspelled the config options for i586 and i686.

They are BR2_i386_i586 and BR2_i386_i686, not BR2_i586 or BR2_i686.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/rustc/Config.in.host | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Baruch Siach July 17, 2022, 3:21 a.m. UTC | #1
Hi Yann,

On Sat, Jul 16 2022, Yann E. MORIN wrote:
> Commit d69d40c029dc (package/rustc: add support for Tier 1 and Tier 2
> platforms) misspelled the config options for i586 and i686.
>
> They are BR2_i386_i586 and BR2_i386_i686, not BR2_i586 or BR2_i686.

You mean BR2_x86_i586 and BR2_x86_i686, right? Because that's what the
patch does.

baruch

> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  package/rustc/Config.in.host | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host
> index 27c3a3cdeb..fec8726aee 100644
> --- a/package/rustc/Config.in.host
> +++ b/package/rustc/Config.in.host
> @@ -25,7 +25,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS
>  	# aarch64-unknown-linux-gnu
>  	default y if BR2_aarch64 && BR2_TOOLCHAIN_USES_GLIBC
>  	# i686-unknown-linux-gnu
> -	default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC
> +	default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC
>  	# x86_64-unknown-linux-gnu
>  	default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_GLIBC
>  
> @@ -93,11 +93,11 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS
>  	# userspace
>  	default y if BR2_arm && BR2_ARM_CPU_ARMV8A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL
>  	# i586-unknown-linux-gnu
> -	default y if BR2_i586 && BR2_TOOLCHAIN_USES_GLIBC
> +	default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_GLIBC
>  	# i586-unknown-linux-musl
> -	default y if BR2_i586 && BR2_TOOLCHAIN_USES_MUSL
> +	default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL
>  	# i686-unknown-linux-musl
> -	default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL
> +	default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL
>  	# mips-unknown-linux-musl
>  	default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6
>  	# mips64-unknown-linux-muslabi64
Yann E. MORIN July 17, 2022, 6:56 a.m. UTC | #2
Baruch, All,

On 2022-07-17 06:21 +0300, Baruch Siach via buildroot spake thusly:
> On Sat, Jul 16 2022, Yann E. MORIN wrote:
> > Commit d69d40c029dc (package/rustc: add support for Tier 1 and Tier 2
> > platforms) misspelled the config options for i586 and i686.
> >
> > They are BR2_i386_i586 and BR2_i386_i686, not BR2_i586 or BR2_i686.
> 
> You mean BR2_x86_i586 and BR2_x86_i686, right? Because that's what the
> patch does.

Aha, good catch, thanks! :-)

"Why would I copy-paste the options names, they are simple enough, it's
gonna be faster to type them..." did I think while fixing typoes in
simple variable names. Doh...

So, I double-checked, and the options really arenamed BR2_x86_i586 and
BR2_x86_i686. And this time, I did copy-pate them:-)

Regards,
Yann E. MORIN.

> baruch
> 
> > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> > ---
> >  package/rustc/Config.in.host | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host
> > index 27c3a3cdeb..fec8726aee 100644
> > --- a/package/rustc/Config.in.host
> > +++ b/package/rustc/Config.in.host
> > @@ -25,7 +25,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS
> >  	# aarch64-unknown-linux-gnu
> >  	default y if BR2_aarch64 && BR2_TOOLCHAIN_USES_GLIBC
> >  	# i686-unknown-linux-gnu
> > -	default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC
> > +	default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC
> >  	# x86_64-unknown-linux-gnu
> >  	default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_GLIBC
> >  
> > @@ -93,11 +93,11 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS
> >  	# userspace
> >  	default y if BR2_arm && BR2_ARM_CPU_ARMV8A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL
> >  	# i586-unknown-linux-gnu
> > -	default y if BR2_i586 && BR2_TOOLCHAIN_USES_GLIBC
> > +	default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_GLIBC
> >  	# i586-unknown-linux-musl
> > -	default y if BR2_i586 && BR2_TOOLCHAIN_USES_MUSL
> > +	default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL
> >  	# i686-unknown-linux-musl
> > -	default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL
> > +	default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL
> >  	# mips-unknown-linux-musl
> >  	default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6
> >  	# mips64-unknown-linux-muslabi64
> 
> 
> -- 
>                                                      ~. .~   Tk Open Systems
> =}------------------------------------------------ooO--U--Ooo------------{=
>    - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
Romain Naour July 24, 2022, 9:01 a.m. UTC | #3
Le 17/07/2022 à 08:56, Yann E. MORIN a écrit :
> Baruch, All,
> 
> On 2022-07-17 06:21 +0300, Baruch Siach via buildroot spake thusly:
>> On Sat, Jul 16 2022, Yann E. MORIN wrote:
>>> Commit d69d40c029dc (package/rustc: add support for Tier 1 and Tier 2
>>> platforms) misspelled the config options for i586 and i686.
>>>
>>> They are BR2_i386_i586 and BR2_i386_i686, not BR2_i586 or BR2_i686.
>>
>> You mean BR2_x86_i586 and BR2_x86_i686, right? Because that's what the
>> patch does.
> 
> Aha, good catch, thanks! :-)
> 
> "Why would I copy-paste the options names, they are simple enough, it's
> gonna be faster to type them..." did I think while fixing typoes in
> simple variable names. Doh...
> 
> So, I double-checked, and the options really arenamed BR2_x86_i586 and
> BR2_x86_i686. And this time, I did copy-pate them:-)

With an updated commit log:

Reviewed-by: Romain Naour <romain.naour@smile.fr>

Best regards,
Romain

> 
> Regards,
> Yann E. MORIN.
> 
>> baruch
>>
>>> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
>>> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
>>> ---
>>>  package/rustc/Config.in.host | 8 ++++----
>>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host
>>> index 27c3a3cdeb..fec8726aee 100644
>>> --- a/package/rustc/Config.in.host
>>> +++ b/package/rustc/Config.in.host
>>> @@ -25,7 +25,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS
>>>  	# aarch64-unknown-linux-gnu
>>>  	default y if BR2_aarch64 && BR2_TOOLCHAIN_USES_GLIBC
>>>  	# i686-unknown-linux-gnu
>>> -	default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC
>>> +	default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC
>>>  	# x86_64-unknown-linux-gnu
>>>  	default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_GLIBC
>>>  
>>> @@ -93,11 +93,11 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS
>>>  	# userspace
>>>  	default y if BR2_arm && BR2_ARM_CPU_ARMV8A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL
>>>  	# i586-unknown-linux-gnu
>>> -	default y if BR2_i586 && BR2_TOOLCHAIN_USES_GLIBC
>>> +	default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_GLIBC
>>>  	# i586-unknown-linux-musl
>>> -	default y if BR2_i586 && BR2_TOOLCHAIN_USES_MUSL
>>> +	default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL
>>>  	# i686-unknown-linux-musl
>>> -	default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL
>>> +	default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL
>>>  	# mips-unknown-linux-musl
>>>  	default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6
>>>  	# mips64-unknown-linux-muslabi64
>>
>>
>> -- 
>>                                                      ~. .~   Tk Open Systems
>> =}------------------------------------------------ooO--U--Ooo------------{=
>>    - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/mailman/listinfo/buildroot
>
Peter Korsgaard Aug. 16, 2022, 8:11 p.m. UTC | #4
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > Commit d69d40c029dc (package/rustc: add support for Tier 1 and Tier 2
 > platforms) misspelled the config options for i586 and i686.

 > They are BR2_i386_i586 and BR2_i386_i686, not BR2_i586 or BR2_i686.

 > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
 > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed to 2022.05.x and 2022.02.x, thanks.
diff mbox series

Patch

diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host
index 27c3a3cdeb..fec8726aee 100644
--- a/package/rustc/Config.in.host
+++ b/package/rustc/Config.in.host
@@ -25,7 +25,7 @@  config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS
 	# aarch64-unknown-linux-gnu
 	default y if BR2_aarch64 && BR2_TOOLCHAIN_USES_GLIBC
 	# i686-unknown-linux-gnu
-	default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC
+	default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC
 	# x86_64-unknown-linux-gnu
 	default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_GLIBC
 
@@ -93,11 +93,11 @@  config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS
 	# userspace
 	default y if BR2_arm && BR2_ARM_CPU_ARMV8A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL
 	# i586-unknown-linux-gnu
-	default y if BR2_i586 && BR2_TOOLCHAIN_USES_GLIBC
+	default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_GLIBC
 	# i586-unknown-linux-musl
-	default y if BR2_i586 && BR2_TOOLCHAIN_USES_MUSL
+	default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL
 	# i686-unknown-linux-musl
-	default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL
+	default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL
 	# mips-unknown-linux-musl
 	default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6
 	# mips64-unknown-linux-muslabi64