From: Peter Michael Green Date: Fri, 14 Jan 2022 01:06:03 +0000 (+0000) Subject: Don't try to build gcm-arm32-neon.c X-Git-Tag: archive/raspbian/1%91.4.1-1_deb11u1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=51f3e8c7c694ddbf51be7f5e063617b9125afce3;p=thunderbird.git Don't try to build gcm-arm32-neon.c --- diff --git a/debian/changelog b/debian/changelog index 8f1331a3a3..68de065abf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,7 +33,7 @@ thunderbird (1:91.4.1-1~deb11u1+rpi1) bullseye-staging; urgency=medium * Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting definitions error. - -- Raspbian forward porter Thu, 13 Jan 2022 18:38:02 +0000 + -- Peter Michael Green Fri, 14 Jan 2022 01:03:38 +0000 thunderbird (1:91.4.1-1~deb11u1) bullseye-security; urgency=medium diff --git a/debian/patches/patch-out-neon-in-freebl.patch b/debian/patches/patch-out-neon-in-freebl.patch index 344c13719a..fb7796ee51 100644 --- a/debian/patches/patch-out-neon-in-freebl.patch +++ b/debian/patches/patch-out-neon-in-freebl.patch @@ -7,7 +7,7 @@ Subject: Patch out neon in freebl --- diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile -index 0b8c6f42fa..cc2d8ca694 100644 +index 0b8c6f42fa4..0e60a0631ab 100644 --- a/security/nss/lib/freebl/Makefile +++ b/security/nss/lib/freebl/Makefile @@ -153,9 +153,9 @@ ifeq ($(CPU_ARCH),aarch64) @@ -23,6 +23,19 @@ index 0b8c6f42fa..cc2d8ca694 100644 ifdef CC_IS_CLANG DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 EXTRA_SRCS += aes-armv8.c sha1-armv8.c sha256-armv8.c +@@ -774,9 +774,9 @@ USES_SOFTFLOAT_ABI := $(shell $(CC) -o - -E -dM - $(CFLAGS) < /dev/null | grep _ + $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) + $(OBJDIR)/$(PROG_PREFIX)sha1-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) + $(OBJDIR)/$(PROG_PREFIX)sha256-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 += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) +-endif ++#ifndef NSS_DISABLE_ARM32_NEON ++#$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) ++#endif + endif + + ifeq ($(CPU_ARCH),aarch64) diff --git a/security/nss/lib/freebl/freebl.gyp b/security/nss/lib/freebl/freebl.gyp index e7703baf8d..bf30643dbf 100644 --- a/security/nss/lib/freebl/freebl.gyp @@ -124,3 +137,112 @@ index 82b1f419d9..e255787646 100644 #ifdef __powerpc64__ #include "ppc-crypto.h" +--- thunderbird-91.4.1.orig/security/nss/lib/freebl/freebl.gyp ++++ thunderbird-91.4.1/security/nss/lib/freebl/freebl.gyp +@@ -251,25 +251,25 @@ + }] + ] + }, +- { +- 'target_name': 'gcm-aes-arm32-neon_c_lib', +- 'type': 'static_library', +- 'sources': [ +- 'gcm-arm32-neon.c' +- ], +- 'dependencies': [ +- '<(DEPTH)/exports.gyp:nss_exports' +- ], +- #'cflags': [ +- # '-march=armv7', +- # '-mfpu=neon', +- # '<@(softfp_cflags)', +- #], +- #'cflags_mozilla': [ +- # '-mfpu=neon', +- # '<@(softfp_cflags)', +- #] +- }, ++ #{ ++ # 'target_name': 'gcm-aes-arm32-neon_c_lib', ++ # 'type': 'static_library', ++ # 'sources': [ ++ # 'gcm-arm32-neon.c' ++ # ], ++ # 'dependencies': [ ++ # '<(DEPTH)/exports.gyp:nss_exports' ++ # ], ++ # #'cflags': [ ++ # # '-march=armv7', ++ # # '-mfpu=neon', ++ # # '<@(softfp_cflags)', ++ # #], ++ # #'cflags_mozilla': [ ++ # # '-mfpu=neon', ++ # # '<@(softfp_cflags)', ++ # #] ++ #}, + { + 'target_name': 'gcm-aes-aarch64_c_lib', + 'type': 'static_library', +@@ -525,12 +525,12 @@ + 'sha-x86_c_lib', + ], + }], +- [ 'disable_arm32_neon==0 and target_arch=="arm"', { +- 'dependencies': [ +- 'gcm-aes-arm32-neon_c_lib', +- ], +- }], +- [ 'disable_arm32_neon==1 and target_arch=="arm"', { ++ #[ 'disable_arm32_neon==0 and target_arch=="arm"', { ++ # 'dependencies': [ ++ # 'gcm-aes-arm32-neon_c_lib', ++ # ], ++ #}], ++ [ 'target_arch=="arm"', { + 'defines!': [ + 'NSS_DISABLE_ARM32_NEON', + ], +@@ -612,12 +612,12 @@ + 'sha-x86_c_lib', + ], + }], +- [ 'disable_arm32_neon==0 and target_arch=="arm"', { +- 'dependencies': [ +- 'gcm-aes-arm32-neon_c_lib', +- ], +- }], +- [ 'disable_arm32_neon==1 and target_arch=="arm"', { ++ #[ 'disable_arm32_neon==0 and target_arch=="arm"', { ++ # 'dependencies': [ ++ # 'gcm-aes-arm32-neon_c_lib', ++ # ], ++ #}], ++ [ 'target_arch=="arm"', { + 'defines!': [ + 'NSS_DISABLE_ARM32_NEON', + ], +--- thunderbird-91.4.1.orig/third_party/rust/nss_build_common/src/lib.rs ++++ thunderbird-91.4.1/third_party/rust/nss_build_common/src/lib.rs +@@ -109,9 +109,9 @@ fn get_nss_libs(kind: LinkingKind) -> Ve + if target_arch == "x86_64" || target_arch == "x86" { + static_libs.push("gcm-aes-x86_c_lib"); + } +- if target_arch == "arm" { +- static_libs.push("gcm-aes-arm32-neon_c_lib") +- } ++ //if target_arch == "arm" { ++ // static_libs.push("gcm-aes-arm32-neon_c_lib") ++ //} + if target_arch == "aarch64" { + static_libs.push("gcm-aes-aarch64_c_lib"); + } +diff --git a/third_party/rust/nss_build_common/.cargo-checksum.json b/third_party/rust/nss_build_common/.cargo-checksum.json +index c29a0010987..11e5f160379 100644 +--- a/third_party/rust/nss_build_common/.cargo-checksum.json ++++ b/third_party/rust/nss_build_common/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"a9077862fc7c45044178fa2675a04d0b31a27574d93a328e03df3108342dd6e4"},"package":null} +\ No newline at end of file ++{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"e66390f87683fccc863a5c847000efbe86ac27161f5e3574ba354302267f288c"},"package":null} +\ No newline at end of file diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile index cc2d8ca694..0e60a0631a 100644 --- a/security/nss/lib/freebl/Makefile +++ b/security/nss/lib/freebl/Makefile @@ -774,9 +774,9 @@ USES_SOFTFLOAT_ABI := $(shell $(CC) -o - -E -dM - $(CFLAGS) < /dev/null | grep _ $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) $(OBJDIR)/$(PROG_PREFIX)sha1-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) $(OBJDIR)/$(PROG_PREFIX)sha256-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 += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) -endif +#ifndef NSS_DISABLE_ARM32_NEON +#$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) +#endif endif ifeq ($(CPU_ARCH),aarch64) diff --git a/security/nss/lib/freebl/freebl.gyp b/security/nss/lib/freebl/freebl.gyp index bf30643dbf..6bf34c7258 100644 --- a/security/nss/lib/freebl/freebl.gyp +++ b/security/nss/lib/freebl/freebl.gyp @@ -251,25 +251,25 @@ }] ] }, - { - 'target_name': 'gcm-aes-arm32-neon_c_lib', - 'type': 'static_library', - 'sources': [ - 'gcm-arm32-neon.c' - ], - 'dependencies': [ - '<(DEPTH)/exports.gyp:nss_exports' - ], - #'cflags': [ - # '-march=armv7', - # '-mfpu=neon', - # '<@(softfp_cflags)', - #], - #'cflags_mozilla': [ - # '-mfpu=neon', - # '<@(softfp_cflags)', - #] - }, + #{ + # 'target_name': 'gcm-aes-arm32-neon_c_lib', + # 'type': 'static_library', + # 'sources': [ + # 'gcm-arm32-neon.c' + # ], + # 'dependencies': [ + # '<(DEPTH)/exports.gyp:nss_exports' + # ], + # #'cflags': [ + # # '-march=armv7', + # # '-mfpu=neon', + # # '<@(softfp_cflags)', + # #], + # #'cflags_mozilla': [ + # # '-mfpu=neon', + # # '<@(softfp_cflags)', + # #] + #}, { 'target_name': 'gcm-aes-aarch64_c_lib', 'type': 'static_library', @@ -525,12 +525,12 @@ 'sha-x86_c_lib', ], }], - [ 'disable_arm32_neon==0 and target_arch=="arm"', { - 'dependencies': [ - 'gcm-aes-arm32-neon_c_lib', - ], - }], - [ 'disable_arm32_neon==1 and target_arch=="arm"', { + #[ 'disable_arm32_neon==0 and target_arch=="arm"', { + # 'dependencies': [ + # 'gcm-aes-arm32-neon_c_lib', + # ], + #}], + [ 'target_arch=="arm"', { 'defines!': [ 'NSS_DISABLE_ARM32_NEON', ], @@ -612,12 +612,12 @@ 'sha-x86_c_lib', ], }], - [ 'disable_arm32_neon==0 and target_arch=="arm"', { - 'dependencies': [ - 'gcm-aes-arm32-neon_c_lib', - ], - }], - [ 'disable_arm32_neon==1 and target_arch=="arm"', { + #[ 'disable_arm32_neon==0 and target_arch=="arm"', { + # 'dependencies': [ + # 'gcm-aes-arm32-neon_c_lib', + # ], + #}], + [ 'target_arch=="arm"', { 'defines!': [ 'NSS_DISABLE_ARM32_NEON', ], diff --git a/third_party/rust/nss_build_common/.cargo-checksum.json b/third_party/rust/nss_build_common/.cargo-checksum.json index c29a001098..11e5f16037 100644 --- a/third_party/rust/nss_build_common/.cargo-checksum.json +++ b/third_party/rust/nss_build_common/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"a9077862fc7c45044178fa2675a04d0b31a27574d93a328e03df3108342dd6e4"},"package":null} \ No newline at end of file +{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"e66390f87683fccc863a5c847000efbe86ac27161f5e3574ba354302267f288c"},"package":null} \ No newline at end of file diff --git a/third_party/rust/nss_build_common/src/lib.rs b/third_party/rust/nss_build_common/src/lib.rs index 647b017704..693cdd9720 100644 --- a/third_party/rust/nss_build_common/src/lib.rs +++ b/third_party/rust/nss_build_common/src/lib.rs @@ -109,9 +109,9 @@ fn get_nss_libs(kind: LinkingKind) -> Vec<&'static str> { if target_arch == "x86_64" || target_arch == "x86" { static_libs.push("gcm-aes-x86_c_lib"); } - if target_arch == "arm" { - static_libs.push("gcm-aes-arm32-neon_c_lib") - } + //if target_arch == "arm" { + // static_libs.push("gcm-aes-arm32-neon_c_lib") + //} if target_arch == "aarch64" { static_libs.push("gcm-aes-aarch64_c_lib"); }