[Buildroot] [PATCH 1/1] package/gcc: remove orphaned 10.4.0 patch

[Buildroot] [PATCH 1/1] package/gcc: remove orphaned 10.4.0 patch

[Vincent Fazio]

Shortly before GCC 10.4.0 was dropped in d37a8f3a2, commit 4ce0dacb6 was
merged and introduced a patch to 10.4.0 that was not accounted for by
the patch that dropped 10.4.0 support.

Fixes: d37a8f3a2 ("package/gcc: remove gcc 10.x")
Signed-off-by: Vincent Fazio <vfazio@gmail.com>
---
 ...ine-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch | 49 -------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch

diff --git a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch
deleted file mode 100644
index 7e9714e9cb..0000000000
--- a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001
-From: Stafford Horne <shorne@gmail.com>
-Date: Thu, 29 Sep 2022 15:32:39 +0100
-Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS
-
-This was found when testing buildroot with linuxthreads enabled.  In
-this case, the build passes --disable-tls to the toolchain during
-configuration.  After building the OpenRISC toolchain it was still
-generating TLS code sequences and causing linker failures such as:
-
- ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl
- ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr'
-
-This patch fixes this by disabling tls for the OpenRISC target when requested
-via --disable-tls.
-
-gcc/ChangeLog:
-
-	* config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if
-	HAVE_AS_TLS is defined.
-
-Tested-by: Yann E. MORIN <yann.morin@orange.com>
-
-Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585
-
-[Bernd: backported to 10.4.0]
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- gcc/config/or1k/or1k.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c
-index da2f59062ba..0ce7b234417 100644
---- a/gcc/config/or1k/or1k.c
-+++ b/gcc/config/or1k/or1k.c
-@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl,
- #undef  TARGET_LEGITIMATE_ADDRESS_P
- #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p
- 
-+#ifdef HAVE_AS_TLS
- #undef  TARGET_HAVE_TLS
- #define TARGET_HAVE_TLS true
-+#endif
- 
- #undef  TARGET_HAVE_SPECULATION_SAFE_VALUE
- #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed
--- 
-2.39.3
-
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/gcc: remove orphaned 10.4.0 patch

[Romain Naour]

Hello Vincent,

Le 22/02/2024 à 14:55, Vincent Fazio a écrit :
> Shortly before GCC 10.4.0 was dropped in d37a8f3a2, commit 4ce0dacb6 was
> merged and introduced a patch to 10.4.0 that was not accounted for by
> the patch that dropped 10.4.0 support.

Well, this is unfortunate. The patch removing GCC 10.4.0 was pending in
patchwork when the patch was introduced. I can't remove a file that doesn't
exist yet :p

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

Best regards,
Romain

> 
> Fixes: d37a8f3a2 ("package/gcc: remove gcc 10.x")
> Signed-off-by: Vincent Fazio <vfazio@gmail.com>
> ---
>  ...ine-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch | 49 -------------------
>  1 file changed, 49 deletions(-)
>  delete mode 100644 package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch
> 
> diff --git a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch
> deleted file mode 100644
> index 7e9714e9cb..0000000000
> --- a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch
> +++ /dev/null
> @@ -1,49 +0,0 @@
> -From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001
> -From: Stafford Horne <shorne@gmail.com>
> -Date: Thu, 29 Sep 2022 15:32:39 +0100
> -Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS
> -
> -This was found when testing buildroot with linuxthreads enabled.  In
> -this case, the build passes --disable-tls to the toolchain during
> -configuration.  After building the OpenRISC toolchain it was still
> -generating TLS code sequences and causing linker failures such as:
> -
> - ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl
> - ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr'
> -
> -This patch fixes this by disabling tls for the OpenRISC target when requested
> -via --disable-tls.
> -
> -gcc/ChangeLog:
> -
> -	* config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if
> -	HAVE_AS_TLS is defined.
> -
> -Tested-by: Yann E. MORIN <yann.morin@orange.com>
> -
> -Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585
> -
> -[Bernd: backported to 10.4.0]
> -Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ----
> - gcc/config/or1k/or1k.c | 2 ++
> - 1 file changed, 2 insertions(+)
> -
> -diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c
> -index da2f59062ba..0ce7b234417 100644
> ---- a/gcc/config/or1k/or1k.c
> -+++ b/gcc/config/or1k/or1k.c
> -@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl,
> - #undef  TARGET_LEGITIMATE_ADDRESS_P
> - #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p
> - 
> -+#ifdef HAVE_AS_TLS
> - #undef  TARGET_HAVE_TLS
> - #define TARGET_HAVE_TLS true
> -+#endif
> - 
> - #undef  TARGET_HAVE_SPECULATION_SAFE_VALUE
> - #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed
> --- 
> -2.39.3
> -

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/gcc: remove orphaned 10.4.0 patch

[Peter Korsgaard]

>>>>> "Vincent" == Vincent Fazio <vfazio@gmail.com> writes:

 > Shortly before GCC 10.4.0 was dropped in d37a8f3a2, commit 4ce0dacb6 was
 > merged and introduced a patch to 10.4.0 that was not accounted for by
 > the patch that dropped 10.4.0 support.

 > Fixes: d37a8f3a2 ("package/gcc: remove gcc 10.x")
 > Signed-off-by: Vincent Fazio <vfazio@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/gcc: remove orphaned 10.4.0 patch

[Peter Korsgaard]

>>>>> "Vincent" == Vincent Fazio <vfazio@gmail.com> writes:

 > Shortly before GCC 10.4.0 was dropped in d37a8f3a2, commit 4ce0dacb6 was
 > merged and introduced a patch to 10.4.0 that was not accounted for by
 > the patch that dropped 10.4.0 support.

 > Fixes: d37a8f3a2 ("package/gcc: remove gcc 10.x")
 > Signed-off-by: Vincent Fazio <vfazio@gmail.com>

Committed to 2023.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot