diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-11-01 17:00:38 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-11-01 17:00:38 +0100 |
| commit | da73e1bac4d761b80d1b3b65dd4d661a6976ab52 (patch) | |
| tree | f43caf78e8fbf9408c44a0f8bff8bbecb31fdba9 | |
| parent | f2c80f823e1c7474860e659f2a543f4bb6179b81 (diff) | |
| download | ptxdist-da73e1bac4d761b80d1b3b65dd4d661a6976ab52.tar.gz ptxdist-da73e1bac4d761b80d1b3b65dd4d661a6976ab52.tar.xz | |
nss: fix building on ARMv5
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/nss-3.47/0004-allow-building-without-NEON.patch | 32 | ||||
| -rw-r--r-- | patches/nss-3.47/series | 3 | ||||
| -rw-r--r-- | rules/nss.make | 3 |
3 files changed, 36 insertions, 2 deletions
diff --git a/patches/nss-3.47/0004-allow-building-without-NEON.patch b/patches/nss-3.47/0004-allow-building-without-NEON.patch new file mode 100644 index 000000000..0feb596bb --- /dev/null +++ b/patches/nss-3.47/0004-allow-building-without-NEON.patch @@ -0,0 +1,32 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Fri, 1 Nov 2019 16:58:55 +0100 +Subject: [PATCH] allow building without NEON + +The build-system currently assumes that NEON code can always be built on +ARM. Make it possible to disable this via the 'make' command-line. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + nss/lib/freebl/Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index 5943fb377894..1401f8154fcc 100644 +--- a/nss/lib/freebl/Makefile ++++ b/nss/lib/freebl/Makefile +@@ -124,6 +124,7 @@ ifeq ($(CPU_ARCH),aarch64) + EXTRA_SRCS += aes-armv8.c gcm-aarch64.c + endif + ifeq ($(CPU_ARCH),arm) ++ ifndef NO_NEON + ifdef CC_IS_CLANG + DEFINES += -DUSE_HW_AES + EXTRA_SRCS += aes-armv8.c +@@ -138,6 +139,7 @@ ifeq ($(CPU_ARCH),arm) + EXTRA_SRCS += aes-armv8.c + endif + endif ++ endif + endif + + ifeq ($(OS_TARGET),OSF1) diff --git a/patches/nss-3.47/series b/patches/nss-3.47/series index f7f38f3be..81523e277 100644 --- a/patches/nss-3.47/series +++ b/patches/nss-3.47/series @@ -3,4 +3,5 @@ 0001-nss-fix-nsinstall-build.patch 0002-add-nss.pc.in.patch 0003-HACK-don-t-build-the-commands.patch -# 5a106339b1aacb64732e0a72df6e0416 - git-ptx-patches magic +0004-allow-building-without-NEON.patch +# 519407b92c5bc296cbc80edaabf6253f - git-ptx-patches magic diff --git a/rules/nss.make b/rules/nss.make index 373a9c01a..0e52ab91e 100644 --- a/rules/nss.make +++ b/rules/nss.make @@ -55,7 +55,8 @@ NSS_MAKE_PAR := NO NSS_MAKE_OPT := \ OS_ARCH=Linux \ OS_RELEASE=$(PTXCONF_KERNEL_VERSION) \ - OS_TEST=$(NSS_ARCH) + OS_TEST=$(NSS_ARCH) \ + NO_NEON=$(call ptx/ifdef, PTXCONF_ARCH_ARM_NEON,,1) # ---------------------------------------------------------------------------- # Install |