configure: introduce no-ecx to remove ECX related feature

This can effectively reduce the binary size for platforms
that don't need ECX feature(~100KB).

Signed-off-by: Yi Li <yi1.li@intel.com>

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20781)

1 files changed, 37 insertions, 16 deletions

diff --git a/crypto/ec/build.info b/crypto/ec/build.info
index e4799ad37a..6fd73e4573 100644
--- a/crypto/ec/build.info
+++ b/crypto/ec/build.info
@@ -3,9 +3,12 @@ IF[{- !$disabled{asm} -}]
   $ECASM_x86=ecp_nistz256.c ecp_nistz256-x86.S
   $ECDEF_x86=ECP_NISTZ256_ASM
 
-  $ECASM_x86_64=ecp_nistz256.c ecp_nistz256-x86_64.s x25519-x86_64.s
-  $ECDEF_x86_64=ECP_NISTZ256_ASM X25519_ASM
-
+  $ECASM_x86_64=ecp_nistz256.c ecp_nistz256-x86_64.s
+  $ECDEF_x86_64=ECP_NISTZ256_ASM
+  IF[{- !$disabled{'ecx'} -}]
+    $ECASM_x86_64=$ECASM_x86_64 x25519-x86_64.s
+    $ECDEF_x86_64=$ECDEF_x86_64 X25519_ASM
+  ENDIF
   $ECASM_ia64=
 
   $ECASM_sparcv9=ecp_nistz256.c ecp_nistz256-sparcv9.S
@@ -18,7 +21,10 @@ IF[{- !$disabled{asm} -}]
   $ECASM_mips32=
   $ECASM_mips64=
 
-  $ECASM_s390x=ecp_s390x_nistp.c ecx_s390x.c
+  $ECASM_s390x=ecp_s390x_nistp.c
+  IF[{- !$disabled{'ecx'} -}]
+    $ECASM_s390x=$ECASM_s390x ecx_s390x.c
+  ENDIF
   $ECDEF_s390x=S390X_EC_ASM
 
   $ECASM_armv4=ecp_nistz256.c ecp_nistz256-armv4.S
@@ -30,13 +36,18 @@ IF[{- !$disabled{asm} -}]
   $ECASM_parisc20_64=
 
   $ECASM_ppc32=
-  $ECASM_ppc64=ecp_nistz256.c ecp_ppc.c ecp_nistz256-ppc64.s x25519-ppc64.s
-  $ECDEF_ppc64=ECP_NISTZ256_ASM X25519_ASM
+  $ECASM_ppc64=ecp_nistz256.c ecp_ppc.c ecp_nistz256-ppc64.s
+  $ECDEF_ppc64=ECP_NISTZ256_ASM
   IF[{- !$disabled{'ec_nistp_64_gcc_128'} -}]
     $ECASM_ppc64=$ECASM_ppc64 ecp_nistp521-ppc64.s
     $ECDEF_ppc64=$ECDEF_ppc64 ECP_NISTP521_ASM
     INCLUDE[ecp_nistp521.o]=..
   ENDIF
+  IF[{- !$disabled{'ecx'} -}]
+    $ECASM_ppc64=$ECASM_ppc64 x25519-ppc64.s
+    $ECDEF_ppc64=$ECDEF_ppc64 X25519_ASM
+    INCLUDE[ecx_s390x.o]=..
+  ENDIF
 
   $ECASM_c64xplus=
 
@@ -49,22 +60,29 @@ IF[{- !$disabled{asm} -}]
 ENDIF
 
 $COMMON=ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c \
-        ec_curve.c ec_check.c ec_key.c ec_kmeth.c ecx_key.c ec_asn1.c \
+        ec_curve.c ec_check.c ec_key.c ec_kmeth.c ec_asn1.c \
         ec2_smpl.c \
         ecp_oct.c ec2_oct.c ec_oct.c ecdh_ossl.c \
-        ecdsa_ossl.c ecdsa_sign.c ecdsa_vrf.c curve25519.c \
-        curve448/f_generic.c curve448/scalar.c \
-        curve448/curve448_tables.c curve448/eddsa.c curve448/curve448.c \
-        $ECASM ec_backend.c ecx_backend.c ecdh_kdf.c curve448/arch_64/f_impl64.c \
-        curve448/arch_32/f_impl32.c
+        ecdsa_ossl.c ecdsa_sign.c ecdsa_vrf.c \
+        $ECASM ec_backend.c ecdh_kdf.c
+
+IF[{- !$disabled{'ecx'} -}]
+  $COMMON=$COMMON curve25519.c curve448/f_generic.c curve448/scalar.c \
+  curve448/arch_64/f_impl64.c ecx_backend.c curve448/arch_32/f_impl32.c \
+  curve448/curve448_tables.c curve448/eddsa.c curve448/curve448.c \
+  ecx_key.c
+ENDIF
 
 IF[{- !$disabled{'ec_nistp_64_gcc_128'} -}]
   $COMMON=$COMMON ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c
 ENDIF
 
-SOURCE[../../libcrypto]=$COMMON ec_ameth.c ec_pmeth.c ecx_meth.c \
+SOURCE[../../libcrypto]=$COMMON ec_ameth.c ec_pmeth.c \
                         ec_err.c eck_prn.c \
                         ec_deprecated.c ec_print.c
+IF[{- !$disabled{'ecx'} -}]
+  SOURCE[../../libcrypto]=ecx_meth.c
+ENDIF
 SOURCE[../../providers/libfips.a]=$COMMON
 
 # Implementations are now spread across several libraries, so the defines
@@ -90,9 +108,10 @@ GENERATE[ecp_nistz256-sparcv9.S]=asm/ecp_nistz256-sparcv9.pl
 INCLUDE[ecp_nistz256-sparcv9.o]=..
 
 INCLUDE[ecp_s390x_nistp.o]=..
-INCLUDE[ecx_s390x.o]=..
-INCLUDE[ecx_meth.o]=..
-INCLUDE[ecx_key.o]=..
+IF[{- !$disabled{'ecx'} -}]
+  INCLUDE[ecx_meth.o]=..
+  INCLUDE[ecx_key.o]=..
+ENDIF
 
 GENERATE[ecp_nistz256-armv4.S]=asm/ecp_nistz256-armv4.pl
 INCLUDE[ecp_nistz256-armv4.o]=..
@@ -102,5 +121,7 @@ GENERATE[ecp_nistz256-ppc64.s]=asm/ecp_nistz256-ppc64.pl
 
 GENERATE[ecp_nistp521-ppc64.s]=asm/ecp_nistp521-ppc64.pl
 
+IF[{- !$disabled{'ecx'} -}]
 GENERATE[x25519-x86_64.s]=asm/x25519-x86_64.pl
 GENERATE[x25519-ppc64.s]=asm/x25519-ppc64.pl
+ENDIF