aboutsummaryrefslogtreecommitdiff
path: root/packages/gcc
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2023-09-06 16:05:24 +1200
committerChris Packham <judge.packham@gmail.com>2023-09-13 13:55:00 +1200
commit2b2183b3215e3df1f139bc11b4c8aafafb4384b8 (patch)
tree5fd5dc45e42c24bd928c8f13557527e88be615ee /packages/gcc
parent6780e48aca3313c2973e8a138072cc07774a442b (diff)
downloadcrosstool-ng-2b2183b3215e3df1f139bc11b4c8aafafb4384b8.tar.gz
crosstool-ng-2b2183b3215e3df1f139bc11b4c8aafafb4384b8.tar.bz2
crosstool-ng-2b2183b3215e3df1f139bc11b4c8aafafb4384b8.zip
gcc: Add patch to avoid reference to __pthread_key_create
A toolchain uclibc-ng-1.0.43, binutils-2.40 and gcc-13.2.0 hits the following error when building: ld.bfd: isl_test2.o: non-canonical reference to canonical protected function `__pthread_key_create' in x86_64-multilib-linux-uclibc/sysroot/lib64/libc.so.1 ld.bfd: failed to set dynamic section sizes: bad value The reference comes from libgcc where it is using the __pthread_key_create() symbol to detect the use of pthreads with GNU libc. Prevent this on uclibc-ng with an explicit condition. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111322 Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'packages/gcc')
-rw-r--r--packages/gcc/13.2.0/0013-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/packages/gcc/13.2.0/0013-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch b/packages/gcc/13.2.0/0013-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch
new file mode 100644
index 00000000..349f280a
--- /dev/null
+++ b/packages/gcc/13.2.0/0013-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch
@@ -0,0 +1,35 @@
+From d901175d36221fbf79a0eb8305823b88243b829c Mon Sep 17 00:00:00 2001
+From: Chris Packham <chris.packham@alliedtelesis.co.nz>
+Date: Thu, 7 Sep 2023 19:26:49 +1200
+Subject: [PATCH] libgcc: Exclude UCLIBC from GLIBC thread check
+
+UBLIBC defines __GLIBC__ but also marks __pthread_key_create() as
+protected. Leading to link errors with newer binutils such as:
+
+ ld.bfd: isl_test_cpp17.o: non-canonical reference to canonical protected function `__pthread_key_create' in x86_64-multilib-linux-uclibc/sysroot/lib64/libc.so.1
+ ld.bfd: failed to set dynamic section sizes: bad value
+
+Add a condition on !__UCLIBC__ when selecting a symbol to detect pthread
+usage so it picks the intended pthread_cancel().
+
+Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
+---
+ libgcc/gthr-posix.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgcc/gthr-posix.h b/libgcc/gthr-posix.h
+index aebcfdd9f4ca..087a631d308d 100644
+--- a/libgcc/gthr-posix.h
++++ b/libgcc/gthr-posix.h
+@@ -233,7 +233,7 @@ __gthread_active_p (void)
+ library does not provide pthread_cancel, so we do use pthread_create
+ there (and interceptor libraries lose). */
+
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ __gthrw2(__gthrw_(__pthread_key_create),
+ __pthread_key_create,
+ pthread_key_create)
+--
+2.42.0
+