package/uclibc: backport static linking fixes
PATCH v3 1/1 package/uclibc: backport static linking fixes
Fixes:
- http://autobuild.buildroot.net/results/645/6453da1471398e8c788e5b86abc4bf2e83e6c0b2
- http://autobuild.buildroot.net/results/64d/64db6fcb132896ef3552b52ea743d53d05133982
- http://autobuild.buildroot.net/results/938/938729c42d52bd9e74454bc34b2b20c4e0503142
- http://autobuild.buildroot.net/results/bc5/bc50834820c921ce4927f23e4dcfa2aaa405c657
- http://autobuild.buildroot.net/results/a15/a156ffcbe16af4b2f5440dad06c6985b8fcd045e
---
Changes v2->v3:
* mention backport commit hashes in both patches
Kind regards,
Petr
...evert-Fix-static-linking-with-GCC-10.patch | 46 +++++++++++++++++++ ...0002-fix-static-builds-with-gcc-10.x.patch | 27 +++++++++++ 2 files changed, 73 insertions(+) create mode 100644 package/uclibc/0001-Revert-Fix-static-linking-with-GCC-10.patch create mode 100644 package/uclibc/0002-fix-static-builds-with-gcc-10.x.patch
package/uclibc/0001-Revert-Fix-static-linking-with-GCC-10.patch new file +46 -0
@@ -0,0 +1,46 @@ +From e80384786d7b7f895c97f2447d4b91af8eb5f0f4 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb <[email protected]> +Date: Wed, 2 Sep 2020 09:45:17 +0200 +Subject: [PATCH] Revert "Fix static linking with GCC-10" + +This reverts commit 5b58a1ebd89a4f05778441814e81817c82193fa3. + +This breaks all static builds earlier to gcc 10 :( +Bad testing on my side. + +[petr.vorel at gmail.com: backport of upstream commit e80384786d7b7f895c97f2447d4b91af8eb5f0f4] +Signed-off-by: Petr Vorel <[email protected]> +--- + libc/misc/elf/dl-support.c | 2 +- + libpthread/nptl/sysdeps/generic/libc-tls.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libc/misc/elf/dl-support.c b/libc/misc/elf/dl-support.c +index eaf08f5bb..87cd1bb72 100644 +--- a/libc/misc/elf/dl-support.c ++++ b/libc/misc/elf/dl-support.c +@@ -29,7 +29,7 @@ void (*_dl_init_static_tls) (struct link_map *) = &_dl_nothread_init_static_tls; + + ElfW(Phdr) *_dl_phdr; + size_t _dl_phnum; +-extern size_t _dl_pagesize; ++size_t _dl_pagesize; + + void internal_function _dl_aux_init (ElfW(auxv_t) *av); + void internal_function _dl_aux_init (ElfW(auxv_t) *av) +diff --git a/libpthread/nptl/sysdeps/generic/libc-tls.c b/libpthread/nptl/sysdeps/generic/libc-tls.c +index a1d2ef913..d746c9a38 100644 +--- a/libpthread/nptl/sysdeps/generic/libc-tls.c ++++ b/libpthread/nptl/sysdeps/generic/libc-tls.c +@@ -72,7 +72,7 @@ struct dtv_slotinfo_list *_dl_tls_dtv_slotinfo_list; + /* Number of modules in the static TLS block. */ + size_t _dl_tls_static_nelem; + /* Size of the static TLS block. */ +-extern size_t _dl_tls_static_size; ++size_t _dl_tls_static_size; + /* Size actually allocated in the static TLS block. */ + size_t _dl_tls_static_used; + /* Alignment requirement of the static TLS block. */ +-- +2.27.0.rc0 +
package/uclibc/0002-fix-static-builds-with-gcc-10.x.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 4deace34cfcc5476b71a9cdc05828f5a48d1cd74 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb <[email protected]> +Date: Thu, 3 Sep 2020 15:08:24 +0200 +Subject: [PATCH] fix static builds with gcc 10.x + +[petr.vorel at gmail.com: backport of upstream commit 4deace34cfcc5476b71a9cdc05828f5a48d1cd74] +Signed-off-by: Petr Vorel <[email protected]> +--- + Rules.mak | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Rules.mak b/Rules.mak +index f270b7bee..55e88d462 100644 +--- a/Rules.mak ++++ b/Rules.mak +@@ -288,7 +288,7 @@ OPTIMIZATION += $(CFLAG_-fstrict-aliasing) + + # Why -funsigned-char: I hunted a bug related to incorrect + # sign extension of 'char' type for 10 hours straight. Not fun. +-CPU_CFLAGS-y := -funsigned-char -fno-builtin ++CPU_CFLAGS-y := -funsigned-char -fno-builtin -fcommon + + $(eval $(call check-gcc-var,-fno-asm)) + CPU_CFLAGS-y += $(CFLAG_-fno-asm) +-- +2.27.0.rc0 +
Signature · 1 line
2.27.0.rc0
PATCH v3 1/1 package/uclibc: backport static linking fixes
Hi Petr,
Le 09/09/2020 ? 19:25, Petr Vorel a ?crit?:
Quoted 10 lines
Fixes:
- http://autobuild.buildroot.net/results/645/6453da1471398e8c788e5b86abc4bf2e83e6c0b2
- http://autobuild.buildroot.net/results/64d/64db6fcb132896ef3552b52ea743d53d05133982
- http://autobuild.buildroot.net/results/938/938729c42d52bd9e74454bc34b2b20c4e0503142
- http://autobuild.buildroot.net/results/bc5/bc50834820c921ce4927f23e4dcfa2aaa405c657
- http://autobuild.buildroot.net/results/a15/a156ffcbe16af4b2f5440dad06c6985b8fcd045eSuggested-by Waldemar Brodkorb <[email protected]>Suggested-by Damien Le Moal <[email protected]>Signed-off-by Petr Vorel <[email protected]>
https://gitlab.com/kubu93/buildroot/-/jobs/769818673
Best regards,
Romain
Quoted 99 lines
---
Changesv2->v3:
* mention backport commit hashes in both patchesKind regards,
Petr...evert-Fix-static-linking-with-GCC-10.patch | 46 +++++++++++++++++++ ...0002-fix-static-builds-with-gcc-10.x.patch | 27 +++++++++++ 2 files changed, 73 insertions(+) create mode 100644 package/uclibc/0001-Revert-Fix-static-linking-with-GCC-10.patch create mode 100644 package/uclibc/0002-fix-static-builds-with-gcc-10.x.patchpackage/uclibc/0001-Revert-Fix-static-linking-with-GCC-10.patch new file +46
-0@@ -0,0 +1,46 @@ +From e80384786d7b7f895c97f2447d4b91af8eb5f0f4 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb <[email protected]> +Date: Wed, 2 Sep 2020 09:45:17 +0200 +Subject: [PATCH] Revert "Fix static linking with GCC-10" + +This reverts commit 5b58a1ebd89a4f05778441814e81817c82193fa3. + +This breaks all static builds earlier to gcc 10 :( +Bad testing on my side. + +[petr.vorel at gmail.com: backport of upstream commit e80384786d7b7f895c97f2447d4b91af8eb5f0f4] +Signed-off-by: Petr Vorel <[email protected]> +--- + libc/misc/elf/dl-support.c | 2 +- + libpthread/nptl/sysdeps/generic/libc-tls.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libc/misc/elf/dl-support.c b/libc/misc/elf/dl-support.c +index eaf08f5bb..87cd1bb72 100644 +--- a/libc/misc/elf/dl-support.c ++++ b/libc/misc/elf/dl-support.c +@@ -29,7 +29,7 @@ void (*_dl_init_static_tls) (struct link_map *) = &_dl_nothread_init_static_tls; + + ElfW(Phdr) *_dl_phdr; + size_t _dl_phnum; +-extern size_t _dl_pagesize; ++size_t _dl_pagesize; + + void internal_function _dl_aux_init (ElfW(auxv_t) *av); + void internal_function _dl_aux_init (ElfW(auxv_t) *av) +diff --git a/libpthread/nptl/sysdeps/generic/libc-tls.c b/libpthread/nptl/sysdeps/generic/libc-tls.c +index a1d2ef913..d746c9a38 100644 +--- a/libpthread/nptl/sysdeps/generic/libc-tls.c ++++ b/libpthread/nptl/sysdeps/generic/libc-tls.c +@@ -72,7 +72,7 @@ struct dtv_slotinfo_list *_dl_tls_dtv_slotinfo_list; + /* Number of modules in the static TLS block. */ + size_t _dl_tls_static_nelem; + /* Size of the static TLS block. */ +-extern size_t _dl_tls_static_size; ++size_t _dl_tls_static_size; + /* Size actually allocated in the static TLS block. */ + size_t _dl_tls_static_used; + /* Alignment requirement of the static TLS block. */ +-- +2.27.0.rc0 +package/uclibc/0002-fix-static-builds-with-gcc-10.x.patch new file +27
-0@@ -0,0 +1,27 @@ +From 4deace34cfcc5476b71a9cdc05828f5a48d1cd74 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb <[email protected]> +Date: Thu, 3 Sep 2020 15:08:24 +0200 +Subject: [PATCH] fix static builds with gcc 10.x + +[petr.vorel at gmail.com: backport of upstream commit 4deace34cfcc5476b71a9cdc05828f5a48d1cd74] +Signed-off-by: Petr Vorel <[email protected]> +--- + Rules.mak | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Rules.mak b/Rules.mak +index f270b7bee..55e88d462 100644 +--- a/Rules.mak ++++ b/Rules.mak +@@ -288,7 +288,7 @@ OPTIMIZATION += $(CFLAG_-fstrict-aliasing) + + # Why -funsigned-char: I hunted a bug related to incorrect + # sign extension of 'char' type for 10 hours straight. Not fun. +-CPU_CFLAGS-y := -funsigned-char -fno-builtin ++CPU_CFLAGS-y := -funsigned-char -fno-builtin -fcommon + + $(eval $(call check-gcc-var,-fno-asm)) + CPU_CFLAGS-y += $(CFLAG_-fno-asm) +-- +2.27.0.rc0 +
PATCH v3 1/1 package/uclibc: backport static linking fixes
In reply to Petr VorelHello Petr,
Quoted 10 lines · On Wed, 9 Sep 2020 19:25:47 +0200 Petr Vorel <[email protected]> wrote:
Fixes:
- http://autobuild.buildroot.net/results/645/6453da1471398e8c788e5b86abc4bf2e83e6c0b2
- http://autobuild.buildroot.net/results/64d/64db6fcb132896ef3552b52ea743d53d05133982
- http://autobuild.buildroot.net/results/938/938729c42d52bd9e74454bc34b2b20c4e0503142
- http://autobuild.buildroot.net/results/bc5/bc50834820c921ce4927f23e4dcfa2aaa405c657
- http://autobuild.buildroot.net/results/a15/a156ffcbe16af4b2f5440dad06c6985b8fcd045eSuggested-by Waldemar Brodkorb <[email protected]>Suggested-by Damien Le Moal <[email protected]>Signed-off-by Petr Vorel <[email protected]>
We now have updated to 1.0.36 in master, so this patch is no longer needed in master.
However, it could be useful for the 2020.08.x branch.
It is not useful for the 2020.02.x however, because 2020.02.x did not have gcc 10.x support.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 1/1 package/uclibc: backport static linking fixes
Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Hello Petr,
Quoted 7 lines · On Wed, 9 Sep 2020 19:25:47 +0200 Petr Vorel <[email protected]> wrote:
Fixes:
- http://autobuild.buildroot.net/results/645/6453da1471398e8c788e5b86abc4bf2e83e6c0b2
- http://autobuild.buildroot.net/results/64d/64db6fcb132896ef3552b52ea743d53d05133982
- http://autobuild.buildroot.net/results/938/938729c42d52bd9e74454bc34b2b20c4e0503142
- http://autobuild.buildroot.net/results/bc5/bc50834820c921ce4927f23e4dcfa2aaa405c657
- http://autobuild.buildroot.net/results/a15/a156ffcbe16af4b2f5440dad06c6985b8fcd045e
Quoted 8 lines
Quoted 3 lines
Suggested-by Waldemar Brodkorb <[email protected]>Suggested-by Damien Le Moal <[email protected]>Signed-off-by Petr Vorel <[email protected]>We now have updated to 1.0.36 in master, so this patch is no longer needed in master.
However, it could be useful for the 2020.08.x branch.
Yes, except that 2020.08.x has 1.0.34 and the first patch reverts a change that was only added in 1.0.35.
Committed to 2020.08.x after dropping the first patch, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v3 1/1 package/uclibc: backport static linking fixes
In reply to Thomas PetazzoniHi all,
Quoted 2 lines
We now have updated to 1.0.36 in master, so this patch is no longer needed in master.
Great, master is already updated.
BTW how can I check that the toolchain already rebuilt?
I'm asking for iproute2 fix which needs that:
https://patchwork.ozlabs.org/project/buildroot/patch/20200903155728.19448-2-petr.vorel at gmail.com/
Kind regards,
Petr
PATCH v3 1/1 package/uclibc: backport static linking fixes
Quoted 6 lines · On Tue, 6 Oct 2020 22:11:24 +0200 Petr Vorel <[email protected]> wrote:
Quoted 2 lines
We now have updated to 1.0.36 in master, so this patch is no longer needed in master.
Great, master is already updated.
BTW how can I check that the toolchain already rebuilt?
I'm asking for iproute2 fix which needs that:
https://patchwork.ozlabs.org/project/buildroot/patch/20200903155728.19448-2-petr.vorel at gmail.com/
The toolchains used in the autobuilders are at
http://autobuild.buildroot.net/toolchains/tarballs/. They were last rebuilt with Buildroot 2020.02. I guess I should rebuild them when we have 2020.11 ?
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com