Skip to contentSkip to conversation

package/libnss: fix compile failure

PATCH New Peter Seiderer 3 participants 7 messages Apr 3, 2020 – Apr 5, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libnss: fix compile failure

Add upstream patch to fix neon related compile failure (tested with rpi3 configuration).

Fixes:
http://autobuild.buildroot.net/results/ebfa6bfabfe98fddbc1590c4d5d8038f3eb8992c
http://autobuild.buildroot.net/results/7626a9f4d604b3657b88a4a6da4db3a8eb810059
http://autobuild.buildroot.net/results/2625066922fb83db42ad4ddbc26bdf0b3ef09cb1
http://autobuild.buildroot.net/results/c4b3a4a6d39773c2faa8595f64f1ce747971f5a0

.../host/bin/arm-linux-gnueabihf-gcc -o Linux2.6_arm_arm-linux-gnueabihf-gcc_glibc_PTH_DBG.OBJ/Linux_SINGLE_SHLIB/gcm-arm32-neon.o -c -std=c99 -g -fPIC -pipe -ffunction-sections -fdata-sections -DHAVE_STRERROR -DLINUX -Dlinux -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -Wall -Wshadow -DNSS_NO_GCC48 -DXP_UNIX -DSHLIB_SUFFIX=\"so\" -DSHLIB_PREFIX=\"lib\" -DSHLIB_VERSION=\"3\" -DSOFTOKEN_SHLIB_VERSION=\"3\" -DRIJNDAEL_INCLUDE_TABLES -DDEBUG -UNDEBUG -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_REENTRANT -DNSS_NO_INIT_SUPPORT -DNSS_DISABLE_ALTIVEC -DUSE_UTIL_DIRECTLY -DNO_NSPR_10_SUPPORT -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES -DFREEBL_NO_DEPEND -DFREEBL_LOWHASH -DUSE_HW_AES -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE -DMP_USE_UINT_DIGIT -DSHA_NO_LONG_LONG -DKRML_VERIFIED_UINT128 -DMP_API_COMPATIBLE -I.../host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/nspr -I.../build/libnss-3.51/dist/include -I../../../dist/public/nss -I../../../dist/private/nss -Impi -Iecl -Iverified -Iverified/kremlin/include -Iverified/kremlin/kremlib/dist/minimal -march=armv7 -mfpu=neon gcm-arm32-neon.c
cc1: error: target CPU does not support ARM mode

---
 ...t-force-ARMv7-for-gcm-arm32-neon-r-j.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/libnss/0002-Bug-1624864-Don-t-force-ARMv7-for-gcm-arm32-neon-r-j.patch
package/libnss/0002-Bug-1624864-Don-t-force-ARMv7-for-gcm-arm32-neon-r-j.patch new file +30 -0
new file mode 100644
index 0000000000..64cc18c8c3
@@ -0,0 +1,30 @@
+From 63d548663871e0157a4513a661b4a721002192e6 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 1 Apr 2020 09:41:08 -0700
+Subject: [PATCH] Bug 1624864 - Don't force ARMv7 for gcm-arm32-neon r=jcj
+
+--HG--
+extra : rebase_source : e046bbe45276b8cdf686c4f61006aff08865f1c0
+
+[Upstream: https://github.com/nss-dev/nss/commit/ab8d2425728f37b1f21dbff712daf4a767c82149]
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ nss/lib/freebl/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
+index 2802fdf..eedebd3 100644
+--- a/nss/lib/freebl/Makefile
++++ b/nss/lib/freebl/Makefile
+@@ -773,7 +773,7 @@ ifeq ($(CPU_ARCH),arm)
+ USES_SOFTFLOAT_ABI := $(shell $(CC) -o - -E -dM - $(CFLAGS) < /dev/null | grep __SOFTFP__ > /dev/null && echo 1)
+ $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+ ifndef NSS_DISABLE_GCM_ARM32_NEON
+-$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -march=armv7 -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
++$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+ endif
+ endif
+ ifeq ($(CPU_ARCH),aarch64)
+-- 
+2.26.0
+
Signature · 1 line
2.26.0
#1 lore raw

PATCH 1/1 package/libnss: fix compile failure

Hi Peter,

I've already sent a patch for this but I need to re-word and re-send it:
https://patchwork.ozlabs.org/patch/1261416/

Best regards

Signature · 2 lines
Giulio Benetti
Benetti Engineering sas
Quoted 56 lines · Peter Seiderer

Add upstream patch to fix neon related compile failure (tested with rpi3 configuration).

Fixes:

   http://autobuild.buildroot.net/results/ebfa6bfabfe98fddbc1590c4d5d8038f3eb8992c
   http://autobuild.buildroot.net/results/7626a9f4d604b3657b88a4a6da4db3a8eb810059
   http://autobuild.buildroot.net/results/2625066922fb83db42ad4ddbc26bdf0b3ef09cb1
   http://autobuild.buildroot.net/results/c4b3a4a6d39773c2faa8595f64f1ce747971f5a0

   .../host/bin/arm-linux-gnueabihf-gcc -o Linux2.6_arm_arm-linux-gnueabihf-gcc_glibc_PTH_DBG.OBJ/Linux_SINGLE_SHLIB/gcm-arm32-neon.o -c -std=c99 -g -fPIC   -pipe -ffunction-sections -fdata-sections -DHAVE_STRERROR -DLINUX -Dlinux -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os   -Wall -Wshadow -DNSS_NO_GCC48 -DXP_UNIX -DSHLIB_SUFFIX=\"so\" -DSHLIB_PREFIX=\"lib\" -DSHLIB_VERSION=\"3\" -DSOFTOKEN_SHLIB_VERSION=\"3\" -DRIJNDAEL_INCLUDE_TABLES -DDEBUG -UNDEBUG -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_REENTRANT -DNSS_NO_INIT_SUPPORT -DNSS_DISABLE_ALTIVEC -DUSE_UTIL_DIRECTLY -DNO_NSPR_10_SUPPORT -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES -DFREEBL_NO_DEPEND -DFREEBL_LOWHASH -DUSE_HW_AES -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE  -DMP_USE_UINT_DIGIT -DSHA_NO_LONG_LONG  -DKRML_VERIFIED_UINT128 -DMP_API_COMPATIBLE -I.../host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/nspr -I.../build/libnss-3.51/dist/include -I../../../dist/public/nss -I../../.

./dist/private/nss -Impi -Iecl -Iverified -Iverified/kremlin/include -Iverified/kremlin/kremlib/dist/minimal -march=armv7 -mfpu=neon gcm-arm32-neon.c
cc1: error: target CPU does not support ARM mode

---
  ...t-force-ARMv7-for-gcm-arm32-neon-r-j.patch | 30 +++++++++++++++++++
  1 file changed, 30 insertions(+)

create mode 100644 package/libnss/0002-Bug-1624864-Don-t-force-ARMv7-for-gcm-arm32-neon-r-j.patch

package/libnss/0002-Bug-1624864-Don-t-force-ARMv7-for-gcm-arm32-neon-r-j.patch new file +30 -0
new file mode 100644
index 0000000000..64cc18c8c3
@@ -0,0 +1,30 @@
+From 63d548663871e0157a4513a661b4a721002192e6 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 1 Apr 2020 09:41:08 -0700
+Subject: [PATCH] Bug 1624864 - Don't force ARMv7 for gcm-arm32-neon r=jcj
+
+--HG--
+extra : rebase_source : e046bbe45276b8cdf686c4f61006aff08865f1c0
+
+[Upstream: https://github.com/nss-dev/nss/commit/ab8d2425728f37b1f21dbff712daf4a767c82149]
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ nss/lib/freebl/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
+index 2802fdf..eedebd3 100644
+--- a/nss/lib/freebl/Makefile
++++ b/nss/lib/freebl/Makefile
+@@ -773,7 +773,7 @@ ifeq ($(CPU_ARCH),arm)
+ USES_SOFTFLOAT_ABI := $(shell $(CC) -o - -E -dM - $(CFLAGS) < /dev/null | grep __SOFTFP__ > /dev/null && echo 1)
+ $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+ ifndef NSS_DISABLE_GCM_ARM32_NEON
+-$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -march=armv7 -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
++$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+ endif
+ endif
+ ifeq ($(CPU_ARCH),aarch64)
+--
+2.26.0
+
#2 lore raw

PATCH v2 1/1 package/libnss: fix build failure on arm32 arch not armv7

NSS assumes that every neon arm32 build is an armv7, but this is not always true(i.e. build arm32 for armv8), so let's add a patch to remove -march=armv7 flag when building gcm-arm32-neon.c

Fixes:
http://autobuild.buildroot.net/results/464/464044fda2850123339de6c8071374e380636ee0/

---
V1->V2:
* update with upstreamed patch:
https://bugzilla.mozilla.org/show_bug.cgi?id=1624864
* improve commit log

---
 ...t-force-ARMv7-for-gcm-arm32-neon-r-j.patch | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/libnss/0002-Bug-1624864-Don-t-force-ARMv7-for-gcm-arm32-neon-r-j.patch
package/libnss/0002-Bug-1624864-Don-t-force-ARMv7-for-gcm-arm32-neon-r-j.patch new file +29 -0
new file mode 100644
index 0000000000..eae1ed974c
@@ -0,0 +1,29 @@
+From ab8d2425728f37b1f21dbff712daf4a767c82149 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 1 Apr 2020 09:41:08 -0700
+Subject: [PATCH] Bug 1624864 - Don't force ARMv7 for gcm-arm32-neon r=jcj
+
+--HG--
+extra : rebase_source : e046bbe45276b8cdf686c4f61006aff08865f1c0
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/lib/freebl/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
+index a03c0d108..898a0b9e0 100644
+--- a/nss/lib/freebl/Makefile
++++ b/nss/lib/freebl/Makefile
+@@ -781,7 +781,7 @@ ifeq ($(CPU_ARCH),arm)
+ USES_SOFTFLOAT_ABI := $(shell $(CC) -o - -E -dM - $(CFLAGS) < /dev/null | grep __SOFTFP__ > /dev/null && echo 1)
+ $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+ ifndef NSS_DISABLE_ARM32_NEON
+-$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -march=armv7 -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
++$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+ endif
+ endif
+ ifeq ($(CPU_ARCH),aarch64)
+-- 
+2.20.1
+
Signature · 1 line
2.20.1
#3 lore raw

PATCH v2 1/1 package/libnss: fix build failure on arm32 arch not armv7

Hello Giulio,

Quoted 4 lines · Giulio Benetti

NSS assumes that every neon arm32 build is an armv7, but this is not always true(i.e. build arm32 for armv8), so let's add a patch to remove -march=armv7 flag when building gcm-arm32-neon.c

Quoted 8 lines

Fixes:
http://autobuild.buildroot.net/results/464/464044fda2850123339de6c8071374e380636ee0/

---
V1->V2:
* update with upstreamed patch:
https://bugzilla.mozilla.org/show_bug.cgi?id=1624864

This two lines are worth mentioning in the commit message...

Quoted 12 lines

* improve commit log

---
 ...t-force-ARMv7-for-gcm-arm32-neon-r-j.patch | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/libnss/0002-Bug-1624864-Don-t-force-ARMv7-for-gcm-arm32-neon-r-j.patch
package/libnss/0002-Bug-1624864-Don-t-force-ARMv7-for-gcm-arm32-neon-r-j.patch new file +0 -0
new file mode 100644
index 0000000000..eae1ed974c

package/libnss/0002-Bug-1624864-Don-t-force-ARMv7-for-gcm-arm32-neon-r-j.patch line 8

Quoted 8 lines
package/libnss/0002-Bug-1624864-Don-t-force-ARMv7-for-gcm-arm32-neon-r-j.patch new file +8 -0
@@ -0,0 +1,29 @@
+From ab8d2425728f37b1f21dbff712daf4a767c82149 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Wed, 1 Apr 2020 09:41:08 -0700
+Subject: [PATCH] Bug 1624864 - Don't force ARMv7 for gcm-arm32-neon r=jcj
+
+--HG--
+extra : rebase_source : e046bbe45276b8cdf686c4f61006aff08865f1c0
+

Please add the upstream source link here, e.g. (or and/or the bug report link):

[Upstream: https://hg.mozilla.org/projects/nss/rev/8582092359720d052288cad2dc13f37aad783dc3]

With the two changes you can add my

Regards,
Peter

Quoted 21 lines
package/libnss/0002-Bug-1624864-Don-t-force-ARMv7-for-gcm-arm32-neon-r-j.patch new file +21 -0
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ nss/lib/freebl/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
+index a03c0d108..898a0b9e0 100644
+--- a/nss/lib/freebl/Makefile
++++ b/nss/lib/freebl/Makefile
+@@ -781,7 +781,7 @@ ifeq ($(CPU_ARCH),arm)
+ USES_SOFTFLOAT_ABI := $(shell $(CC) -o - -E -dM - $(CFLAGS) < /dev/null | grep __SOFTFP__ > /dev/null && echo 1)
+ $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+ ifndef NSS_DISABLE_ARM32_NEON
+-$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -march=armv7 -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
++$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+ endif
+ endif
+ ifeq ($(CPU_ARCH),aarch64)
+--
+2.20.1
+
#4 lore raw

PATCH v2 1/1 package/libnss: fix build failure on arm32 arch not armv7

In reply to Giulio Benetti
Quoted 13 lines · On Fri, 3 Apr 2020 22:10:21 +0200 Giulio Benetti…

NSS assumes that every neon arm32 build is an armv7, but this is not always true(i.e. build arm32 for armv8), so let's add a patch to remove -march=armv7 flag when building gcm-arm32-neon.c

Fixes:
http://autobuild.buildroot.net/results/464/464044fda2850123339de6c8071374e380636ee0/

---
V1->V2:
* update with upstreamed patch:
https://bugzilla.mozilla.org/show_bug.cgi?id=1624864
* improve commit log

Quoted 4 lines
---
 ...t-force-ARMv7-for-gcm-arm32-neon-r-j.patch | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/libnss/0002-Bug-1624864-Don-t-force-ARMv7-for-gcm-arm32-neon-r-j.patch

Applied to master with an updated reference to the upstream patch, as suggested by Peter Seiderer.

Thanks!

Thomas

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

PATCH v2 1/1 package/libnss: fix build failure on arm32 arch not armv7

Quoted 21 lines · Thomas Petazzoni
Quoted 13 lines · On Fri, 3 Apr 2020 22:10:21 +0200 Giulio Benetti…

NSS assumes that every neon arm32 build is an armv7, but this is not always true(i.e. build arm32 for armv8), so let's add a patch to remove -march=armv7 flag when building gcm-arm32-neon.c

Fixes:
http://autobuild.buildroot.net/results/464/464044fda2850123339de6c8071374e380636ee0/

---
V1->V2:
* update with upstreamed patch:
https://bugzilla.mozilla.org/show_bug.cgi?id=1624864
* improve commit log

Quoted 4 lines
---
  ...t-force-ARMv7-for-gcm-arm32-neon-r-j.patch | 29 +++++++++++++++++++
  1 file changed, 29 insertions(+)

create mode 100644 package/libnss/0002-Bug-1624864-Don-t-force-ARMv7-for-gcm-arm32-neon-r-j.patch

Quoted 2 lines

Applied to master with an updated reference to the upstream patch, as suggested by Peter Seiderer.

Thank you Thomas, unfortunately I didn't check very well and this makes build to fail because 0002 can't be applied over patch 0001. So for this I've sent another patch:
https://patchwork.ozlabs.org/patch/1266591/

Sorry for the noise

Best regards

Signature · 2 lines
Giulio Benetti
Benetti Engineering sas