Skip to contentSkip to conversation

package/gcc: define _REENTRANT for OpenRISC when -pthread is passed

PATCH In review Fabrice Fontaine 5 participants 8 messages Jan 18, 2022 – Jan 28, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/gcc: define _REENTRANT for OpenRISC when -pthread is passed

Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.):

configure:13774: checking whether pthreads work with -pthread
configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5
conftest.c:27:26: error: #error "_REENTRANT must be defined"

   27 | #                        error "_REENTRANT must be defined"
      |                          ^~~~~

It should be noted that external bootlins will have to be rebuilt.

Fixes:
- http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766
- http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741
- http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46

---
 ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 31 +++++++++++++++++++
 ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 31 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch
 create mode 100644 package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch
package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file +31 -0
new file mode 100644
index 0000000000..5ac03d7c0c
@@ -0,0 +1,31 @@
+From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+Date: Fri, 27 Mar 2020 21:23:53 +0100
+Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed
+
+The detection of pthread support fails on OpenRISC unless _REENTRANT
+is defined. Added the CPP_SPEC definition to correct this.
+
+Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+---
+ gcc/config/or1k/linux.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h
+index cbdc781418f..36303af892c 100644
+--- a/gcc/config/or1k/linux.h
++++ b/gcc/config/or1k/linux.h
+@@ -32,6 +32,8 @@
+ #undef MUSL_DYNAMIC_LINKER
+ #define MUSL_DYNAMIC_LINKER  "/lib/ld-musl-or1k.so.1"
+ 
++#define CPP_SPEC "%{pthread:-D_REENTRANT}"
++
+ #undef LINK_SPEC
+ #define LINK_SPEC "%{h*}			\
+    %{static:-Bstatic}				\
+-- 
+2.31.1
+
package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file +31 -0
new file mode 100644
index 0000000000..5ac03d7c0c
@@ -0,0 +1,31 @@
+From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+Date: Fri, 27 Mar 2020 21:23:53 +0100
+Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed
+
+The detection of pthread support fails on OpenRISC unless _REENTRANT
+is defined. Added the CPP_SPEC definition to correct this.
+
+Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+---
+ gcc/config/or1k/linux.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h
+index cbdc781418f..36303af892c 100644
+--- a/gcc/config/or1k/linux.h
++++ b/gcc/config/or1k/linux.h
+@@ -32,6 +32,8 @@
+ #undef MUSL_DYNAMIC_LINKER
+ #define MUSL_DYNAMIC_LINKER  "/lib/ld-musl-or1k.so.1"
+ 
++#define CPP_SPEC "%{pthread:-D_REENTRANT}"
++
+ #undef LINK_SPEC
+ #define LINK_SPEC "%{h*}			\
+    %{static:-Bstatic}				\
+-- 
+2.31.1
+
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/2 Revert "package/libmicrohttpd: fix pthread detection"

This reverts commit 834464792e691a243d456335083b2a8b3363e261, the build failure is not related to the bump to 0.9.75 but to or1k and gcc 10.

---
 package/libmicrohttpd/libmicrohttpd.mk | 4 ----
 1 file changed, 4 deletions(-)
package/libmicrohttpd/libmicrohttpd.mk +0 -4
index 344e1443fd..f75178bc0a 100644
@@ -12,10 +12,6 @@ LIBMICROHTTPD_INSTALL_STAGING = YES
 LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples
 LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99
 
-ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-LIBMICROHTTPD_CFLAGS += -D_REENTRANT
-endif
-
 LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)"
 
 ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
In reply to Fabrice Fontaine

Hello Fabrice,

Quoted 11 lines · On Tue, 18 Jan 2022 23:24:24 +0100 Fabrice Fontaine…

Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.):

configure:13774: checking whether pthreads work with -pthread
configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5
conftest.c:27:26: error: #error "_REENTRANT must be defined"

   27 | #                        error "_REENTRANT must be defined"
      |                          ^~~~~
Quoted 8 lines

It should be noted that external bootlins will have to be rebuilt.

Fixes:
- http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766
- http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741
- http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46

Wow, this patch still hasn't been accepted in upstream gcc? It's been submitted a looong time ago I believe.

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw
Quoted 23 lines · Thomas Petazzoni

Hello Fabrice,

Quoted 18 lines · On Tue, 18 Jan 2022 23:24:24 +0100 Fabrice Fontaine…

Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.):

configure:13774: checking whether pthreads work with -pthread
configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5
conftest.c:27:26: error: #error "_REENTRANT must be defined"

   27 | #                        error "_REENTRANT must be defined"
      |                          ^~~~~

It should be noted that external bootlins will have to be rebuilt.

Fixes:
- http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766
- http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741
- http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46

Quoted 4 lines
Quoted 1 line

Wow, this patch still hasn't been accepted in upstream gcc? It's been submitted a looong time ago I believe.

Hello,

I must have missed this one. It looks good to me I will push it upstream.

-Stafford
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#4 lore raw

Hi Stafford,

Quoted 26 lines

Il giorno 19 gen 2022, alle ore 09:14, Stafford Horne <[email protected]> ha scritto:

Quoted 23 lines · Thomas Petazzoni

Hello Fabrice,

Quoted 21 lines

On Tue, 18 Jan 2022 23:24:24 +0100
Fabrice Fontaine <[email protected]> wrote:

Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.):

configure:13774: checking whether pthreads work with -pthread
configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5
conftest.c:27:26: error: #error "_REENTRANT must be defined"

  27 | #                        error "_REENTRANT must be defined"
     |                          ^~~~~

It should be noted that external bootlins will have to be rebuilt.

Fixes:
- http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766
- http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741
- http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

Wow, this patch still hasn't been accepted in upstream gcc? It's been submitted a looong time ago I believe.

Hello,

I must have missed this one. It looks good to me I will push it upstream.

I’ve just written I would have pinged you soon and you’ve appeared:-) Better this way!

Kind regards
—-
Giulio Benetti
Benetti Engineering sas

Quoted 6 lines

-Stafford
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#5 lore raw
In reply to Thomas Petazzoni

Hi Thomas, All,

Quoted 25 lines

Il giorno 19 gen 2022, alle ore 08:56, Thomas Petazzoni <[email protected]> ha scritto:

Hello Fabrice,

Quoted 21 lines

On Tue, 18 Jan 2022 23:24:24 +0100
Fabrice Fontaine <[email protected]> wrote:

Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.):

configure:13774: checking whether pthreads work with -pthread
configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5
conftest.c:27:26: error: #error "_REENTRANT must be defined"

  27 | #                        error "_REENTRANT must be defined"
     |                          ^~~~~

It should be noted that external bootlins will have to be rebuilt.

Fixes:
- http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766
- http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741
- http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46

Quoted 4 lines
Quoted 1 line

Wow, this patch still hasn't been accepted in upstream gcc? It's been submitted a looong time ago I believe.

That’s when the new maintainer took over the previous one. I ping him about this so he can commit it. YetAnotherOr1kBug :-)

Best regards
Giulio

Quoted 6 lines

Thomas

Signature · 3 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#6 lore raw
In reply to Fabrice Fontaine

Hello,

Quoted 18 lines · On Tue, 18 Jan 2022 23:24:24 +0100 Fabrice Fontaine…

Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.):

configure:13774: checking whether pthreads work with -pthread
configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5
conftest.c:27:26: error: #error "_REENTRANT must be defined"

   27 | #                        error "_REENTRANT must be defined"
      |                          ^~~~~

It should be noted that external bootlins will have to be rebuilt.

Fixes:
- http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766
- http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741
- http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46

Quoted 7 lines
---
 ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 31 +++++++++++++++++++
 ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 31 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch
 create mode 100644 package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch

Both patches applied. The Bootlin toolchains are being rebuilt. I'll send an update when the toolchains are ready.

Best regards,

Thomas Petazzoni

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#7 lore raw
In reply to Fabrice Fontaine
Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.):

configure:13774: checking whether pthreads work with -pthread
configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5
conftest.c:27:26: error: #error "_REENTRANT must be defined"

   27 | #                        error "_REENTRANT must be defined"
      |                          ^~~~~
Quoted 8 lines

It should be noted that external bootlins will have to be rebuilt.

Fixes:
- http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766
- http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741
- http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46

Committed to 2021.02.x and 2021.11.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot