Skip to contentSkip to conversation

package/libnss: fix build failure on powerpc without <sys/auxv.h>

PATCH New Giulio Benetti 2 participants 6 messages Dec 10, 2019 – Dec 23, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libnss: fix build failure on powerpc without <sys/auxv.h>

Add patch to fix build failure on PowerPc without <sys/auxv.h>. The patch inserts #if statements to include or note <sys/auxv.h> prior it exists.

Fixes:
http://autobuild.buildroot.net/results/8bf95bd8a0aec8c53889308ab1e00d0a94f53d57/

---
 ...Fix-PowerPc-build-sys-auxv.h-failure.patch | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 package/libnss/0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch
package/libnss/0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch new file +40 -0
new file mode 100644
index 0000000000..c8f12d777a
@@ -0,0 +1,40 @@
+From efe0fd875c80ff6e3a05db6c5e15b07c173530a6 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Tue, 10 Dec 2019 13:06:01 +0100
+Subject: [PATCH] Bug 1602743 - Fix PowerPc build sys/auxv.h failure
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/lib/freebl/blinit.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/nss/lib/freebl/blinit.c b/nss/lib/freebl/blinit.c
+index 959109b60..f0654595d 100644
+--- a/nss/lib/freebl/blinit.c
++++ b/nss/lib/freebl/blinit.c
+@@ -357,7 +357,9 @@ ppc_crypto_support()
+ 
+ #if defined(__powerpc__)
+ 
++#if (__has_include(<sys/auxv.h>))
+ #include <sys/auxv.h>
++#endif
+ 
+ // Defines from cputable.h in Linux kernel - PPC, letting us build on older kernels
+ #ifndef PPC_FEATURE2_VEC_CRYPTO
+@@ -368,8 +370,11 @@ static void
+ CheckPPCSupport()
+ {
+     char *disable_hw_crypto = PR_GetEnvSecure("NSS_DISABLE_PPC_GHASH");
++    long hwcaps = 0;
+ 
+-    long hwcaps = getauxval(AT_HWCAP2);
++#if (__has_include(<sys/auxv.h>))
++    hwcaps = getauxval(AT_HWCAP2);
++#endif
+ 
+     ppc_crypto_support_ = hwcaps & PPC_FEATURE2_VEC_CRYPTO && disable_hw_crypto == NULL;
+ }
+-- 
+2.20.1
+
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/libnss: fix build failure on powerpc without <sys/auxv.h>

Quoted 7 lines · Giulio Benetti

Add patch to fix build failure on PowerPc without <sys/auxv.h>. The patch inserts #if statements to include or note <sys/auxv.h> prior it exists.

Fixes:
http://autobuild.buildroot.net/results/8bf95bd8a0aec8c53889308ab1e00d0a94f53d57/

It's already pending upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1602743

Quoted 52 lines
---
  ...Fix-PowerPc-build-sys-auxv.h-failure.patch | 40 +++++++++++++++++++
  1 file changed, 40 insertions(+)

create mode 100644 package/libnss/0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch

package/libnss/0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch new file +40 -0
new file mode 100644
index 0000000000..c8f12d777a
@@ -0,0 +1,40 @@
+From efe0fd875c80ff6e3a05db6c5e15b07c173530a6 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Tue, 10 Dec 2019 13:06:01 +0100
+Subject: [PATCH] Bug 1602743 - Fix PowerPc build sys/auxv.h failure
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/lib/freebl/blinit.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/nss/lib/freebl/blinit.c b/nss/lib/freebl/blinit.c
+index 959109b60..f0654595d 100644
+--- a/nss/lib/freebl/blinit.c
++++ b/nss/lib/freebl/blinit.c
+@@ -357,7 +357,9 @@ ppc_crypto_support()
+
+ #if defined(__powerpc__)
+
++#if (__has_include(<sys/auxv.h>))
+ #include <sys/auxv.h>
++#endif
+
+ // Defines from cputable.h in Linux kernel - PPC, letting us build on older kernels
+ #ifndef PPC_FEATURE2_VEC_CRYPTO
+@@ -368,8 +370,11 @@ static void
+ CheckPPCSupport()
+ {
+     char *disable_hw_crypto = PR_GetEnvSecure("NSS_DISABLE_PPC_GHASH");
++    long hwcaps = 0;
+
+-    long hwcaps = getauxval(AT_HWCAP2);
++#if (__has_include(<sys/auxv.h>))
++    hwcaps = getauxval(AT_HWCAP2);
++#endif
+
+     ppc_crypto_support_ = hwcaps & PPC_FEATURE2_VEC_CRYPTO && disable_hw_crypto == NULL;
+ }
+--
+2.20.1
+
Signature · 2 lines
Giulio Benetti
Benetti Engineering sas
#2 lore raw

PATCH 1/1 package/libnss: fix build failure on powerpc without <sys/auxv.h>

In reply to Giulio Benetti
Quoted 5 lines · On Tue, 10 Dec 2019 13:13:22 +0100 Giulio Benetti…

Add patch to fix build failure on PowerPc without <sys/auxv.h>. The patch inserts #if statements to include or note <sys/auxv.h> prior it exists.

Fixes:
http://autobuild.buildroot.net/results/8bf95bd8a0aec8c53889308ab1e00d0a94f53d57/

When is this header file available/not available? Is it a glibc vs. musl vs. uClibc thing? Something else?

I'm not really a big fan of solutions that simply consist in "it wants this file, this file is not available, so let's make it ignore it", without a deeper investigation.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/1 package/libnss: fix build failure on powerpc without <sys/auxv.h>

Hi Thomas,

Quoted 9 lines · Thomas Petazzoni
Quoted 5 lines · On Tue, 10 Dec 2019 13:13:22 +0100 Giulio Benetti…

Add patch to fix build failure on PowerPc without <sys/auxv.h>. The patch inserts #if statements to include or note <sys/auxv.h> prior it exists.

Fixes:
http://autobuild.buildroot.net/results/8bf95bd8a0aec8c53889308ab1e00d0a94f53d57/

Quoted 6 lines

When is this header file available/not available? Is it a glibc vs. musl vs. uClibc thing? Something else?

I'm not really a big fan of solutions that simply consist in "it wants this file, this file is not available, so let's make it ignore it", without a deeper investigation.

Upstream already use this solution in the same file, i.e. arm/aarch64:
https://hg.mozilla.org/projects/nss/file/tip/lib/freebl/blinit.c#l100

and only if <sys/auxv.h> is present then they probe with getauxval() to check which HWCAP_ is present, otherwise they consider(i.e.) arm_neon_support not present, that is not true in any case. But at the time of this writing they seem to consider this enough, probably they will improve it later.

Best regards

Signature · 2 lines
Giulio Benetti
Benetti Engineering sas
Quoted 2 lines

Thomas

#4 lore raw

PATCH 1/1 package/libnss: fix build failure on powerpc without <sys/auxv.h>

Hello,

Quoted 4 lines · On Tue, 10 Dec 2019 14:23:02 +0100 Giulio Benetti…
Quoted 3 lines

I'm not really a big fan of solutions that simply consist in "it wants this file, this file is not available, so let's make it ignore it", without a deeper investigation.

Quoted 8 lines

Upstream already use this solution in the same file, i.e. arm/aarch64:
https://hg.mozilla.org/projects/nss/file/tip/lib/freebl/blinit.c#l100

and only if <sys/auxv.h> is present then they probe with getauxval() to check which HWCAP_ is present, otherwise they consider(i.e.) arm_neon_support not present, that is not true in any case. But at the time of this writing they seem to consider this enough, probably they will improve it later.

OK, if this is indeed used on other architectures, then I guess doing the same on PowerPC doesn't hurt. Thanks for the additional explanation!

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 1/1 package/libnss: fix build failure on powerpc without <sys/auxv.h>

In reply to Giulio Benetti
Quoted 11 lines · On Tue, 10 Dec 2019 13:13:22 +0100 Giulio Benetti…

Add patch to fix build failure on PowerPc without <sys/auxv.h>. The patch inserts #if statements to include or note <sys/auxv.h> prior it exists.

Fixes:
http://autobuild.buildroot.net/results/8bf95bd8a0aec8c53889308ab1e00d0a94f53d57/

---
 ...Fix-PowerPc-build-sys-auxv.h-failure.patch | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 package/libnss/0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com