From 4ec538e3c88a0be45c0878849618701aee02edec Mon Sep 17 00:00:00 2001 From: Jason Goertzen Date: Thu, 20 Jan 2022 09:27:46 -0600 Subject: [PATCH] Fixed build issue on arm based macs when using gcc11 (#1177) * Fixed a build issue when trying to use gcc11 on an arm based mac. Also updated kem templates so that any pqclean scheme that has a similar problem in the future can be fixed by just patching the assembly files * adding M1 CI for gcc-11 Co-authored-by: Michael <57787676+baentsch@users.noreply.github.com> --- .dsci.yml | 5 +- .../copy_from_upstream/copy_from_upstream.yml | 2 +- ...qclean-saber-kyber-arm-macos-gcc-fix.patch | 795 ++++++++++++++++++ .../src/kem/family/CMakeLists.txt | 5 + src/kem/classic_mceliece/CMakeLists.txt | 60 ++ src/kem/hqc/CMakeLists.txt | 18 + src/kem/kyber/CMakeLists.txt | 9 + .../pqclean_kyber1024_aarch64/__asm_NTT.S | 4 +- .../__asm_base_mul.S | 6 +- .../pqclean_kyber1024_aarch64/__asm_iNTT.S | 4 +- .../pqclean_kyber1024_aarch64/__asm_poly.S | 6 +- .../pqclean_kyber512_aarch64/__asm_NTT.S | 4 +- .../pqclean_kyber512_aarch64/__asm_base_mul.S | 6 +- .../pqclean_kyber512_aarch64/__asm_iNTT.S | 4 +- .../pqclean_kyber512_aarch64/__asm_poly.S | 6 +- .../pqclean_kyber768_aarch64/__asm_NTT.S | 4 +- .../pqclean_kyber768_aarch64/__asm_base_mul.S | 6 +- .../pqclean_kyber768_aarch64/__asm_iNTT.S | 4 +- .../pqclean_kyber768_aarch64/__asm_poly.S | 6 +- src/kem/ntru/CMakeLists.txt | 30 + src/kem/ntruprime/CMakeLists.txt | 48 ++ src/kem/saber/CMakeLists.txt | 27 + .../pqclean_firesaber_aarch64/__asm_NTT.S | 4 +- .../pqclean_firesaber_aarch64/__asm_iNTT.S | 4 +- .../pqclean_firesaber_aarch64/__asm_mul.S | 4 +- .../pqclean_firesaber_aarch64/__asm_narrow.S | 6 +- .../__asm_pack_unpack.S | 10 +- .../pqclean_lightsaber_aarch64/__asm_NTT.S | 4 +- .../pqclean_lightsaber_aarch64/__asm_iNTT.S | 4 +- .../pqclean_lightsaber_aarch64/__asm_mul.S | 4 +- .../pqclean_lightsaber_aarch64/__asm_narrow.S | 6 +- .../__asm_pack_unpack.S | 10 +- .../saber/pqclean_saber_aarch64/__asm_NTT.S | 4 +- .../saber/pqclean_saber_aarch64/__asm_iNTT.S | 4 +- .../saber/pqclean_saber_aarch64/__asm_mul.S | 4 +- .../pqclean_saber_aarch64/__asm_narrow.S | 6 +- .../pqclean_saber_aarch64/__asm_pack_unpack.S | 10 +- 37 files changed, 1069 insertions(+), 74 deletions(-) create mode 100644 scripts/copy_from_upstream/patches/pqclean-saber-kyber-arm-macos-gcc-fix.patch diff --git a/.dsci.yml b/.dsci.yml index 654808c37..3bbba9bed 100644 --- a/.dsci.yml +++ b/.dsci.yml @@ -3,5 +3,8 @@ jobs: env: PYTEST_ARGS: tests/test_code_conventions.py tests/test_kat.py cmds: - - uname -a && mkdir build && cd build && cmake -GNinja .. && ninja && cd .. && python3 -m pytest --verbose $PYTEST_ARGS + - uname -a && mkdir build && cd build && cmake -GNinja .. && ninja && cd .. && python3 -m pytest --numprocesses=auto --verbose $PYTEST_ARGS ; rm -rf build + - name: Building and testing using gcc-11 on M1 + cmds: + - uname -a && mkdir build && cd build && cmake -DCMAKE_C_COMPILER=gcc-11 -GNinja .. && ninja && ninja run_tests ; cd .. && rm -rf build diff --git a/scripts/copy_from_upstream/copy_from_upstream.yml b/scripts/copy_from_upstream/copy_from_upstream.yml index 5bffac652..839e28fb7 100644 --- a/scripts/copy_from_upstream/copy_from_upstream.yml +++ b/scripts/copy_from_upstream/copy_from_upstream.yml @@ -8,7 +8,7 @@ upstreams: sig_meta_path: 'crypto_sign/{pqclean_scheme}/META.yml' kem_scheme_path: 'crypto_kem/{pqclean_scheme}' sig_scheme_path: 'crypto_sign/{pqclean_scheme}' - patches: ['pqclean-sphincs.patch', 'pqclean-kyber-armneon-shake.patch', 'pqclean-saber-armneon-shake.patch'] + patches: [pqclean-sphincs.patch, pqclean-kyber-armneon-shake.patch, pqclean-saber-armneon-shake.patch, pqclean-saber-kyber-arm-macos-gcc-fix.patch] - name: pqcrystals-kyber git_url: https://github.com/pq-crystals/kyber.git diff --git a/scripts/copy_from_upstream/patches/pqclean-saber-kyber-arm-macos-gcc-fix.patch b/scripts/copy_from_upstream/patches/pqclean-saber-kyber-arm-macos-gcc-fix.patch new file mode 100644 index 000000000..a7e178e7f --- /dev/null +++ b/scripts/copy_from_upstream/patches/pqclean-saber-kyber-arm-macos-gcc-fix.patch @@ -0,0 +1,795 @@ +From 1e7a0fd4af867a0a55a8ce931165a179a13abf6c Mon Sep 17 00:00:00 2001 +From: Jason Goertzen +Date: Tue, 18 Jan 2022 13:50:04 -0500 +Subject: [PATCH] Patch for saber and kyber familes to fix a build issue on arm + based macs using gcc11 + +--- + crypto_kem/firesaber/aarch64/__asm_NTT.S | 4 ++-- + crypto_kem/firesaber/aarch64/__asm_iNTT.S | 4 ++-- + crypto_kem/firesaber/aarch64/__asm_mul.S | 4 ++-- + crypto_kem/firesaber/aarch64/__asm_narrow.S | 6 +++--- + crypto_kem/firesaber/aarch64/__asm_pack_unpack.S | 10 +++++----- + crypto_kem/kyber1024/aarch64/__asm_NTT.S | 4 ++-- + crypto_kem/kyber1024/aarch64/__asm_base_mul.S | 6 +++--- + crypto_kem/kyber1024/aarch64/__asm_iNTT.S | 4 ++-- + crypto_kem/kyber1024/aarch64/__asm_poly.S | 6 +++--- + crypto_kem/kyber512/aarch64/__asm_NTT.S | 4 ++-- + crypto_kem/kyber512/aarch64/__asm_base_mul.S | 6 +++--- + crypto_kem/kyber512/aarch64/__asm_iNTT.S | 4 ++-- + crypto_kem/kyber512/aarch64/__asm_poly.S | 6 +++--- + crypto_kem/kyber768/aarch64/__asm_NTT.S | 4 ++-- + crypto_kem/kyber768/aarch64/__asm_base_mul.S | 6 +++--- + crypto_kem/kyber768/aarch64/__asm_iNTT.S | 4 ++-- + crypto_kem/kyber768/aarch64/__asm_poly.S | 6 +++--- + crypto_kem/lightsaber/aarch64/__asm_NTT.S | 4 ++-- + crypto_kem/lightsaber/aarch64/__asm_iNTT.S | 4 ++-- + crypto_kem/lightsaber/aarch64/__asm_mul.S | 4 ++-- + crypto_kem/lightsaber/aarch64/__asm_narrow.S | 6 +++--- + crypto_kem/lightsaber/aarch64/__asm_pack_unpack.S | 10 +++++----- + crypto_kem/saber/aarch64/__asm_NTT.S | 4 ++-- + crypto_kem/saber/aarch64/__asm_iNTT.S | 4 ++-- + crypto_kem/saber/aarch64/__asm_mul.S | 4 ++-- + crypto_kem/saber/aarch64/__asm_narrow.S | 6 +++--- + crypto_kem/saber/aarch64/__asm_pack_unpack.S | 10 +++++----- + 27 files changed, 72 insertions(+), 72 deletions(-) + +diff --git a/crypto_kem/firesaber/aarch64/__asm_NTT.S b/crypto_kem/firesaber/aarch64/__asm_NTT.S +index d39cfa1..ef83595 100644 +--- a/crypto_kem/firesaber/aarch64/__asm_NTT.S ++++ b/crypto_kem/firesaber/aarch64/__asm_NTT.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_top + .global _PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_top +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_top, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_top: +@@ -181,7 +181,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_top: + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_bot + .global _PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_bot +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_bot, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_bot: +diff --git a/crypto_kem/firesaber/aarch64/__asm_iNTT.S b/crypto_kem/firesaber/aarch64/__asm_iNTT.S +index 0b38928..6b022c2 100644 +--- a/crypto_kem/firesaber/aarch64/__asm_iNTT.S ++++ b/crypto_kem/firesaber/aarch64/__asm_iNTT.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_top + .global _PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_top +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_top, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_top: +@@ -150,7 +150,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_top: + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_bot + .global _PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_bot +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_bot, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_bot: +diff --git a/crypto_kem/firesaber/aarch64/__asm_mul.S b/crypto_kem/firesaber/aarch64/__asm_mul.S +index e30a3f6..0b11379 100644 +--- a/crypto_kem/firesaber/aarch64/__asm_mul.S ++++ b/crypto_kem/firesaber/aarch64/__asm_mul.S +@@ -5,7 +5,7 @@ + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_asymmetric_mul + .global _PQCLEAN_FIRESABER_AARCH64_asm_asymmetric_mul +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_asymmetric_mul, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_asymmetric_mul: +@@ -94,7 +94,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_asymmetric_mul: + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_point_mul_extended + .global _PQCLEAN_FIRESABER_AARCH64_asm_point_mul_extended +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_point_mul_extended, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_point_mul_extended: +diff --git a/crypto_kem/firesaber/aarch64/__asm_narrow.S b/crypto_kem/firesaber/aarch64/__asm_narrow.S +index 1909c7d..02217a9 100644 +--- a/crypto_kem/firesaber/aarch64/__asm_narrow.S ++++ b/crypto_kem/firesaber/aarch64/__asm_narrow.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_round + .global _PQCLEAN_FIRESABER_AARCH64_asm_round +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_round, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_round: +@@ -53,7 +53,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_round: + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_enc_add_msg + .global _PQCLEAN_FIRESABER_AARCH64_asm_enc_add_msg +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_enc_add_msg, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_enc_add_msg: +@@ -143,7 +143,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_enc_add_msg: + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_dec_get_msg + .global _PQCLEAN_FIRESABER_AARCH64_asm_dec_get_msg +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_dec_get_msg, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_dec_get_msg: +diff --git a/crypto_kem/firesaber/aarch64/__asm_pack_unpack.S b/crypto_kem/firesaber/aarch64/__asm_pack_unpack.S +index f7864be..d9722e2 100644 +--- a/crypto_kem/firesaber/aarch64/__asm_pack_unpack.S ++++ b/crypto_kem/firesaber/aarch64/__asm_pack_unpack.S +@@ -2,7 +2,7 @@ + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_1_to_16 + .global _PQCLEAN_FIRESABER_AARCH64_asm_1_to_16 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_1_to_16, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_1_to_16: +@@ -47,7 +47,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_1_to_16: + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_4_to_16 + .global _PQCLEAN_FIRESABER_AARCH64_asm_4_to_16 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_4_to_16, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_4_to_16: +@@ -85,7 +85,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_4_to_16: + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_10_to_32 + .global _PQCLEAN_FIRESABER_AARCH64_asm_10_to_32 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_10_to_32, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_10_to_32: +@@ -161,7 +161,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_10_to_32: + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_13_to_32 + .global _PQCLEAN_FIRESABER_AARCH64_asm_13_to_32 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_13_to_32, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_13_to_32: +@@ -318,7 +318,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_13_to_32: + .align 2 + .global PQCLEAN_FIRESABER_AARCH64_asm_16_to_32 + .global _PQCLEAN_FIRESABER_AARCH64_asm_16_to_32 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_FIRESABER_AARCH64_asm_16_to_32, %function + #endif + PQCLEAN_FIRESABER_AARCH64_asm_16_to_32: +diff --git a/crypto_kem/kyber1024/aarch64/__asm_NTT.S b/crypto_kem/kyber1024/aarch64/__asm_NTT.S +index 7f376ec..bf693c5 100644 +--- a/crypto_kem/kyber1024/aarch64/__asm_NTT.S ++++ b/crypto_kem/kyber1024/aarch64/__asm_NTT.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_top + .global _PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_top +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_top, %function + #endif + PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_top: +@@ -173,7 +173,7 @@ _PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_top: + .align 2 + .global PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_bot + .global _PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_bot +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_bot, %function + #endif + PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_bot: +diff --git a/crypto_kem/kyber1024/aarch64/__asm_base_mul.S b/crypto_kem/kyber1024/aarch64/__asm_base_mul.S +index 94ba36b..3eed305 100644 +--- a/crypto_kem/kyber1024/aarch64/__asm_base_mul.S ++++ b/crypto_kem/kyber1024/aarch64/__asm_base_mul.S +@@ -6,7 +6,7 @@ + .align 2 + .global PQCLEAN_KYBER1024_AARCH64_asm_point_mul_extended + .global _PQCLEAN_KYBER1024_AARCH64_asm_point_mul_extended +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER1024_AARCH64_asm_point_mul_extended, %function + #endif + PQCLEAN_KYBER1024_AARCH64_asm_point_mul_extended: +@@ -73,7 +73,7 @@ _PQCLEAN_KYBER1024_AARCH64_asm_point_mul_extended: + .align 2 + .global PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul + .global _PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul, %function + #endif + PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul: +@@ -228,7 +228,7 @@ _PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul: + .align 2 + .global PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul_montgomery + .global _PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul_montgomery +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul_montgomery, %function + #endif + PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul_montgomery: +diff --git a/crypto_kem/kyber1024/aarch64/__asm_iNTT.S b/crypto_kem/kyber1024/aarch64/__asm_iNTT.S +index 5701058..f7e83ab 100644 +--- a/crypto_kem/kyber1024/aarch64/__asm_iNTT.S ++++ b/crypto_kem/kyber1024/aarch64/__asm_iNTT.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_bot + .global _PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_bot +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_bot, %function + #endif + PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_bot: +@@ -90,7 +90,7 @@ _PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_bot: + .align 2 + .global PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_top + .global _PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_top +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_top, %function + #endif + PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_top: +diff --git a/crypto_kem/kyber1024/aarch64/__asm_poly.S b/crypto_kem/kyber1024/aarch64/__asm_poly.S +index 0be0163..34a38bb 100644 +--- a/crypto_kem/kyber1024/aarch64/__asm_poly.S ++++ b/crypto_kem/kyber1024/aarch64/__asm_poly.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_KYBER1024_AARCH64_asm_add_reduce + .global _PQCLEAN_KYBER1024_AARCH64_asm_add_reduce +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER1024_AARCH64_asm_add_reduce, %function + #endif + PQCLEAN_KYBER1024_AARCH64_asm_add_reduce: +@@ -68,7 +68,7 @@ _PQCLEAN_KYBER1024_AARCH64_asm_add_reduce: + .align 2 + .global PQCLEAN_KYBER1024_AARCH64_asm_sub_reduce + .global _PQCLEAN_KYBER1024_AARCH64_asm_sub_reduce +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER1024_AARCH64_asm_sub_reduce, %function + #endif + PQCLEAN_KYBER1024_AARCH64_asm_sub_reduce: +@@ -132,7 +132,7 @@ _PQCLEAN_KYBER1024_AARCH64_asm_sub_reduce: + .align 2 + .global PQCLEAN_KYBER1024_AARCH64_asm_add_add_reduce + .global _PQCLEAN_KYBER1024_AARCH64_asm_add_add_reduce +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER1024_AARCH64_asm_add_add_reduce, %function + #endif + PQCLEAN_KYBER1024_AARCH64_asm_add_add_reduce: +diff --git a/crypto_kem/kyber512/aarch64/__asm_NTT.S b/crypto_kem/kyber512/aarch64/__asm_NTT.S +index 1abbca1..ada533e 100644 +--- a/crypto_kem/kyber512/aarch64/__asm_NTT.S ++++ b/crypto_kem/kyber512/aarch64/__asm_NTT.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_top + .global _PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_top +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_top, %function + #endif + PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_top: +@@ -173,7 +173,7 @@ _PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_top: + .align 2 + .global PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_bot + .global _PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_bot +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_bot, %function + #endif + PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_bot: +diff --git a/crypto_kem/kyber512/aarch64/__asm_base_mul.S b/crypto_kem/kyber512/aarch64/__asm_base_mul.S +index 185ac20..a3d39f1 100644 +--- a/crypto_kem/kyber512/aarch64/__asm_base_mul.S ++++ b/crypto_kem/kyber512/aarch64/__asm_base_mul.S +@@ -6,7 +6,7 @@ + .align 2 + .global PQCLEAN_KYBER512_AARCH64_asm_point_mul_extended + .global _PQCLEAN_KYBER512_AARCH64_asm_point_mul_extended +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER512_AARCH64_asm_point_mul_extended, %function + #endif + PQCLEAN_KYBER512_AARCH64_asm_point_mul_extended: +@@ -73,7 +73,7 @@ _PQCLEAN_KYBER512_AARCH64_asm_point_mul_extended: + .align 2 + .global PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul + .global _PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul, %function + #endif + PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul: +@@ -228,7 +228,7 @@ _PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul: + .align 2 + .global PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul_montgomery + .global _PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul_montgomery +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul_montgomery, %function + #endif + PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul_montgomery: +diff --git a/crypto_kem/kyber512/aarch64/__asm_iNTT.S b/crypto_kem/kyber512/aarch64/__asm_iNTT.S +index c83694c..4a135e7 100644 +--- a/crypto_kem/kyber512/aarch64/__asm_iNTT.S ++++ b/crypto_kem/kyber512/aarch64/__asm_iNTT.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_bot + .global _PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_bot +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_bot, %function + #endif + PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_bot: +@@ -90,7 +90,7 @@ _PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_bot: + .align 2 + .global PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_top + .global _PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_top +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_top, %function + #endif + PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_top: +diff --git a/crypto_kem/kyber512/aarch64/__asm_poly.S b/crypto_kem/kyber512/aarch64/__asm_poly.S +index 1be60ad..fa77b95 100644 +--- a/crypto_kem/kyber512/aarch64/__asm_poly.S ++++ b/crypto_kem/kyber512/aarch64/__asm_poly.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_KYBER512_AARCH64_asm_add_reduce + .global _PQCLEAN_KYBER512_AARCH64_asm_add_reduce +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER512_AARCH64_asm_add_reduce, %function + #endif + PQCLEAN_KYBER512_AARCH64_asm_add_reduce: +@@ -68,7 +68,7 @@ _PQCLEAN_KYBER512_AARCH64_asm_add_reduce: + .align 2 + .global PQCLEAN_KYBER512_AARCH64_asm_sub_reduce + .global _PQCLEAN_KYBER512_AARCH64_asm_sub_reduce +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER512_AARCH64_asm_sub_reduce, %function + #endif + PQCLEAN_KYBER512_AARCH64_asm_sub_reduce: +@@ -132,7 +132,7 @@ _PQCLEAN_KYBER512_AARCH64_asm_sub_reduce: + .align 2 + .global PQCLEAN_KYBER512_AARCH64_asm_add_add_reduce + .global _PQCLEAN_KYBER512_AARCH64_asm_add_add_reduce +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER512_AARCH64_asm_add_add_reduce, %function + #endif + PQCLEAN_KYBER512_AARCH64_asm_add_add_reduce: +diff --git a/crypto_kem/kyber768/aarch64/__asm_NTT.S b/crypto_kem/kyber768/aarch64/__asm_NTT.S +index 19aa03c..bb2253e 100644 +--- a/crypto_kem/kyber768/aarch64/__asm_NTT.S ++++ b/crypto_kem/kyber768/aarch64/__asm_NTT.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_top + .global _PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_top +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_top, %function + #endif + PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_top: +@@ -173,7 +173,7 @@ _PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_top: + .align 2 + .global PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_bot + .global _PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_bot +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_bot, %function + #endif + PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_bot: +diff --git a/crypto_kem/kyber768/aarch64/__asm_base_mul.S b/crypto_kem/kyber768/aarch64/__asm_base_mul.S +index 1e9fb26..2bbb228 100644 +--- a/crypto_kem/kyber768/aarch64/__asm_base_mul.S ++++ b/crypto_kem/kyber768/aarch64/__asm_base_mul.S +@@ -6,7 +6,7 @@ + .align 2 + .global PQCLEAN_KYBER768_AARCH64_asm_point_mul_extended + .global _PQCLEAN_KYBER768_AARCH64_asm_point_mul_extended +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER768_AARCH64_asm_point_mul_extended, %function + #endif + PQCLEAN_KYBER768_AARCH64_asm_point_mul_extended: +@@ -73,7 +73,7 @@ _PQCLEAN_KYBER768_AARCH64_asm_point_mul_extended: + .align 2 + .global PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul + .global _PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul, %function + #endif + PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul: +@@ -228,7 +228,7 @@ _PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul: + .align 2 + .global PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul_montgomery + .global _PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul_montgomery +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul_montgomery, %function + #endif + PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul_montgomery: +diff --git a/crypto_kem/kyber768/aarch64/__asm_iNTT.S b/crypto_kem/kyber768/aarch64/__asm_iNTT.S +index e6fcc40..cce9aa7 100644 +--- a/crypto_kem/kyber768/aarch64/__asm_iNTT.S ++++ b/crypto_kem/kyber768/aarch64/__asm_iNTT.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_bot + .global _PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_bot +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_bot, %function + #endif + PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_bot: +@@ -90,7 +90,7 @@ _PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_bot: + .align 2 + .global PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_top + .global _PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_top +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_top, %function + #endif + PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_top: +diff --git a/crypto_kem/kyber768/aarch64/__asm_poly.S b/crypto_kem/kyber768/aarch64/__asm_poly.S +index 0063959..9d7816c 100644 +--- a/crypto_kem/kyber768/aarch64/__asm_poly.S ++++ b/crypto_kem/kyber768/aarch64/__asm_poly.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_KYBER768_AARCH64_asm_add_reduce + .global _PQCLEAN_KYBER768_AARCH64_asm_add_reduce +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER768_AARCH64_asm_add_reduce, %function + #endif + PQCLEAN_KYBER768_AARCH64_asm_add_reduce: +@@ -68,7 +68,7 @@ _PQCLEAN_KYBER768_AARCH64_asm_add_reduce: + .align 2 + .global PQCLEAN_KYBER768_AARCH64_asm_sub_reduce + .global _PQCLEAN_KYBER768_AARCH64_asm_sub_reduce +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER768_AARCH64_asm_sub_reduce, %function + #endif + PQCLEAN_KYBER768_AARCH64_asm_sub_reduce: +@@ -132,7 +132,7 @@ _PQCLEAN_KYBER768_AARCH64_asm_sub_reduce: + .align 2 + .global PQCLEAN_KYBER768_AARCH64_asm_add_add_reduce + .global _PQCLEAN_KYBER768_AARCH64_asm_add_add_reduce +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_KYBER768_AARCH64_asm_add_add_reduce, %function + #endif + PQCLEAN_KYBER768_AARCH64_asm_add_add_reduce: +diff --git a/crypto_kem/lightsaber/aarch64/__asm_NTT.S b/crypto_kem/lightsaber/aarch64/__asm_NTT.S +index eeef00d..2a0da9a 100644 +--- a/crypto_kem/lightsaber/aarch64/__asm_NTT.S ++++ b/crypto_kem/lightsaber/aarch64/__asm_NTT.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_top + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_top +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_top, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_top: +@@ -181,7 +181,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_top: + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_bot + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_bot +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_bot, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_bot: +diff --git a/crypto_kem/lightsaber/aarch64/__asm_iNTT.S b/crypto_kem/lightsaber/aarch64/__asm_iNTT.S +index f33a186..e65a47a 100644 +--- a/crypto_kem/lightsaber/aarch64/__asm_iNTT.S ++++ b/crypto_kem/lightsaber/aarch64/__asm_iNTT.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_top + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_top +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_top, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_top: +@@ -150,7 +150,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_top: + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_bot + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_bot +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_bot, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_bot: +diff --git a/crypto_kem/lightsaber/aarch64/__asm_mul.S b/crypto_kem/lightsaber/aarch64/__asm_mul.S +index 9be57de..1b00f7b 100644 +--- a/crypto_kem/lightsaber/aarch64/__asm_mul.S ++++ b/crypto_kem/lightsaber/aarch64/__asm_mul.S +@@ -5,7 +5,7 @@ + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_asymmetric_mul + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_asymmetric_mul +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_asymmetric_mul, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_asymmetric_mul: +@@ -94,7 +94,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_asymmetric_mul: + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_point_mul_extended + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_point_mul_extended +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_point_mul_extended, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_point_mul_extended: +diff --git a/crypto_kem/lightsaber/aarch64/__asm_narrow.S b/crypto_kem/lightsaber/aarch64/__asm_narrow.S +index e44c539..725fc43 100644 +--- a/crypto_kem/lightsaber/aarch64/__asm_narrow.S ++++ b/crypto_kem/lightsaber/aarch64/__asm_narrow.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_round + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_round +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_round, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_round: +@@ -53,7 +53,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_round: + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_enc_add_msg + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_enc_add_msg +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_enc_add_msg, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_enc_add_msg: +@@ -143,7 +143,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_enc_add_msg: + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_dec_get_msg + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_dec_get_msg +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_dec_get_msg, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_dec_get_msg: +diff --git a/crypto_kem/lightsaber/aarch64/__asm_pack_unpack.S b/crypto_kem/lightsaber/aarch64/__asm_pack_unpack.S +index 1178015..e69dc51 100644 +--- a/crypto_kem/lightsaber/aarch64/__asm_pack_unpack.S ++++ b/crypto_kem/lightsaber/aarch64/__asm_pack_unpack.S +@@ -2,7 +2,7 @@ + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_1_to_16 + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_1_to_16 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_1_to_16, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_1_to_16: +@@ -47,7 +47,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_1_to_16: + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_4_to_16 + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_4_to_16 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_4_to_16, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_4_to_16: +@@ -85,7 +85,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_4_to_16: + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_10_to_32 + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_10_to_32 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_10_to_32, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_10_to_32: +@@ -161,7 +161,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_10_to_32: + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_13_to_32 + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_13_to_32 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_13_to_32, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_13_to_32: +@@ -318,7 +318,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_13_to_32: + .align 2 + .global PQCLEAN_LIGHTSABER_AARCH64_asm_16_to_32 + .global _PQCLEAN_LIGHTSABER_AARCH64_asm_16_to_32 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_LIGHTSABER_AARCH64_asm_16_to_32, %function + #endif + PQCLEAN_LIGHTSABER_AARCH64_asm_16_to_32: +diff --git a/crypto_kem/saber/aarch64/__asm_NTT.S b/crypto_kem/saber/aarch64/__asm_NTT.S +index 2a00ba0..24b304a 100644 +--- a/crypto_kem/saber/aarch64/__asm_NTT.S ++++ b/crypto_kem/saber/aarch64/__asm_NTT.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_top + .global _PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_top +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_top, %function + #endif + PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_top: +@@ -181,7 +181,7 @@ _PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_top: + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_bot + .global _PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_bot +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_bot, %function + #endif + PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_bot: +diff --git a/crypto_kem/saber/aarch64/__asm_iNTT.S b/crypto_kem/saber/aarch64/__asm_iNTT.S +index e25fd8e..39e740f 100644 +--- a/crypto_kem/saber/aarch64/__asm_iNTT.S ++++ b/crypto_kem/saber/aarch64/__asm_iNTT.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_intt_SIMD_top + .global _PQCLEAN_SABER_AARCH64_asm_intt_SIMD_top +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_intt_SIMD_top, %function + #endif + PQCLEAN_SABER_AARCH64_asm_intt_SIMD_top: +@@ -150,7 +150,7 @@ _PQCLEAN_SABER_AARCH64_asm_intt_SIMD_top: + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_intt_SIMD_bot + .global _PQCLEAN_SABER_AARCH64_asm_intt_SIMD_bot +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_intt_SIMD_bot, %function + #endif + PQCLEAN_SABER_AARCH64_asm_intt_SIMD_bot: +diff --git a/crypto_kem/saber/aarch64/__asm_mul.S b/crypto_kem/saber/aarch64/__asm_mul.S +index 5b0a471..f172835 100644 +--- a/crypto_kem/saber/aarch64/__asm_mul.S ++++ b/crypto_kem/saber/aarch64/__asm_mul.S +@@ -5,7 +5,7 @@ + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_asymmetric_mul + .global _PQCLEAN_SABER_AARCH64_asm_asymmetric_mul +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_asymmetric_mul, %function + #endif + PQCLEAN_SABER_AARCH64_asm_asymmetric_mul: +@@ -94,7 +94,7 @@ _PQCLEAN_SABER_AARCH64_asm_asymmetric_mul: + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_point_mul_extended + .global _PQCLEAN_SABER_AARCH64_asm_point_mul_extended +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_point_mul_extended, %function + #endif + PQCLEAN_SABER_AARCH64_asm_point_mul_extended: +diff --git a/crypto_kem/saber/aarch64/__asm_narrow.S b/crypto_kem/saber/aarch64/__asm_narrow.S +index cc967e4..bb1120b 100644 +--- a/crypto_kem/saber/aarch64/__asm_narrow.S ++++ b/crypto_kem/saber/aarch64/__asm_narrow.S +@@ -4,7 +4,7 @@ + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_round + .global _PQCLEAN_SABER_AARCH64_asm_round +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_round, %function + #endif + PQCLEAN_SABER_AARCH64_asm_round: +@@ -53,7 +53,7 @@ _PQCLEAN_SABER_AARCH64_asm_round: + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_enc_add_msg + .global _PQCLEAN_SABER_AARCH64_asm_enc_add_msg +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_enc_add_msg, %function + #endif + PQCLEAN_SABER_AARCH64_asm_enc_add_msg: +@@ -143,7 +143,7 @@ _PQCLEAN_SABER_AARCH64_asm_enc_add_msg: + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_dec_get_msg + .global _PQCLEAN_SABER_AARCH64_asm_dec_get_msg +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_dec_get_msg, %function + #endif + PQCLEAN_SABER_AARCH64_asm_dec_get_msg: +diff --git a/crypto_kem/saber/aarch64/__asm_pack_unpack.S b/crypto_kem/saber/aarch64/__asm_pack_unpack.S +index f972b66..a3a549b 100644 +--- a/crypto_kem/saber/aarch64/__asm_pack_unpack.S ++++ b/crypto_kem/saber/aarch64/__asm_pack_unpack.S +@@ -2,7 +2,7 @@ + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_1_to_16 + .global _PQCLEAN_SABER_AARCH64_asm_1_to_16 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_1_to_16, %function + #endif + PQCLEAN_SABER_AARCH64_asm_1_to_16: +@@ -47,7 +47,7 @@ _PQCLEAN_SABER_AARCH64_asm_1_to_16: + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_4_to_16 + .global _PQCLEAN_SABER_AARCH64_asm_4_to_16 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_4_to_16, %function + #endif + PQCLEAN_SABER_AARCH64_asm_4_to_16: +@@ -85,7 +85,7 @@ _PQCLEAN_SABER_AARCH64_asm_4_to_16: + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_10_to_32 + .global _PQCLEAN_SABER_AARCH64_asm_10_to_32 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_10_to_32, %function + #endif + PQCLEAN_SABER_AARCH64_asm_10_to_32: +@@ -161,7 +161,7 @@ _PQCLEAN_SABER_AARCH64_asm_10_to_32: + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_13_to_32 + .global _PQCLEAN_SABER_AARCH64_asm_13_to_32 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_13_to_32, %function + #endif + PQCLEAN_SABER_AARCH64_asm_13_to_32: +@@ -318,7 +318,7 @@ _PQCLEAN_SABER_AARCH64_asm_13_to_32: + .align 2 + .global PQCLEAN_SABER_AARCH64_asm_16_to_32 + .global _PQCLEAN_SABER_AARCH64_asm_16_to_32 +-#ifndef __clang__ ++#if !defined(__clang__) && !defined(old_gas_syntax) + .type PQCLEAN_SABER_AARCH64_asm_16_to_32, %function + #endif + PQCLEAN_SABER_AARCH64_asm_16_to_32: +-- +2.32.0 (Apple Git-132) + diff --git a/scripts/copy_from_upstream/src/kem/family/CMakeLists.txt b/scripts/copy_from_upstream/src/kem/family/CMakeLists.txt index 754b25ea7..fc3d6aa3f 100644 --- a/scripts/copy_from_upstream/src/kem/family/CMakeLists.txt +++ b/scripts/copy_from_upstream/src/kem/family/CMakeLists.txt @@ -55,6 +55,11 @@ if(OQS_ENABLE_KEM_{{ family }}_{{ scheme['scheme_c'] }}_{{ impl['name'] }}) {%- if family == 'hqc' and impl['name'] == 'avx2' %} target_compile_options({{ family }}_{{ scheme['scheme'] }}_{{ impl['name'] }} PRIVATE -Wno-missing-braces) {%- endif %} + {%- if impl['upstream']['name'] == 'pqclean' %} + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions({{ family }}_{{ scheme['scheme'] }}_{{ impl['name'] }} PRIVATE old_gas_syntax) + endif() + {%- endif %} set(_{{ family|upper }}_OBJS ${_{{ family|upper }}_OBJS} $) endif() {%- endfor -%} diff --git a/src/kem/classic_mceliece/CMakeLists.txt b/src/kem/classic_mceliece/CMakeLists.txt index c4e4114a8..b7b47f38b 100644 --- a/src/kem/classic_mceliece/CMakeLists.txt +++ b/src/kem/classic_mceliece/CMakeLists.txt @@ -9,6 +9,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_348864) add_library(classic_mceliece_348864_vec OBJECT kem_classic_mceliece_348864.c pqclean_mceliece348864_vec/aes256ctr.c pqclean_mceliece348864_vec/benes.c pqclean_mceliece348864_vec/bm.c pqclean_mceliece348864_vec/controlbits.c pqclean_mceliece348864_vec/decrypt.c pqclean_mceliece348864_vec/encrypt.c pqclean_mceliece348864_vec/fft.c pqclean_mceliece348864_vec/fft_tr.c pqclean_mceliece348864_vec/gf.c pqclean_mceliece348864_vec/operations.c pqclean_mceliece348864_vec/pk_gen.c pqclean_mceliece348864_vec/sk_gen.c pqclean_mceliece348864_vec/transpose.c pqclean_mceliece348864_vec/util.c pqclean_mceliece348864_vec/vec.c) target_include_directories(classic_mceliece_348864_vec PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece348864_vec) target_include_directories(classic_mceliece_348864_vec PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_348864_vec PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -18,6 +21,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_348864_avx) target_include_directories(classic_mceliece_348864_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(classic_mceliece_348864_avx PRIVATE -mavx2 -mpopcnt ) target_compile_options(classic_mceliece_348864_avx PRIVATE -Wno-language-extension-token) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_348864_avx PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -25,6 +31,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_348864f) add_library(classic_mceliece_348864f_vec OBJECT kem_classic_mceliece_348864f.c pqclean_mceliece348864f_vec/aes256ctr.c pqclean_mceliece348864f_vec/benes.c pqclean_mceliece348864f_vec/bm.c pqclean_mceliece348864f_vec/controlbits.c pqclean_mceliece348864f_vec/decrypt.c pqclean_mceliece348864f_vec/encrypt.c pqclean_mceliece348864f_vec/fft.c pqclean_mceliece348864f_vec/fft_tr.c pqclean_mceliece348864f_vec/gf.c pqclean_mceliece348864f_vec/operations.c pqclean_mceliece348864f_vec/pk_gen.c pqclean_mceliece348864f_vec/sk_gen.c pqclean_mceliece348864f_vec/transpose.c pqclean_mceliece348864f_vec/util.c pqclean_mceliece348864f_vec/vec.c) target_include_directories(classic_mceliece_348864f_vec PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece348864f_vec) target_include_directories(classic_mceliece_348864f_vec PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_348864f_vec PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -34,6 +43,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_348864f_avx) target_include_directories(classic_mceliece_348864f_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(classic_mceliece_348864f_avx PRIVATE -mavx2 -mpopcnt -mbmi ) target_compile_options(classic_mceliece_348864f_avx PRIVATE -Wno-language-extension-token) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_348864f_avx PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -41,6 +53,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_460896) add_library(classic_mceliece_460896_vec OBJECT kem_classic_mceliece_460896.c pqclean_mceliece460896_vec/aes256ctr.c pqclean_mceliece460896_vec/benes.c pqclean_mceliece460896_vec/bm.c pqclean_mceliece460896_vec/controlbits.c pqclean_mceliece460896_vec/decrypt.c pqclean_mceliece460896_vec/encrypt.c pqclean_mceliece460896_vec/fft.c pqclean_mceliece460896_vec/fft_tr.c pqclean_mceliece460896_vec/gf.c pqclean_mceliece460896_vec/operations.c pqclean_mceliece460896_vec/pk_gen.c pqclean_mceliece460896_vec/sk_gen.c pqclean_mceliece460896_vec/transpose.c pqclean_mceliece460896_vec/util.c pqclean_mceliece460896_vec/vec.c) target_include_directories(classic_mceliece_460896_vec PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece460896_vec) target_include_directories(classic_mceliece_460896_vec PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_460896_vec PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -50,6 +65,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_460896_avx) target_include_directories(classic_mceliece_460896_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(classic_mceliece_460896_avx PRIVATE -mavx2 -mpopcnt ) target_compile_options(classic_mceliece_460896_avx PRIVATE -Wno-language-extension-token) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_460896_avx PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -57,6 +75,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_460896f) add_library(classic_mceliece_460896f_vec OBJECT kem_classic_mceliece_460896f.c pqclean_mceliece460896f_vec/aes256ctr.c pqclean_mceliece460896f_vec/benes.c pqclean_mceliece460896f_vec/bm.c pqclean_mceliece460896f_vec/controlbits.c pqclean_mceliece460896f_vec/decrypt.c pqclean_mceliece460896f_vec/encrypt.c pqclean_mceliece460896f_vec/fft.c pqclean_mceliece460896f_vec/fft_tr.c pqclean_mceliece460896f_vec/gf.c pqclean_mceliece460896f_vec/operations.c pqclean_mceliece460896f_vec/pk_gen.c pqclean_mceliece460896f_vec/sk_gen.c pqclean_mceliece460896f_vec/transpose.c pqclean_mceliece460896f_vec/util.c pqclean_mceliece460896f_vec/vec.c) target_include_directories(classic_mceliece_460896f_vec PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece460896f_vec) target_include_directories(classic_mceliece_460896f_vec PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_460896f_vec PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -66,6 +87,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_460896f_avx) target_include_directories(classic_mceliece_460896f_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(classic_mceliece_460896f_avx PRIVATE -mavx2 -mbmi -mpopcnt ) target_compile_options(classic_mceliece_460896f_avx PRIVATE -Wno-language-extension-token) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_460896f_avx PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -73,6 +97,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_6688128) add_library(classic_mceliece_6688128_vec OBJECT kem_classic_mceliece_6688128.c pqclean_mceliece6688128_vec/aes256ctr.c pqclean_mceliece6688128_vec/benes.c pqclean_mceliece6688128_vec/bm.c pqclean_mceliece6688128_vec/controlbits.c pqclean_mceliece6688128_vec/decrypt.c pqclean_mceliece6688128_vec/encrypt.c pqclean_mceliece6688128_vec/fft.c pqclean_mceliece6688128_vec/fft_tr.c pqclean_mceliece6688128_vec/gf.c pqclean_mceliece6688128_vec/operations.c pqclean_mceliece6688128_vec/pk_gen.c pqclean_mceliece6688128_vec/sk_gen.c pqclean_mceliece6688128_vec/transpose.c pqclean_mceliece6688128_vec/util.c pqclean_mceliece6688128_vec/vec.c) target_include_directories(classic_mceliece_6688128_vec PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece6688128_vec) target_include_directories(classic_mceliece_6688128_vec PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_6688128_vec PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -82,6 +109,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_6688128_avx) target_include_directories(classic_mceliece_6688128_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(classic_mceliece_6688128_avx PRIVATE -mavx2 -mpopcnt ) target_compile_options(classic_mceliece_6688128_avx PRIVATE -Wno-language-extension-token) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_6688128_avx PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -89,6 +119,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_6688128f) add_library(classic_mceliece_6688128f_vec OBJECT kem_classic_mceliece_6688128f.c pqclean_mceliece6688128f_vec/aes256ctr.c pqclean_mceliece6688128f_vec/benes.c pqclean_mceliece6688128f_vec/bm.c pqclean_mceliece6688128f_vec/controlbits.c pqclean_mceliece6688128f_vec/decrypt.c pqclean_mceliece6688128f_vec/encrypt.c pqclean_mceliece6688128f_vec/fft.c pqclean_mceliece6688128f_vec/fft_tr.c pqclean_mceliece6688128f_vec/gf.c pqclean_mceliece6688128f_vec/operations.c pqclean_mceliece6688128f_vec/pk_gen.c pqclean_mceliece6688128f_vec/sk_gen.c pqclean_mceliece6688128f_vec/transpose.c pqclean_mceliece6688128f_vec/util.c pqclean_mceliece6688128f_vec/vec.c) target_include_directories(classic_mceliece_6688128f_vec PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece6688128f_vec) target_include_directories(classic_mceliece_6688128f_vec PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_6688128f_vec PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -98,6 +131,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_6688128f_avx) target_include_directories(classic_mceliece_6688128f_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(classic_mceliece_6688128f_avx PRIVATE -mavx2 -mbmi -mpopcnt ) target_compile_options(classic_mceliece_6688128f_avx PRIVATE -Wno-language-extension-token) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_6688128f_avx PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -105,6 +141,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_6960119) add_library(classic_mceliece_6960119_vec OBJECT kem_classic_mceliece_6960119.c pqclean_mceliece6960119_vec/aes256ctr.c pqclean_mceliece6960119_vec/benes.c pqclean_mceliece6960119_vec/bm.c pqclean_mceliece6960119_vec/controlbits.c pqclean_mceliece6960119_vec/decrypt.c pqclean_mceliece6960119_vec/encrypt.c pqclean_mceliece6960119_vec/fft.c pqclean_mceliece6960119_vec/fft_tr.c pqclean_mceliece6960119_vec/gf.c pqclean_mceliece6960119_vec/operations.c pqclean_mceliece6960119_vec/pk_gen.c pqclean_mceliece6960119_vec/sk_gen.c pqclean_mceliece6960119_vec/transpose.c pqclean_mceliece6960119_vec/util.c pqclean_mceliece6960119_vec/vec.c) target_include_directories(classic_mceliece_6960119_vec PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece6960119_vec) target_include_directories(classic_mceliece_6960119_vec PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_6960119_vec PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -114,6 +153,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_6960119_avx) target_include_directories(classic_mceliece_6960119_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(classic_mceliece_6960119_avx PRIVATE -mavx2 -mpopcnt ) target_compile_options(classic_mceliece_6960119_avx PRIVATE -Wno-language-extension-token) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_6960119_avx PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -121,6 +163,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_6960119f) add_library(classic_mceliece_6960119f_vec OBJECT kem_classic_mceliece_6960119f.c pqclean_mceliece6960119f_vec/aes256ctr.c pqclean_mceliece6960119f_vec/benes.c pqclean_mceliece6960119f_vec/bm.c pqclean_mceliece6960119f_vec/controlbits.c pqclean_mceliece6960119f_vec/decrypt.c pqclean_mceliece6960119f_vec/encrypt.c pqclean_mceliece6960119f_vec/fft.c pqclean_mceliece6960119f_vec/fft_tr.c pqclean_mceliece6960119f_vec/gf.c pqclean_mceliece6960119f_vec/operations.c pqclean_mceliece6960119f_vec/pk_gen.c pqclean_mceliece6960119f_vec/sk_gen.c pqclean_mceliece6960119f_vec/transpose.c pqclean_mceliece6960119f_vec/util.c pqclean_mceliece6960119f_vec/vec.c) target_include_directories(classic_mceliece_6960119f_vec PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece6960119f_vec) target_include_directories(classic_mceliece_6960119f_vec PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_6960119f_vec PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -130,6 +175,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_6960119f_avx) target_include_directories(classic_mceliece_6960119f_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(classic_mceliece_6960119f_avx PRIVATE -mavx2 -mbmi -mpopcnt ) target_compile_options(classic_mceliece_6960119f_avx PRIVATE -Wno-language-extension-token) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_6960119f_avx PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -137,6 +185,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_8192128) add_library(classic_mceliece_8192128_vec OBJECT kem_classic_mceliece_8192128.c pqclean_mceliece8192128_vec/aes256ctr.c pqclean_mceliece8192128_vec/benes.c pqclean_mceliece8192128_vec/bm.c pqclean_mceliece8192128_vec/controlbits.c pqclean_mceliece8192128_vec/decrypt.c pqclean_mceliece8192128_vec/encrypt.c pqclean_mceliece8192128_vec/fft.c pqclean_mceliece8192128_vec/fft_tr.c pqclean_mceliece8192128_vec/gf.c pqclean_mceliece8192128_vec/operations.c pqclean_mceliece8192128_vec/pk_gen.c pqclean_mceliece8192128_vec/sk_gen.c pqclean_mceliece8192128_vec/transpose.c pqclean_mceliece8192128_vec/util.c pqclean_mceliece8192128_vec/vec.c) target_include_directories(classic_mceliece_8192128_vec PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece8192128_vec) target_include_directories(classic_mceliece_8192128_vec PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_8192128_vec PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -146,6 +197,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_8192128_avx) target_include_directories(classic_mceliece_8192128_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(classic_mceliece_8192128_avx PRIVATE -mavx2 -mpopcnt ) target_compile_options(classic_mceliece_8192128_avx PRIVATE -Wno-language-extension-token) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_8192128_avx PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -153,6 +207,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_8192128f) add_library(classic_mceliece_8192128f_vec OBJECT kem_classic_mceliece_8192128f.c pqclean_mceliece8192128f_vec/aes256ctr.c pqclean_mceliece8192128f_vec/benes.c pqclean_mceliece8192128f_vec/bm.c pqclean_mceliece8192128f_vec/controlbits.c pqclean_mceliece8192128f_vec/decrypt.c pqclean_mceliece8192128f_vec/encrypt.c pqclean_mceliece8192128f_vec/fft.c pqclean_mceliece8192128f_vec/fft_tr.c pqclean_mceliece8192128f_vec/gf.c pqclean_mceliece8192128f_vec/operations.c pqclean_mceliece8192128f_vec/pk_gen.c pqclean_mceliece8192128f_vec/sk_gen.c pqclean_mceliece8192128f_vec/transpose.c pqclean_mceliece8192128f_vec/util.c pqclean_mceliece8192128f_vec/vec.c) target_include_directories(classic_mceliece_8192128f_vec PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece8192128f_vec) target_include_directories(classic_mceliece_8192128f_vec PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_8192128f_vec PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() @@ -162,6 +219,9 @@ if(OQS_ENABLE_KEM_classic_mceliece_8192128f_avx) target_include_directories(classic_mceliece_8192128f_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(classic_mceliece_8192128f_avx PRIVATE -mavx2 -mpopcnt -mbmi ) target_compile_options(classic_mceliece_8192128f_avx PRIVATE -Wno-language-extension-token) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(classic_mceliece_8192128f_avx PRIVATE old_gas_syntax) + endif() set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $) endif() diff --git a/src/kem/hqc/CMakeLists.txt b/src/kem/hqc/CMakeLists.txt index d987cd427..51e419937 100644 --- a/src/kem/hqc/CMakeLists.txt +++ b/src/kem/hqc/CMakeLists.txt @@ -9,6 +9,9 @@ if(OQS_ENABLE_KEM_hqc_128) add_library(hqc_128_clean OBJECT kem_hqc_128.c pqclean_hqc-rmrs-128_clean/code.c pqclean_hqc-rmrs-128_clean/fft.c pqclean_hqc-rmrs-128_clean/gf.c pqclean_hqc-rmrs-128_clean/gf2x.c pqclean_hqc-rmrs-128_clean/hqc.c pqclean_hqc-rmrs-128_clean/kem.c pqclean_hqc-rmrs-128_clean/parsing.c pqclean_hqc-rmrs-128_clean/reed_muller.c pqclean_hqc-rmrs-128_clean/reed_solomon.c pqclean_hqc-rmrs-128_clean/vector.c) target_include_directories(hqc_128_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_hqc-rmrs-128_clean) target_include_directories(hqc_128_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(hqc_128_clean PRIVATE old_gas_syntax) + endif() set(_HQC_OBJS ${_HQC_OBJS} $) endif() @@ -18,6 +21,9 @@ if(OQS_ENABLE_KEM_hqc_128_avx2) target_include_directories(hqc_128_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(hqc_128_avx2 PRIVATE -mavx2 -mbmi -mpclmul ) target_compile_options(hqc_128_avx2 PRIVATE -Wno-missing-braces) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(hqc_128_avx2 PRIVATE old_gas_syntax) + endif() set(_HQC_OBJS ${_HQC_OBJS} $) endif() @@ -25,6 +31,9 @@ if(OQS_ENABLE_KEM_hqc_192) add_library(hqc_192_clean OBJECT kem_hqc_192.c pqclean_hqc-rmrs-192_clean/code.c pqclean_hqc-rmrs-192_clean/fft.c pqclean_hqc-rmrs-192_clean/gf.c pqclean_hqc-rmrs-192_clean/gf2x.c pqclean_hqc-rmrs-192_clean/hqc.c pqclean_hqc-rmrs-192_clean/kem.c pqclean_hqc-rmrs-192_clean/parsing.c pqclean_hqc-rmrs-192_clean/reed_muller.c pqclean_hqc-rmrs-192_clean/reed_solomon.c pqclean_hqc-rmrs-192_clean/vector.c) target_include_directories(hqc_192_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_hqc-rmrs-192_clean) target_include_directories(hqc_192_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(hqc_192_clean PRIVATE old_gas_syntax) + endif() set(_HQC_OBJS ${_HQC_OBJS} $) endif() @@ -34,6 +43,9 @@ if(OQS_ENABLE_KEM_hqc_192_avx2) target_include_directories(hqc_192_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(hqc_192_avx2 PRIVATE -mavx2 -mbmi -mpclmul ) target_compile_options(hqc_192_avx2 PRIVATE -Wno-missing-braces) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(hqc_192_avx2 PRIVATE old_gas_syntax) + endif() set(_HQC_OBJS ${_HQC_OBJS} $) endif() @@ -41,6 +53,9 @@ if(OQS_ENABLE_KEM_hqc_256) add_library(hqc_256_clean OBJECT kem_hqc_256.c pqclean_hqc-rmrs-256_clean/code.c pqclean_hqc-rmrs-256_clean/fft.c pqclean_hqc-rmrs-256_clean/gf.c pqclean_hqc-rmrs-256_clean/gf2x.c pqclean_hqc-rmrs-256_clean/hqc.c pqclean_hqc-rmrs-256_clean/kem.c pqclean_hqc-rmrs-256_clean/parsing.c pqclean_hqc-rmrs-256_clean/reed_muller.c pqclean_hqc-rmrs-256_clean/reed_solomon.c pqclean_hqc-rmrs-256_clean/vector.c) target_include_directories(hqc_256_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_hqc-rmrs-256_clean) target_include_directories(hqc_256_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(hqc_256_clean PRIVATE old_gas_syntax) + endif() set(_HQC_OBJS ${_HQC_OBJS} $) endif() @@ -50,6 +65,9 @@ if(OQS_ENABLE_KEM_hqc_256_avx2) target_include_directories(hqc_256_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(hqc_256_avx2 PRIVATE -mavx2 -mbmi -mpclmul ) target_compile_options(hqc_256_avx2 PRIVATE -Wno-missing-braces) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(hqc_256_avx2 PRIVATE old_gas_syntax) + endif() set(_HQC_OBJS ${_HQC_OBJS} $) endif() diff --git a/src/kem/kyber/CMakeLists.txt b/src/kem/kyber/CMakeLists.txt index b1285e82c..d917d5915 100644 --- a/src/kem/kyber/CMakeLists.txt +++ b/src/kem/kyber/CMakeLists.txt @@ -40,6 +40,9 @@ if(OQS_ENABLE_KEM_kyber_512_aarch64) add_library(kyber_512_aarch64 OBJECT pqclean_kyber512_aarch64/__asm_base_mul.S pqclean_kyber512_aarch64/__asm_iNTT.S pqclean_kyber512_aarch64/__asm_NTT.S pqclean_kyber512_aarch64/__asm_poly.S pqclean_kyber512_aarch64/cbd.c pqclean_kyber512_aarch64/fips202x2.c pqclean_kyber512_aarch64/indcpa.c pqclean_kyber512_aarch64/kem.c pqclean_kyber512_aarch64/neon_poly.c pqclean_kyber512_aarch64/neon_polyvec.c pqclean_kyber512_aarch64/neon_symmetric-shake.c pqclean_kyber512_aarch64/ntt.c pqclean_kyber512_aarch64/poly.c pqclean_kyber512_aarch64/polyvec.c pqclean_kyber512_aarch64/reduce.c pqclean_kyber512_aarch64/rejsample.c pqclean_kyber512_aarch64/symmetric-shake.c pqclean_kyber512_aarch64/verify.c) target_include_directories(kyber_512_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_kyber512_aarch64) target_include_directories(kyber_512_aarch64 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(kyber_512_aarch64 PRIVATE old_gas_syntax) + endif() set(_KYBER_OBJS ${_KYBER_OBJS} $) endif() @@ -65,6 +68,9 @@ if(OQS_ENABLE_KEM_kyber_768_aarch64) add_library(kyber_768_aarch64 OBJECT pqclean_kyber768_aarch64/__asm_base_mul.S pqclean_kyber768_aarch64/__asm_iNTT.S pqclean_kyber768_aarch64/__asm_NTT.S pqclean_kyber768_aarch64/__asm_poly.S pqclean_kyber768_aarch64/cbd.c pqclean_kyber768_aarch64/fips202x2.c pqclean_kyber768_aarch64/indcpa.c pqclean_kyber768_aarch64/kem.c pqclean_kyber768_aarch64/neon_poly.c pqclean_kyber768_aarch64/neon_polyvec.c pqclean_kyber768_aarch64/neon_symmetric-shake.c pqclean_kyber768_aarch64/ntt.c pqclean_kyber768_aarch64/poly.c pqclean_kyber768_aarch64/polyvec.c pqclean_kyber768_aarch64/reduce.c pqclean_kyber768_aarch64/rejsample.c pqclean_kyber768_aarch64/symmetric-shake.c pqclean_kyber768_aarch64/verify.c) target_include_directories(kyber_768_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_kyber768_aarch64) target_include_directories(kyber_768_aarch64 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(kyber_768_aarch64 PRIVATE old_gas_syntax) + endif() set(_KYBER_OBJS ${_KYBER_OBJS} $) endif() @@ -90,6 +96,9 @@ if(OQS_ENABLE_KEM_kyber_1024_aarch64) add_library(kyber_1024_aarch64 OBJECT pqclean_kyber1024_aarch64/__asm_base_mul.S pqclean_kyber1024_aarch64/__asm_iNTT.S pqclean_kyber1024_aarch64/__asm_NTT.S pqclean_kyber1024_aarch64/__asm_poly.S pqclean_kyber1024_aarch64/cbd.c pqclean_kyber1024_aarch64/fips202x2.c pqclean_kyber1024_aarch64/indcpa.c pqclean_kyber1024_aarch64/kem.c pqclean_kyber1024_aarch64/neon_poly.c pqclean_kyber1024_aarch64/neon_polyvec.c pqclean_kyber1024_aarch64/neon_symmetric-shake.c pqclean_kyber1024_aarch64/ntt.c pqclean_kyber1024_aarch64/poly.c pqclean_kyber1024_aarch64/polyvec.c pqclean_kyber1024_aarch64/reduce.c pqclean_kyber1024_aarch64/rejsample.c pqclean_kyber1024_aarch64/symmetric-shake.c pqclean_kyber1024_aarch64/verify.c) target_include_directories(kyber_1024_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_kyber1024_aarch64) target_include_directories(kyber_1024_aarch64 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(kyber_1024_aarch64 PRIVATE old_gas_syntax) + endif() set(_KYBER_OBJS ${_KYBER_OBJS} $) endif() diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_NTT.S b/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_NTT.S index 7f376ecdc..bf693c560 100644 --- a/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_NTT.S +++ b/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_NTT.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_top .global _PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_top -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_top, %function #endif PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_top: @@ -173,7 +173,7 @@ _PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_top: .align 2 .global PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_bot .global _PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_bot -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_bot, %function #endif PQCLEAN_KYBER1024_AARCH64_asm_ntt_SIMD_bot: diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_base_mul.S b/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_base_mul.S index 94ba36b5b..3eed30512 100644 --- a/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_base_mul.S +++ b/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_base_mul.S @@ -6,7 +6,7 @@ .align 2 .global PQCLEAN_KYBER1024_AARCH64_asm_point_mul_extended .global _PQCLEAN_KYBER1024_AARCH64_asm_point_mul_extended -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER1024_AARCH64_asm_point_mul_extended, %function #endif PQCLEAN_KYBER1024_AARCH64_asm_point_mul_extended: @@ -73,7 +73,7 @@ _PQCLEAN_KYBER1024_AARCH64_asm_point_mul_extended: .align 2 .global PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul .global _PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul, %function #endif PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul: @@ -228,7 +228,7 @@ _PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul: .align 2 .global PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul_montgomery .global _PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul_montgomery -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul_montgomery, %function #endif PQCLEAN_KYBER1024_AARCH64_asm_asymmetric_mul_montgomery: diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_iNTT.S b/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_iNTT.S index 570105834..f7e83ab4a 100644 --- a/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_iNTT.S +++ b/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_iNTT.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_bot .global _PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_bot -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_bot, %function #endif PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_bot: @@ -90,7 +90,7 @@ _PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_bot: .align 2 .global PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_top .global _PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_top -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_top, %function #endif PQCLEAN_KYBER1024_AARCH64_asm_intt_SIMD_top: diff --git a/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_poly.S b/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_poly.S index 0be016328..34a38bbf8 100644 --- a/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_poly.S +++ b/src/kem/kyber/pqclean_kyber1024_aarch64/__asm_poly.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_KYBER1024_AARCH64_asm_add_reduce .global _PQCLEAN_KYBER1024_AARCH64_asm_add_reduce -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER1024_AARCH64_asm_add_reduce, %function #endif PQCLEAN_KYBER1024_AARCH64_asm_add_reduce: @@ -68,7 +68,7 @@ _PQCLEAN_KYBER1024_AARCH64_asm_add_reduce: .align 2 .global PQCLEAN_KYBER1024_AARCH64_asm_sub_reduce .global _PQCLEAN_KYBER1024_AARCH64_asm_sub_reduce -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER1024_AARCH64_asm_sub_reduce, %function #endif PQCLEAN_KYBER1024_AARCH64_asm_sub_reduce: @@ -132,7 +132,7 @@ _PQCLEAN_KYBER1024_AARCH64_asm_sub_reduce: .align 2 .global PQCLEAN_KYBER1024_AARCH64_asm_add_add_reduce .global _PQCLEAN_KYBER1024_AARCH64_asm_add_add_reduce -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER1024_AARCH64_asm_add_add_reduce, %function #endif PQCLEAN_KYBER1024_AARCH64_asm_add_add_reduce: diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/__asm_NTT.S b/src/kem/kyber/pqclean_kyber512_aarch64/__asm_NTT.S index 1abbca122..ada533ea9 100644 --- a/src/kem/kyber/pqclean_kyber512_aarch64/__asm_NTT.S +++ b/src/kem/kyber/pqclean_kyber512_aarch64/__asm_NTT.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_top .global _PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_top -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_top, %function #endif PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_top: @@ -173,7 +173,7 @@ _PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_top: .align 2 .global PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_bot .global _PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_bot -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_bot, %function #endif PQCLEAN_KYBER512_AARCH64_asm_ntt_SIMD_bot: diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/__asm_base_mul.S b/src/kem/kyber/pqclean_kyber512_aarch64/__asm_base_mul.S index 185ac20f4..a3d39f14d 100644 --- a/src/kem/kyber/pqclean_kyber512_aarch64/__asm_base_mul.S +++ b/src/kem/kyber/pqclean_kyber512_aarch64/__asm_base_mul.S @@ -6,7 +6,7 @@ .align 2 .global PQCLEAN_KYBER512_AARCH64_asm_point_mul_extended .global _PQCLEAN_KYBER512_AARCH64_asm_point_mul_extended -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER512_AARCH64_asm_point_mul_extended, %function #endif PQCLEAN_KYBER512_AARCH64_asm_point_mul_extended: @@ -73,7 +73,7 @@ _PQCLEAN_KYBER512_AARCH64_asm_point_mul_extended: .align 2 .global PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul .global _PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul, %function #endif PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul: @@ -228,7 +228,7 @@ _PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul: .align 2 .global PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul_montgomery .global _PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul_montgomery -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul_montgomery, %function #endif PQCLEAN_KYBER512_AARCH64_asm_asymmetric_mul_montgomery: diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/__asm_iNTT.S b/src/kem/kyber/pqclean_kyber512_aarch64/__asm_iNTT.S index c83694c0c..4a135e7fd 100644 --- a/src/kem/kyber/pqclean_kyber512_aarch64/__asm_iNTT.S +++ b/src/kem/kyber/pqclean_kyber512_aarch64/__asm_iNTT.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_bot .global _PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_bot -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_bot, %function #endif PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_bot: @@ -90,7 +90,7 @@ _PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_bot: .align 2 .global PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_top .global _PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_top -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_top, %function #endif PQCLEAN_KYBER512_AARCH64_asm_intt_SIMD_top: diff --git a/src/kem/kyber/pqclean_kyber512_aarch64/__asm_poly.S b/src/kem/kyber/pqclean_kyber512_aarch64/__asm_poly.S index 1be60ad1d..fa77b95b1 100644 --- a/src/kem/kyber/pqclean_kyber512_aarch64/__asm_poly.S +++ b/src/kem/kyber/pqclean_kyber512_aarch64/__asm_poly.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_KYBER512_AARCH64_asm_add_reduce .global _PQCLEAN_KYBER512_AARCH64_asm_add_reduce -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER512_AARCH64_asm_add_reduce, %function #endif PQCLEAN_KYBER512_AARCH64_asm_add_reduce: @@ -68,7 +68,7 @@ _PQCLEAN_KYBER512_AARCH64_asm_add_reduce: .align 2 .global PQCLEAN_KYBER512_AARCH64_asm_sub_reduce .global _PQCLEAN_KYBER512_AARCH64_asm_sub_reduce -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER512_AARCH64_asm_sub_reduce, %function #endif PQCLEAN_KYBER512_AARCH64_asm_sub_reduce: @@ -132,7 +132,7 @@ _PQCLEAN_KYBER512_AARCH64_asm_sub_reduce: .align 2 .global PQCLEAN_KYBER512_AARCH64_asm_add_add_reduce .global _PQCLEAN_KYBER512_AARCH64_asm_add_add_reduce -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER512_AARCH64_asm_add_add_reduce, %function #endif PQCLEAN_KYBER512_AARCH64_asm_add_add_reduce: diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/__asm_NTT.S b/src/kem/kyber/pqclean_kyber768_aarch64/__asm_NTT.S index 19aa03c31..bb2253eca 100644 --- a/src/kem/kyber/pqclean_kyber768_aarch64/__asm_NTT.S +++ b/src/kem/kyber/pqclean_kyber768_aarch64/__asm_NTT.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_top .global _PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_top -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_top, %function #endif PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_top: @@ -173,7 +173,7 @@ _PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_top: .align 2 .global PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_bot .global _PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_bot -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_bot, %function #endif PQCLEAN_KYBER768_AARCH64_asm_ntt_SIMD_bot: diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/__asm_base_mul.S b/src/kem/kyber/pqclean_kyber768_aarch64/__asm_base_mul.S index 1e9fb2649..2bbb228a9 100644 --- a/src/kem/kyber/pqclean_kyber768_aarch64/__asm_base_mul.S +++ b/src/kem/kyber/pqclean_kyber768_aarch64/__asm_base_mul.S @@ -6,7 +6,7 @@ .align 2 .global PQCLEAN_KYBER768_AARCH64_asm_point_mul_extended .global _PQCLEAN_KYBER768_AARCH64_asm_point_mul_extended -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER768_AARCH64_asm_point_mul_extended, %function #endif PQCLEAN_KYBER768_AARCH64_asm_point_mul_extended: @@ -73,7 +73,7 @@ _PQCLEAN_KYBER768_AARCH64_asm_point_mul_extended: .align 2 .global PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul .global _PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul, %function #endif PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul: @@ -228,7 +228,7 @@ _PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul: .align 2 .global PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul_montgomery .global _PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul_montgomery -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul_montgomery, %function #endif PQCLEAN_KYBER768_AARCH64_asm_asymmetric_mul_montgomery: diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/__asm_iNTT.S b/src/kem/kyber/pqclean_kyber768_aarch64/__asm_iNTT.S index e6fcc40f8..cce9aa712 100644 --- a/src/kem/kyber/pqclean_kyber768_aarch64/__asm_iNTT.S +++ b/src/kem/kyber/pqclean_kyber768_aarch64/__asm_iNTT.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_bot .global _PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_bot -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_bot, %function #endif PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_bot: @@ -90,7 +90,7 @@ _PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_bot: .align 2 .global PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_top .global _PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_top -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_top, %function #endif PQCLEAN_KYBER768_AARCH64_asm_intt_SIMD_top: diff --git a/src/kem/kyber/pqclean_kyber768_aarch64/__asm_poly.S b/src/kem/kyber/pqclean_kyber768_aarch64/__asm_poly.S index 00639591d..9d7816cc9 100644 --- a/src/kem/kyber/pqclean_kyber768_aarch64/__asm_poly.S +++ b/src/kem/kyber/pqclean_kyber768_aarch64/__asm_poly.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_KYBER768_AARCH64_asm_add_reduce .global _PQCLEAN_KYBER768_AARCH64_asm_add_reduce -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER768_AARCH64_asm_add_reduce, %function #endif PQCLEAN_KYBER768_AARCH64_asm_add_reduce: @@ -68,7 +68,7 @@ _PQCLEAN_KYBER768_AARCH64_asm_add_reduce: .align 2 .global PQCLEAN_KYBER768_AARCH64_asm_sub_reduce .global _PQCLEAN_KYBER768_AARCH64_asm_sub_reduce -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER768_AARCH64_asm_sub_reduce, %function #endif PQCLEAN_KYBER768_AARCH64_asm_sub_reduce: @@ -132,7 +132,7 @@ _PQCLEAN_KYBER768_AARCH64_asm_sub_reduce: .align 2 .global PQCLEAN_KYBER768_AARCH64_asm_add_add_reduce .global _PQCLEAN_KYBER768_AARCH64_asm_add_add_reduce -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_KYBER768_AARCH64_asm_add_add_reduce, %function #endif PQCLEAN_KYBER768_AARCH64_asm_add_add_reduce: diff --git a/src/kem/ntru/CMakeLists.txt b/src/kem/ntru/CMakeLists.txt index 770777383..05acd4124 100644 --- a/src/kem/ntru/CMakeLists.txt +++ b/src/kem/ntru/CMakeLists.txt @@ -9,6 +9,9 @@ if(OQS_ENABLE_KEM_ntru_hps2048509) add_library(ntru_hps2048509_clean OBJECT kem_ntru_hps2048509.c pqclean_ntruhps2048509_clean/cmov.c pqclean_ntruhps2048509_clean/crypto_sort_int32.c pqclean_ntruhps2048509_clean/kem.c pqclean_ntruhps2048509_clean/owcpa.c pqclean_ntruhps2048509_clean/pack3.c pqclean_ntruhps2048509_clean/packq.c pqclean_ntruhps2048509_clean/poly.c pqclean_ntruhps2048509_clean/poly_lift.c pqclean_ntruhps2048509_clean/poly_mod.c pqclean_ntruhps2048509_clean/poly_r2_inv.c pqclean_ntruhps2048509_clean/poly_rq_mul.c pqclean_ntruhps2048509_clean/poly_s3_inv.c pqclean_ntruhps2048509_clean/sample.c pqclean_ntruhps2048509_clean/sample_iid.c) target_include_directories(ntru_hps2048509_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntruhps2048509_clean) target_include_directories(ntru_hps2048509_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntru_hps2048509_clean PRIVATE old_gas_syntax) + endif() set(_NTRU_OBJS ${_NTRU_OBJS} $) endif() @@ -17,6 +20,9 @@ if(OQS_ENABLE_KEM_ntru_hps2048509_avx2) target_include_directories(ntru_hps2048509_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntruhps2048509_avx2) target_include_directories(ntru_hps2048509_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(ntru_hps2048509_avx2 PRIVATE -mavx2 -mbmi2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntru_hps2048509_avx2 PRIVATE old_gas_syntax) + endif() set(_NTRU_OBJS ${_NTRU_OBJS} $) endif() @@ -24,6 +30,9 @@ if(OQS_ENABLE_KEM_ntru_hps2048677) add_library(ntru_hps2048677_clean OBJECT kem_ntru_hps2048677.c pqclean_ntruhps2048677_clean/cmov.c pqclean_ntruhps2048677_clean/crypto_sort_int32.c pqclean_ntruhps2048677_clean/kem.c pqclean_ntruhps2048677_clean/owcpa.c pqclean_ntruhps2048677_clean/pack3.c pqclean_ntruhps2048677_clean/packq.c pqclean_ntruhps2048677_clean/poly.c pqclean_ntruhps2048677_clean/poly_lift.c pqclean_ntruhps2048677_clean/poly_mod.c pqclean_ntruhps2048677_clean/poly_r2_inv.c pqclean_ntruhps2048677_clean/poly_rq_mul.c pqclean_ntruhps2048677_clean/poly_s3_inv.c pqclean_ntruhps2048677_clean/sample.c pqclean_ntruhps2048677_clean/sample_iid.c) target_include_directories(ntru_hps2048677_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntruhps2048677_clean) target_include_directories(ntru_hps2048677_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntru_hps2048677_clean PRIVATE old_gas_syntax) + endif() set(_NTRU_OBJS ${_NTRU_OBJS} $) endif() @@ -32,6 +41,9 @@ if(OQS_ENABLE_KEM_ntru_hps2048677_avx2) target_include_directories(ntru_hps2048677_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntruhps2048677_avx2) target_include_directories(ntru_hps2048677_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(ntru_hps2048677_avx2 PRIVATE -mavx2 -mbmi2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntru_hps2048677_avx2 PRIVATE old_gas_syntax) + endif() set(_NTRU_OBJS ${_NTRU_OBJS} $) endif() @@ -39,6 +51,9 @@ if(OQS_ENABLE_KEM_ntru_hps4096821) add_library(ntru_hps4096821_clean OBJECT kem_ntru_hps4096821.c pqclean_ntruhps4096821_clean/cmov.c pqclean_ntruhps4096821_clean/crypto_sort_int32.c pqclean_ntruhps4096821_clean/kem.c pqclean_ntruhps4096821_clean/owcpa.c pqclean_ntruhps4096821_clean/pack3.c pqclean_ntruhps4096821_clean/packq.c pqclean_ntruhps4096821_clean/poly.c pqclean_ntruhps4096821_clean/poly_lift.c pqclean_ntruhps4096821_clean/poly_mod.c pqclean_ntruhps4096821_clean/poly_r2_inv.c pqclean_ntruhps4096821_clean/poly_rq_mul.c pqclean_ntruhps4096821_clean/poly_s3_inv.c pqclean_ntruhps4096821_clean/sample.c pqclean_ntruhps4096821_clean/sample_iid.c) target_include_directories(ntru_hps4096821_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntruhps4096821_clean) target_include_directories(ntru_hps4096821_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntru_hps4096821_clean PRIVATE old_gas_syntax) + endif() set(_NTRU_OBJS ${_NTRU_OBJS} $) endif() @@ -47,6 +62,9 @@ if(OQS_ENABLE_KEM_ntru_hps4096821_avx2) target_include_directories(ntru_hps4096821_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntruhps4096821_avx2) target_include_directories(ntru_hps4096821_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(ntru_hps4096821_avx2 PRIVATE -mavx2 -mbmi2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntru_hps4096821_avx2 PRIVATE old_gas_syntax) + endif() set(_NTRU_OBJS ${_NTRU_OBJS} $) endif() @@ -54,6 +72,9 @@ if(OQS_ENABLE_KEM_ntru_hps40961229) add_library(ntru_hps40961229_clean OBJECT kem_ntru_hps40961229.c pqclean_ntruhps40961229_clean/cmov.c pqclean_ntruhps40961229_clean/crypto_sort_int32.c pqclean_ntruhps40961229_clean/kem.c pqclean_ntruhps40961229_clean/owcpa.c pqclean_ntruhps40961229_clean/pack3.c pqclean_ntruhps40961229_clean/packq.c pqclean_ntruhps40961229_clean/poly.c pqclean_ntruhps40961229_clean/poly_lift.c pqclean_ntruhps40961229_clean/poly_mod.c pqclean_ntruhps40961229_clean/poly_r2_inv.c pqclean_ntruhps40961229_clean/poly_rq_mul.c pqclean_ntruhps40961229_clean/poly_s3_inv.c pqclean_ntruhps40961229_clean/sample.c pqclean_ntruhps40961229_clean/sample_iid.c) target_include_directories(ntru_hps40961229_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntruhps40961229_clean) target_include_directories(ntru_hps40961229_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntru_hps40961229_clean PRIVATE old_gas_syntax) + endif() set(_NTRU_OBJS ${_NTRU_OBJS} $) endif() @@ -61,6 +82,9 @@ if(OQS_ENABLE_KEM_ntru_hrss701) add_library(ntru_hrss701_clean OBJECT kem_ntru_hrss701.c pqclean_ntruhrss701_clean/cmov.c pqclean_ntruhrss701_clean/kem.c pqclean_ntruhrss701_clean/owcpa.c pqclean_ntruhrss701_clean/pack3.c pqclean_ntruhrss701_clean/packq.c pqclean_ntruhrss701_clean/poly.c pqclean_ntruhrss701_clean/poly_lift.c pqclean_ntruhrss701_clean/poly_mod.c pqclean_ntruhrss701_clean/poly_r2_inv.c pqclean_ntruhrss701_clean/poly_rq_mul.c pqclean_ntruhrss701_clean/poly_s3_inv.c pqclean_ntruhrss701_clean/sample.c pqclean_ntruhrss701_clean/sample_iid.c) target_include_directories(ntru_hrss701_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntruhrss701_clean) target_include_directories(ntru_hrss701_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntru_hrss701_clean PRIVATE old_gas_syntax) + endif() set(_NTRU_OBJS ${_NTRU_OBJS} $) endif() @@ -69,6 +93,9 @@ if(OQS_ENABLE_KEM_ntru_hrss701_avx2) target_include_directories(ntru_hrss701_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntruhrss701_avx2) target_include_directories(ntru_hrss701_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(ntru_hrss701_avx2 PRIVATE -mavx2 -mbmi2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntru_hrss701_avx2 PRIVATE old_gas_syntax) + endif() set(_NTRU_OBJS ${_NTRU_OBJS} $) endif() @@ -76,6 +103,9 @@ if(OQS_ENABLE_KEM_ntru_hrss1373) add_library(ntru_hrss1373_clean OBJECT kem_ntru_hrss1373.c pqclean_ntruhrss1373_clean/cmov.c pqclean_ntruhrss1373_clean/kem.c pqclean_ntruhrss1373_clean/owcpa.c pqclean_ntruhrss1373_clean/pack3.c pqclean_ntruhrss1373_clean/packq.c pqclean_ntruhrss1373_clean/poly.c pqclean_ntruhrss1373_clean/poly_lift.c pqclean_ntruhrss1373_clean/poly_mod.c pqclean_ntruhrss1373_clean/poly_r2_inv.c pqclean_ntruhrss1373_clean/poly_rq_mul.c pqclean_ntruhrss1373_clean/poly_s3_inv.c pqclean_ntruhrss1373_clean/sample.c pqclean_ntruhrss1373_clean/sample_iid.c) target_include_directories(ntru_hrss1373_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntruhrss1373_clean) target_include_directories(ntru_hrss1373_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntru_hrss1373_clean PRIVATE old_gas_syntax) + endif() set(_NTRU_OBJS ${_NTRU_OBJS} $) endif() diff --git a/src/kem/ntruprime/CMakeLists.txt b/src/kem/ntruprime/CMakeLists.txt index 316d4c593..9a772e4b6 100644 --- a/src/kem/ntruprime/CMakeLists.txt +++ b/src/kem/ntruprime/CMakeLists.txt @@ -9,6 +9,9 @@ if(OQS_ENABLE_KEM_ntruprime_ntrulpr653) add_library(ntruprime_ntrulpr653_clean OBJECT kem_ntruprime_ntrulpr653.c pqclean_ntrulpr653_clean/crypto_core_multsntrup653.c pqclean_ntrulpr653_clean/crypto_decode_256x16.c pqclean_ntrulpr653_clean/crypto_decode_256x2.c pqclean_ntrulpr653_clean/crypto_decode_653x1541.c pqclean_ntrulpr653_clean/crypto_decode_653x3.c pqclean_ntrulpr653_clean/crypto_decode_653xint16.c pqclean_ntrulpr653_clean/crypto_decode_653xint32.c pqclean_ntrulpr653_clean/crypto_encode_256x16.c pqclean_ntrulpr653_clean/crypto_encode_256x2.c pqclean_ntrulpr653_clean/crypto_encode_653x1541.c pqclean_ntrulpr653_clean/crypto_encode_653x1541round.c pqclean_ntrulpr653_clean/crypto_encode_653x3.c pqclean_ntrulpr653_clean/crypto_encode_653xint16.c pqclean_ntrulpr653_clean/crypto_sort_int32.c pqclean_ntrulpr653_clean/crypto_sort_uint32.c pqclean_ntrulpr653_clean/crypto_stream_aes256ctr.c pqclean_ntrulpr653_clean/crypto_verify_1025.c pqclean_ntrulpr653_clean/kem.c) target_include_directories(ntruprime_ntrulpr653_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntrulpr653_clean) target_include_directories(ntruprime_ntrulpr653_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_ntrulpr653_clean PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -17,6 +20,9 @@ if(OQS_ENABLE_KEM_ntruprime_ntrulpr653_avx2) target_include_directories(ntruprime_ntrulpr653_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntrulpr653_avx2) target_include_directories(ntruprime_ntrulpr653_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(ntruprime_ntrulpr653_avx2 PRIVATE -mavx2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_ntrulpr653_avx2 PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -24,6 +30,9 @@ if(OQS_ENABLE_KEM_ntruprime_ntrulpr761) add_library(ntruprime_ntrulpr761_clean OBJECT kem_ntruprime_ntrulpr761.c pqclean_ntrulpr761_clean/crypto_core_multsntrup761.c pqclean_ntrulpr761_clean/crypto_decode_256x16.c pqclean_ntrulpr761_clean/crypto_decode_256x2.c pqclean_ntrulpr761_clean/crypto_decode_761x1531.c pqclean_ntrulpr761_clean/crypto_decode_761x3.c pqclean_ntrulpr761_clean/crypto_decode_761xint16.c pqclean_ntrulpr761_clean/crypto_decode_761xint32.c pqclean_ntrulpr761_clean/crypto_encode_256x16.c pqclean_ntrulpr761_clean/crypto_encode_256x2.c pqclean_ntrulpr761_clean/crypto_encode_761x1531.c pqclean_ntrulpr761_clean/crypto_encode_761x1531round.c pqclean_ntrulpr761_clean/crypto_encode_761x3.c pqclean_ntrulpr761_clean/crypto_encode_761xint16.c pqclean_ntrulpr761_clean/crypto_sort_int32.c pqclean_ntrulpr761_clean/crypto_sort_uint32.c pqclean_ntrulpr761_clean/crypto_stream_aes256ctr.c pqclean_ntrulpr761_clean/crypto_verify_1167.c pqclean_ntrulpr761_clean/kem.c) target_include_directories(ntruprime_ntrulpr761_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntrulpr761_clean) target_include_directories(ntruprime_ntrulpr761_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_ntrulpr761_clean PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -32,6 +41,9 @@ if(OQS_ENABLE_KEM_ntruprime_ntrulpr761_avx2) target_include_directories(ntruprime_ntrulpr761_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntrulpr761_avx2) target_include_directories(ntruprime_ntrulpr761_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(ntruprime_ntrulpr761_avx2 PRIVATE -mavx2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_ntrulpr761_avx2 PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -39,6 +51,9 @@ if(OQS_ENABLE_KEM_ntruprime_ntrulpr857) add_library(ntruprime_ntrulpr857_clean OBJECT kem_ntruprime_ntrulpr857.c pqclean_ntrulpr857_clean/crypto_core_multsntrup857.c pqclean_ntrulpr857_clean/crypto_decode_256x16.c pqclean_ntrulpr857_clean/crypto_decode_256x2.c pqclean_ntrulpr857_clean/crypto_decode_857x1723.c pqclean_ntrulpr857_clean/crypto_decode_857x3.c pqclean_ntrulpr857_clean/crypto_decode_857xint16.c pqclean_ntrulpr857_clean/crypto_decode_857xint32.c pqclean_ntrulpr857_clean/crypto_encode_256x16.c pqclean_ntrulpr857_clean/crypto_encode_256x2.c pqclean_ntrulpr857_clean/crypto_encode_857x1723.c pqclean_ntrulpr857_clean/crypto_encode_857x1723round.c pqclean_ntrulpr857_clean/crypto_encode_857x3.c pqclean_ntrulpr857_clean/crypto_encode_857xint16.c pqclean_ntrulpr857_clean/crypto_sort_int32.c pqclean_ntrulpr857_clean/crypto_sort_uint32.c pqclean_ntrulpr857_clean/crypto_stream_aes256ctr.c pqclean_ntrulpr857_clean/crypto_verify_1312.c pqclean_ntrulpr857_clean/kem.c) target_include_directories(ntruprime_ntrulpr857_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntrulpr857_clean) target_include_directories(ntruprime_ntrulpr857_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_ntrulpr857_clean PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -47,6 +62,9 @@ if(OQS_ENABLE_KEM_ntruprime_ntrulpr857_avx2) target_include_directories(ntruprime_ntrulpr857_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntrulpr857_avx2) target_include_directories(ntruprime_ntrulpr857_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(ntruprime_ntrulpr857_avx2 PRIVATE -mavx2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_ntrulpr857_avx2 PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -54,6 +72,9 @@ if(OQS_ENABLE_KEM_ntruprime_ntrulpr1277) add_library(ntruprime_ntrulpr1277_clean OBJECT kem_ntruprime_ntrulpr1277.c pqclean_ntrulpr1277_clean/crypto_core_multsntrup1277.c pqclean_ntrulpr1277_clean/crypto_decode_1277x2627.c pqclean_ntrulpr1277_clean/crypto_decode_1277x3.c pqclean_ntrulpr1277_clean/crypto_decode_1277xint16.c pqclean_ntrulpr1277_clean/crypto_decode_1277xint32.c pqclean_ntrulpr1277_clean/crypto_decode_256x16.c pqclean_ntrulpr1277_clean/crypto_decode_256x2.c pqclean_ntrulpr1277_clean/crypto_encode_1277x2627.c pqclean_ntrulpr1277_clean/crypto_encode_1277x2627round.c pqclean_ntrulpr1277_clean/crypto_encode_1277x3.c pqclean_ntrulpr1277_clean/crypto_encode_1277xint16.c pqclean_ntrulpr1277_clean/crypto_encode_256x16.c pqclean_ntrulpr1277_clean/crypto_encode_256x2.c pqclean_ntrulpr1277_clean/crypto_sort_int32.c pqclean_ntrulpr1277_clean/crypto_sort_uint32.c pqclean_ntrulpr1277_clean/crypto_stream_aes256ctr.c pqclean_ntrulpr1277_clean/crypto_verify_1975.c pqclean_ntrulpr1277_clean/kem.c) target_include_directories(ntruprime_ntrulpr1277_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntrulpr1277_clean) target_include_directories(ntruprime_ntrulpr1277_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_ntrulpr1277_clean PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -62,6 +83,9 @@ if(OQS_ENABLE_KEM_ntruprime_ntrulpr1277_avx2) target_include_directories(ntruprime_ntrulpr1277_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_ntrulpr1277_avx2) target_include_directories(ntruprime_ntrulpr1277_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(ntruprime_ntrulpr1277_avx2 PRIVATE -mavx2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_ntrulpr1277_avx2 PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -69,6 +93,9 @@ if(OQS_ENABLE_KEM_ntruprime_sntrup653) add_library(ntruprime_sntrup653_clean OBJECT kem_ntruprime_sntrup653.c pqclean_sntrup653_clean/crypto_core_inv3sntrup653.c pqclean_sntrup653_clean/crypto_core_invsntrup653.c pqclean_sntrup653_clean/crypto_core_mult3sntrup653.c pqclean_sntrup653_clean/crypto_core_multsntrup653.c pqclean_sntrup653_clean/crypto_core_scale3sntrup653.c pqclean_sntrup653_clean/crypto_core_weightsntrup653.c pqclean_sntrup653_clean/crypto_core_wforcesntrup653.c pqclean_sntrup653_clean/crypto_decode_653x1541.c pqclean_sntrup653_clean/crypto_decode_653x3.c pqclean_sntrup653_clean/crypto_decode_653x4621.c pqclean_sntrup653_clean/crypto_decode_653xint16.c pqclean_sntrup653_clean/crypto_decode_653xint32.c pqclean_sntrup653_clean/crypto_encode_653x1541.c pqclean_sntrup653_clean/crypto_encode_653x1541round.c pqclean_sntrup653_clean/crypto_encode_653x3.c pqclean_sntrup653_clean/crypto_encode_653x4621.c pqclean_sntrup653_clean/crypto_encode_653xfreeze3.c pqclean_sntrup653_clean/crypto_encode_653xint16.c pqclean_sntrup653_clean/crypto_encode_int16.c pqclean_sntrup653_clean/crypto_sort_int32.c pqclean_sntrup653_clean/crypto_sort_uint32.c pqclean_sntrup653_clean/crypto_verify_897.c pqclean_sntrup653_clean/kem.c) target_include_directories(ntruprime_sntrup653_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_sntrup653_clean) target_include_directories(ntruprime_sntrup653_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_sntrup653_clean PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -77,6 +104,9 @@ if(OQS_ENABLE_KEM_ntruprime_sntrup653_avx2) target_include_directories(ntruprime_sntrup653_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_sntrup653_avx2) target_include_directories(ntruprime_sntrup653_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(ntruprime_sntrup653_avx2 PRIVATE -mavx2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_sntrup653_avx2 PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -84,6 +114,9 @@ if(OQS_ENABLE_KEM_ntruprime_sntrup761) add_library(ntruprime_sntrup761_clean OBJECT kem_ntruprime_sntrup761.c pqclean_sntrup761_clean/crypto_core_inv3sntrup761.c pqclean_sntrup761_clean/crypto_core_invsntrup761.c pqclean_sntrup761_clean/crypto_core_mult3sntrup761.c pqclean_sntrup761_clean/crypto_core_multsntrup761.c pqclean_sntrup761_clean/crypto_core_scale3sntrup761.c pqclean_sntrup761_clean/crypto_core_weightsntrup761.c pqclean_sntrup761_clean/crypto_core_wforcesntrup761.c pqclean_sntrup761_clean/crypto_decode_761x1531.c pqclean_sntrup761_clean/crypto_decode_761x3.c pqclean_sntrup761_clean/crypto_decode_761x4591.c pqclean_sntrup761_clean/crypto_decode_761xint16.c pqclean_sntrup761_clean/crypto_decode_761xint32.c pqclean_sntrup761_clean/crypto_encode_761x1531.c pqclean_sntrup761_clean/crypto_encode_761x1531round.c pqclean_sntrup761_clean/crypto_encode_761x3.c pqclean_sntrup761_clean/crypto_encode_761x4591.c pqclean_sntrup761_clean/crypto_encode_761xfreeze3.c pqclean_sntrup761_clean/crypto_encode_761xint16.c pqclean_sntrup761_clean/crypto_encode_int16.c pqclean_sntrup761_clean/crypto_sort_int32.c pqclean_sntrup761_clean/crypto_sort_uint32.c pqclean_sntrup761_clean/crypto_verify_1039.c pqclean_sntrup761_clean/kem.c) target_include_directories(ntruprime_sntrup761_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_sntrup761_clean) target_include_directories(ntruprime_sntrup761_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_sntrup761_clean PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -92,6 +125,9 @@ if(OQS_ENABLE_KEM_ntruprime_sntrup761_avx2) target_include_directories(ntruprime_sntrup761_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_sntrup761_avx2) target_include_directories(ntruprime_sntrup761_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(ntruprime_sntrup761_avx2 PRIVATE -mavx2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_sntrup761_avx2 PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -99,6 +135,9 @@ if(OQS_ENABLE_KEM_ntruprime_sntrup857) add_library(ntruprime_sntrup857_clean OBJECT kem_ntruprime_sntrup857.c pqclean_sntrup857_clean/crypto_core_inv3sntrup857.c pqclean_sntrup857_clean/crypto_core_invsntrup857.c pqclean_sntrup857_clean/crypto_core_mult3sntrup857.c pqclean_sntrup857_clean/crypto_core_multsntrup857.c pqclean_sntrup857_clean/crypto_core_scale3sntrup857.c pqclean_sntrup857_clean/crypto_core_weightsntrup857.c pqclean_sntrup857_clean/crypto_core_wforcesntrup857.c pqclean_sntrup857_clean/crypto_decode_857x1723.c pqclean_sntrup857_clean/crypto_decode_857x3.c pqclean_sntrup857_clean/crypto_decode_857x5167.c pqclean_sntrup857_clean/crypto_decode_857xint16.c pqclean_sntrup857_clean/crypto_decode_857xint32.c pqclean_sntrup857_clean/crypto_encode_857x1723.c pqclean_sntrup857_clean/crypto_encode_857x1723round.c pqclean_sntrup857_clean/crypto_encode_857x3.c pqclean_sntrup857_clean/crypto_encode_857x5167.c pqclean_sntrup857_clean/crypto_encode_857xfreeze3.c pqclean_sntrup857_clean/crypto_encode_857xint16.c pqclean_sntrup857_clean/crypto_encode_int16.c pqclean_sntrup857_clean/crypto_sort_int32.c pqclean_sntrup857_clean/crypto_sort_uint32.c pqclean_sntrup857_clean/crypto_verify_1184.c pqclean_sntrup857_clean/kem.c) target_include_directories(ntruprime_sntrup857_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_sntrup857_clean) target_include_directories(ntruprime_sntrup857_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_sntrup857_clean PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -107,6 +146,9 @@ if(OQS_ENABLE_KEM_ntruprime_sntrup857_avx2) target_include_directories(ntruprime_sntrup857_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_sntrup857_avx2) target_include_directories(ntruprime_sntrup857_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(ntruprime_sntrup857_avx2 PRIVATE -mavx2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_sntrup857_avx2 PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -114,6 +156,9 @@ if(OQS_ENABLE_KEM_ntruprime_sntrup1277) add_library(ntruprime_sntrup1277_clean OBJECT kem_ntruprime_sntrup1277.c pqclean_sntrup1277_clean/crypto_core_inv3sntrup1277.c pqclean_sntrup1277_clean/crypto_core_invsntrup1277.c pqclean_sntrup1277_clean/crypto_core_mult3sntrup1277.c pqclean_sntrup1277_clean/crypto_core_multsntrup1277.c pqclean_sntrup1277_clean/crypto_core_scale3sntrup1277.c pqclean_sntrup1277_clean/crypto_core_weightsntrup1277.c pqclean_sntrup1277_clean/crypto_core_wforcesntrup1277.c pqclean_sntrup1277_clean/crypto_decode_1277x2627.c pqclean_sntrup1277_clean/crypto_decode_1277x3.c pqclean_sntrup1277_clean/crypto_decode_1277x7879.c pqclean_sntrup1277_clean/crypto_decode_1277xint16.c pqclean_sntrup1277_clean/crypto_decode_1277xint32.c pqclean_sntrup1277_clean/crypto_encode_1277x2627.c pqclean_sntrup1277_clean/crypto_encode_1277x2627round.c pqclean_sntrup1277_clean/crypto_encode_1277x3.c pqclean_sntrup1277_clean/crypto_encode_1277x7879.c pqclean_sntrup1277_clean/crypto_encode_1277xfreeze3.c pqclean_sntrup1277_clean/crypto_encode_1277xint16.c pqclean_sntrup1277_clean/crypto_encode_int16.c pqclean_sntrup1277_clean/crypto_sort_int32.c pqclean_sntrup1277_clean/crypto_sort_uint32.c pqclean_sntrup1277_clean/crypto_verify_1847.c pqclean_sntrup1277_clean/kem.c) target_include_directories(ntruprime_sntrup1277_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_sntrup1277_clean) target_include_directories(ntruprime_sntrup1277_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_sntrup1277_clean PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() @@ -122,6 +167,9 @@ if(OQS_ENABLE_KEM_ntruprime_sntrup1277_avx2) target_include_directories(ntruprime_sntrup1277_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_sntrup1277_avx2) target_include_directories(ntruprime_sntrup1277_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(ntruprime_sntrup1277_avx2 PRIVATE -mavx2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(ntruprime_sntrup1277_avx2 PRIVATE old_gas_syntax) + endif() set(_NTRUPRIME_OBJS ${_NTRUPRIME_OBJS} $) endif() diff --git a/src/kem/saber/CMakeLists.txt b/src/kem/saber/CMakeLists.txt index 5fb02041c..3aa40db55 100644 --- a/src/kem/saber/CMakeLists.txt +++ b/src/kem/saber/CMakeLists.txt @@ -9,6 +9,9 @@ if(OQS_ENABLE_KEM_saber_lightsaber) add_library(saber_lightsaber_clean OBJECT kem_saber_lightsaber.c pqclean_lightsaber_clean/cbd.c pqclean_lightsaber_clean/kem.c pqclean_lightsaber_clean/pack_unpack.c pqclean_lightsaber_clean/poly.c pqclean_lightsaber_clean/poly_mul.c pqclean_lightsaber_clean/SABER_indcpa.c pqclean_lightsaber_clean/verify.c) target_include_directories(saber_lightsaber_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_lightsaber_clean) target_include_directories(saber_lightsaber_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(saber_lightsaber_clean PRIVATE old_gas_syntax) + endif() set(_SABER_OBJS ${_SABER_OBJS} $) endif() @@ -17,6 +20,9 @@ if(OQS_ENABLE_KEM_saber_lightsaber_avx2) target_include_directories(saber_lightsaber_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_lightsaber_avx2) target_include_directories(saber_lightsaber_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(saber_lightsaber_avx2 PRIVATE -mavx2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(saber_lightsaber_avx2 PRIVATE old_gas_syntax) + endif() set(_SABER_OBJS ${_SABER_OBJS} $) endif() @@ -24,6 +30,9 @@ if(OQS_ENABLE_KEM_saber_lightsaber_aarch64) add_library(saber_lightsaber_aarch64 OBJECT pqclean_lightsaber_aarch64/__asm_iNTT.S pqclean_lightsaber_aarch64/__asm_mul.S pqclean_lightsaber_aarch64/__asm_narrow.S pqclean_lightsaber_aarch64/__asm_NTT.S pqclean_lightsaber_aarch64/__asm_pack_unpack.S pqclean_lightsaber_aarch64/cbd.c pqclean_lightsaber_aarch64/fips202x2.c pqclean_lightsaber_aarch64/kem.c pqclean_lightsaber_aarch64/pack_unpack.c pqclean_lightsaber_aarch64/SABER_indcpa.c pqclean_lightsaber_aarch64/verify.c) target_include_directories(saber_lightsaber_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_lightsaber_aarch64) target_include_directories(saber_lightsaber_aarch64 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(saber_lightsaber_aarch64 PRIVATE old_gas_syntax) + endif() set(_SABER_OBJS ${_SABER_OBJS} $) endif() @@ -31,6 +40,9 @@ if(OQS_ENABLE_KEM_saber_saber) add_library(saber_saber_clean OBJECT kem_saber_saber.c pqclean_saber_clean/cbd.c pqclean_saber_clean/kem.c pqclean_saber_clean/pack_unpack.c pqclean_saber_clean/poly.c pqclean_saber_clean/poly_mul.c pqclean_saber_clean/SABER_indcpa.c pqclean_saber_clean/verify.c) target_include_directories(saber_saber_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_saber_clean) target_include_directories(saber_saber_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(saber_saber_clean PRIVATE old_gas_syntax) + endif() set(_SABER_OBJS ${_SABER_OBJS} $) endif() @@ -39,6 +51,9 @@ if(OQS_ENABLE_KEM_saber_saber_avx2) target_include_directories(saber_saber_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_saber_avx2) target_include_directories(saber_saber_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(saber_saber_avx2 PRIVATE -mavx2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(saber_saber_avx2 PRIVATE old_gas_syntax) + endif() set(_SABER_OBJS ${_SABER_OBJS} $) endif() @@ -46,6 +61,9 @@ if(OQS_ENABLE_KEM_saber_saber_aarch64) add_library(saber_saber_aarch64 OBJECT pqclean_saber_aarch64/__asm_iNTT.S pqclean_saber_aarch64/__asm_mul.S pqclean_saber_aarch64/__asm_narrow.S pqclean_saber_aarch64/__asm_NTT.S pqclean_saber_aarch64/__asm_pack_unpack.S pqclean_saber_aarch64/cbd.c pqclean_saber_aarch64/fips202x2.c pqclean_saber_aarch64/kem.c pqclean_saber_aarch64/pack_unpack.c pqclean_saber_aarch64/SABER_indcpa.c pqclean_saber_aarch64/verify.c) target_include_directories(saber_saber_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_saber_aarch64) target_include_directories(saber_saber_aarch64 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(saber_saber_aarch64 PRIVATE old_gas_syntax) + endif() set(_SABER_OBJS ${_SABER_OBJS} $) endif() @@ -53,6 +71,9 @@ if(OQS_ENABLE_KEM_saber_firesaber) add_library(saber_firesaber_clean OBJECT kem_saber_firesaber.c pqclean_firesaber_clean/cbd.c pqclean_firesaber_clean/kem.c pqclean_firesaber_clean/pack_unpack.c pqclean_firesaber_clean/poly.c pqclean_firesaber_clean/poly_mul.c pqclean_firesaber_clean/SABER_indcpa.c pqclean_firesaber_clean/verify.c) target_include_directories(saber_firesaber_clean PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_firesaber_clean) target_include_directories(saber_firesaber_clean PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(saber_firesaber_clean PRIVATE old_gas_syntax) + endif() set(_SABER_OBJS ${_SABER_OBJS} $) endif() @@ -61,6 +82,9 @@ if(OQS_ENABLE_KEM_saber_firesaber_avx2) target_include_directories(saber_firesaber_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_firesaber_avx2) target_include_directories(saber_firesaber_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(saber_firesaber_avx2 PRIVATE -mavx2 ) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(saber_firesaber_avx2 PRIVATE old_gas_syntax) + endif() set(_SABER_OBJS ${_SABER_OBJS} $) endif() @@ -68,6 +92,9 @@ if(OQS_ENABLE_KEM_saber_firesaber_aarch64) add_library(saber_firesaber_aarch64 OBJECT pqclean_firesaber_aarch64/__asm_iNTT.S pqclean_firesaber_aarch64/__asm_mul.S pqclean_firesaber_aarch64/__asm_narrow.S pqclean_firesaber_aarch64/__asm_NTT.S pqclean_firesaber_aarch64/__asm_pack_unpack.S pqclean_firesaber_aarch64/cbd.c pqclean_firesaber_aarch64/fips202x2.c pqclean_firesaber_aarch64/kem.c pqclean_firesaber_aarch64/pack_unpack.c pqclean_firesaber_aarch64/SABER_indcpa.c pqclean_firesaber_aarch64/verify.c) target_include_directories(saber_firesaber_aarch64 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_firesaber_aarch64) target_include_directories(saber_firesaber_aarch64 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(saber_firesaber_aarch64 PRIVATE old_gas_syntax) + endif() set(_SABER_OBJS ${_SABER_OBJS} $) endif() diff --git a/src/kem/saber/pqclean_firesaber_aarch64/__asm_NTT.S b/src/kem/saber/pqclean_firesaber_aarch64/__asm_NTT.S index d39cfa15e..ef83595fc 100644 --- a/src/kem/saber/pqclean_firesaber_aarch64/__asm_NTT.S +++ b/src/kem/saber/pqclean_firesaber_aarch64/__asm_NTT.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_top .global _PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_top -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_top, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_top: @@ -181,7 +181,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_top: .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_bot .global _PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_bot -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_bot, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_ntt_SIMD_bot: diff --git a/src/kem/saber/pqclean_firesaber_aarch64/__asm_iNTT.S b/src/kem/saber/pqclean_firesaber_aarch64/__asm_iNTT.S index 0b38928e9..6b022c2e9 100644 --- a/src/kem/saber/pqclean_firesaber_aarch64/__asm_iNTT.S +++ b/src/kem/saber/pqclean_firesaber_aarch64/__asm_iNTT.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_top .global _PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_top -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_top, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_top: @@ -150,7 +150,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_top: .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_bot .global _PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_bot -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_bot, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_intt_SIMD_bot: diff --git a/src/kem/saber/pqclean_firesaber_aarch64/__asm_mul.S b/src/kem/saber/pqclean_firesaber_aarch64/__asm_mul.S index e30a3f66d..0b1137959 100644 --- a/src/kem/saber/pqclean_firesaber_aarch64/__asm_mul.S +++ b/src/kem/saber/pqclean_firesaber_aarch64/__asm_mul.S @@ -5,7 +5,7 @@ .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_asymmetric_mul .global _PQCLEAN_FIRESABER_AARCH64_asm_asymmetric_mul -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_asymmetric_mul, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_asymmetric_mul: @@ -94,7 +94,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_asymmetric_mul: .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_point_mul_extended .global _PQCLEAN_FIRESABER_AARCH64_asm_point_mul_extended -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_point_mul_extended, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_point_mul_extended: diff --git a/src/kem/saber/pqclean_firesaber_aarch64/__asm_narrow.S b/src/kem/saber/pqclean_firesaber_aarch64/__asm_narrow.S index 1909c7da2..02217a9ab 100644 --- a/src/kem/saber/pqclean_firesaber_aarch64/__asm_narrow.S +++ b/src/kem/saber/pqclean_firesaber_aarch64/__asm_narrow.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_round .global _PQCLEAN_FIRESABER_AARCH64_asm_round -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_round, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_round: @@ -53,7 +53,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_round: .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_enc_add_msg .global _PQCLEAN_FIRESABER_AARCH64_asm_enc_add_msg -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_enc_add_msg, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_enc_add_msg: @@ -143,7 +143,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_enc_add_msg: .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_dec_get_msg .global _PQCLEAN_FIRESABER_AARCH64_asm_dec_get_msg -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_dec_get_msg, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_dec_get_msg: diff --git a/src/kem/saber/pqclean_firesaber_aarch64/__asm_pack_unpack.S b/src/kem/saber/pqclean_firesaber_aarch64/__asm_pack_unpack.S index f7864be89..d9722e249 100644 --- a/src/kem/saber/pqclean_firesaber_aarch64/__asm_pack_unpack.S +++ b/src/kem/saber/pqclean_firesaber_aarch64/__asm_pack_unpack.S @@ -2,7 +2,7 @@ .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_1_to_16 .global _PQCLEAN_FIRESABER_AARCH64_asm_1_to_16 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_1_to_16, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_1_to_16: @@ -47,7 +47,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_1_to_16: .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_4_to_16 .global _PQCLEAN_FIRESABER_AARCH64_asm_4_to_16 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_4_to_16, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_4_to_16: @@ -85,7 +85,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_4_to_16: .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_10_to_32 .global _PQCLEAN_FIRESABER_AARCH64_asm_10_to_32 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_10_to_32, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_10_to_32: @@ -161,7 +161,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_10_to_32: .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_13_to_32 .global _PQCLEAN_FIRESABER_AARCH64_asm_13_to_32 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_13_to_32, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_13_to_32: @@ -318,7 +318,7 @@ _PQCLEAN_FIRESABER_AARCH64_asm_13_to_32: .align 2 .global PQCLEAN_FIRESABER_AARCH64_asm_16_to_32 .global _PQCLEAN_FIRESABER_AARCH64_asm_16_to_32 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_FIRESABER_AARCH64_asm_16_to_32, %function #endif PQCLEAN_FIRESABER_AARCH64_asm_16_to_32: diff --git a/src/kem/saber/pqclean_lightsaber_aarch64/__asm_NTT.S b/src/kem/saber/pqclean_lightsaber_aarch64/__asm_NTT.S index eeef00da5..2a0da9ad4 100644 --- a/src/kem/saber/pqclean_lightsaber_aarch64/__asm_NTT.S +++ b/src/kem/saber/pqclean_lightsaber_aarch64/__asm_NTT.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_top .global _PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_top -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_top, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_top: @@ -181,7 +181,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_top: .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_bot .global _PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_bot -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_bot, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_ntt_SIMD_bot: diff --git a/src/kem/saber/pqclean_lightsaber_aarch64/__asm_iNTT.S b/src/kem/saber/pqclean_lightsaber_aarch64/__asm_iNTT.S index f33a18641..e65a47a75 100644 --- a/src/kem/saber/pqclean_lightsaber_aarch64/__asm_iNTT.S +++ b/src/kem/saber/pqclean_lightsaber_aarch64/__asm_iNTT.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_top .global _PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_top -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_top, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_top: @@ -150,7 +150,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_top: .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_bot .global _PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_bot -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_bot, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_intt_SIMD_bot: diff --git a/src/kem/saber/pqclean_lightsaber_aarch64/__asm_mul.S b/src/kem/saber/pqclean_lightsaber_aarch64/__asm_mul.S index 9be57de7c..1b00f7b46 100644 --- a/src/kem/saber/pqclean_lightsaber_aarch64/__asm_mul.S +++ b/src/kem/saber/pqclean_lightsaber_aarch64/__asm_mul.S @@ -5,7 +5,7 @@ .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_asymmetric_mul .global _PQCLEAN_LIGHTSABER_AARCH64_asm_asymmetric_mul -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_asymmetric_mul, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_asymmetric_mul: @@ -94,7 +94,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_asymmetric_mul: .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_point_mul_extended .global _PQCLEAN_LIGHTSABER_AARCH64_asm_point_mul_extended -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_point_mul_extended, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_point_mul_extended: diff --git a/src/kem/saber/pqclean_lightsaber_aarch64/__asm_narrow.S b/src/kem/saber/pqclean_lightsaber_aarch64/__asm_narrow.S index e44c53944..725fc430f 100644 --- a/src/kem/saber/pqclean_lightsaber_aarch64/__asm_narrow.S +++ b/src/kem/saber/pqclean_lightsaber_aarch64/__asm_narrow.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_round .global _PQCLEAN_LIGHTSABER_AARCH64_asm_round -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_round, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_round: @@ -53,7 +53,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_round: .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_enc_add_msg .global _PQCLEAN_LIGHTSABER_AARCH64_asm_enc_add_msg -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_enc_add_msg, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_enc_add_msg: @@ -143,7 +143,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_enc_add_msg: .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_dec_get_msg .global _PQCLEAN_LIGHTSABER_AARCH64_asm_dec_get_msg -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_dec_get_msg, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_dec_get_msg: diff --git a/src/kem/saber/pqclean_lightsaber_aarch64/__asm_pack_unpack.S b/src/kem/saber/pqclean_lightsaber_aarch64/__asm_pack_unpack.S index 1178015c5..e69dc5140 100644 --- a/src/kem/saber/pqclean_lightsaber_aarch64/__asm_pack_unpack.S +++ b/src/kem/saber/pqclean_lightsaber_aarch64/__asm_pack_unpack.S @@ -2,7 +2,7 @@ .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_1_to_16 .global _PQCLEAN_LIGHTSABER_AARCH64_asm_1_to_16 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_1_to_16, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_1_to_16: @@ -47,7 +47,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_1_to_16: .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_4_to_16 .global _PQCLEAN_LIGHTSABER_AARCH64_asm_4_to_16 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_4_to_16, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_4_to_16: @@ -85,7 +85,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_4_to_16: .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_10_to_32 .global _PQCLEAN_LIGHTSABER_AARCH64_asm_10_to_32 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_10_to_32, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_10_to_32: @@ -161,7 +161,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_10_to_32: .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_13_to_32 .global _PQCLEAN_LIGHTSABER_AARCH64_asm_13_to_32 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_13_to_32, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_13_to_32: @@ -318,7 +318,7 @@ _PQCLEAN_LIGHTSABER_AARCH64_asm_13_to_32: .align 2 .global PQCLEAN_LIGHTSABER_AARCH64_asm_16_to_32 .global _PQCLEAN_LIGHTSABER_AARCH64_asm_16_to_32 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_LIGHTSABER_AARCH64_asm_16_to_32, %function #endif PQCLEAN_LIGHTSABER_AARCH64_asm_16_to_32: diff --git a/src/kem/saber/pqclean_saber_aarch64/__asm_NTT.S b/src/kem/saber/pqclean_saber_aarch64/__asm_NTT.S index 2a00ba099..24b304a57 100644 --- a/src/kem/saber/pqclean_saber_aarch64/__asm_NTT.S +++ b/src/kem/saber/pqclean_saber_aarch64/__asm_NTT.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_top .global _PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_top -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_top, %function #endif PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_top: @@ -181,7 +181,7 @@ _PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_top: .align 2 .global PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_bot .global _PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_bot -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_bot, %function #endif PQCLEAN_SABER_AARCH64_asm_ntt_SIMD_bot: diff --git a/src/kem/saber/pqclean_saber_aarch64/__asm_iNTT.S b/src/kem/saber/pqclean_saber_aarch64/__asm_iNTT.S index e25fd8ef5..39e740f87 100644 --- a/src/kem/saber/pqclean_saber_aarch64/__asm_iNTT.S +++ b/src/kem/saber/pqclean_saber_aarch64/__asm_iNTT.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_SABER_AARCH64_asm_intt_SIMD_top .global _PQCLEAN_SABER_AARCH64_asm_intt_SIMD_top -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_intt_SIMD_top, %function #endif PQCLEAN_SABER_AARCH64_asm_intt_SIMD_top: @@ -150,7 +150,7 @@ _PQCLEAN_SABER_AARCH64_asm_intt_SIMD_top: .align 2 .global PQCLEAN_SABER_AARCH64_asm_intt_SIMD_bot .global _PQCLEAN_SABER_AARCH64_asm_intt_SIMD_bot -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_intt_SIMD_bot, %function #endif PQCLEAN_SABER_AARCH64_asm_intt_SIMD_bot: diff --git a/src/kem/saber/pqclean_saber_aarch64/__asm_mul.S b/src/kem/saber/pqclean_saber_aarch64/__asm_mul.S index 5b0a47152..f1728357c 100644 --- a/src/kem/saber/pqclean_saber_aarch64/__asm_mul.S +++ b/src/kem/saber/pqclean_saber_aarch64/__asm_mul.S @@ -5,7 +5,7 @@ .align 2 .global PQCLEAN_SABER_AARCH64_asm_asymmetric_mul .global _PQCLEAN_SABER_AARCH64_asm_asymmetric_mul -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_asymmetric_mul, %function #endif PQCLEAN_SABER_AARCH64_asm_asymmetric_mul: @@ -94,7 +94,7 @@ _PQCLEAN_SABER_AARCH64_asm_asymmetric_mul: .align 2 .global PQCLEAN_SABER_AARCH64_asm_point_mul_extended .global _PQCLEAN_SABER_AARCH64_asm_point_mul_extended -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_point_mul_extended, %function #endif PQCLEAN_SABER_AARCH64_asm_point_mul_extended: diff --git a/src/kem/saber/pqclean_saber_aarch64/__asm_narrow.S b/src/kem/saber/pqclean_saber_aarch64/__asm_narrow.S index cc967e45e..bb1120b74 100644 --- a/src/kem/saber/pqclean_saber_aarch64/__asm_narrow.S +++ b/src/kem/saber/pqclean_saber_aarch64/__asm_narrow.S @@ -4,7 +4,7 @@ .align 2 .global PQCLEAN_SABER_AARCH64_asm_round .global _PQCLEAN_SABER_AARCH64_asm_round -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_round, %function #endif PQCLEAN_SABER_AARCH64_asm_round: @@ -53,7 +53,7 @@ _PQCLEAN_SABER_AARCH64_asm_round: .align 2 .global PQCLEAN_SABER_AARCH64_asm_enc_add_msg .global _PQCLEAN_SABER_AARCH64_asm_enc_add_msg -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_enc_add_msg, %function #endif PQCLEAN_SABER_AARCH64_asm_enc_add_msg: @@ -143,7 +143,7 @@ _PQCLEAN_SABER_AARCH64_asm_enc_add_msg: .align 2 .global PQCLEAN_SABER_AARCH64_asm_dec_get_msg .global _PQCLEAN_SABER_AARCH64_asm_dec_get_msg -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_dec_get_msg, %function #endif PQCLEAN_SABER_AARCH64_asm_dec_get_msg: diff --git a/src/kem/saber/pqclean_saber_aarch64/__asm_pack_unpack.S b/src/kem/saber/pqclean_saber_aarch64/__asm_pack_unpack.S index f972b6666..a3a549b84 100644 --- a/src/kem/saber/pqclean_saber_aarch64/__asm_pack_unpack.S +++ b/src/kem/saber/pqclean_saber_aarch64/__asm_pack_unpack.S @@ -2,7 +2,7 @@ .align 2 .global PQCLEAN_SABER_AARCH64_asm_1_to_16 .global _PQCLEAN_SABER_AARCH64_asm_1_to_16 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_1_to_16, %function #endif PQCLEAN_SABER_AARCH64_asm_1_to_16: @@ -47,7 +47,7 @@ _PQCLEAN_SABER_AARCH64_asm_1_to_16: .align 2 .global PQCLEAN_SABER_AARCH64_asm_4_to_16 .global _PQCLEAN_SABER_AARCH64_asm_4_to_16 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_4_to_16, %function #endif PQCLEAN_SABER_AARCH64_asm_4_to_16: @@ -85,7 +85,7 @@ _PQCLEAN_SABER_AARCH64_asm_4_to_16: .align 2 .global PQCLEAN_SABER_AARCH64_asm_10_to_32 .global _PQCLEAN_SABER_AARCH64_asm_10_to_32 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_10_to_32, %function #endif PQCLEAN_SABER_AARCH64_asm_10_to_32: @@ -161,7 +161,7 @@ _PQCLEAN_SABER_AARCH64_asm_10_to_32: .align 2 .global PQCLEAN_SABER_AARCH64_asm_13_to_32 .global _PQCLEAN_SABER_AARCH64_asm_13_to_32 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_13_to_32, %function #endif PQCLEAN_SABER_AARCH64_asm_13_to_32: @@ -318,7 +318,7 @@ _PQCLEAN_SABER_AARCH64_asm_13_to_32: .align 2 .global PQCLEAN_SABER_AARCH64_asm_16_to_32 .global _PQCLEAN_SABER_AARCH64_asm_16_to_32 -#ifndef __clang__ +#if !defined(__clang__) && !defined(old_gas_syntax) .type PQCLEAN_SABER_AARCH64_asm_16_to_32, %function #endif PQCLEAN_SABER_AARCH64_asm_16_to_32: