From 94707b0b68a16e806d27a06d9297732045319197 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Sun, 16 Jun 2019 22:06:43 +0200
Subject: [PATCH] Move cmll_asm_src file information to build.info files

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)
---
 Configurations/00-base-templates.conf |  4 ----
 Configurations/README                 |  3 ---
 Configure                             |  1 -
 crypto/camellia/build.info            | 18 +++++++++++++++---
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 1cb6049045..168d776ba1 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -14,7 +14,6 @@ my %targets=(
 	thread_scheme	=> "(unknown)", # Assume we don't know
 	thread_defines	=> [],
 
-	cmll_asm_src	=> "camellia.c cmll_misc.c cmll_cbc.c",
 	modes_asm_src	=> "",
 	padlock_asm_src	=> "",
 	chacha_asm_src	=> "chacha_enc.c",
@@ -156,7 +155,6 @@ my %targets=(
 
     x86_asm => {
 	template	=> 1,
-	cmll_asm_src	=> "cmll-x86.s",
 	modes_asm_src	=> "ghash-x86.s",
 	padlock_asm_src	=> "e_padlock-x86.s",
 	chacha_asm_src	=> "chacha-x86.s",
@@ -168,7 +166,6 @@ my %targets=(
     },
     x86_64_asm => {
 	template	=> 1,
-	cmll_asm_src    => "cmll-x86_64.s cmll_misc.c",
 	modes_asm_src   => "ghash-x86_64.s aesni-gcm-x86_64.s",
 	padlock_asm_src => "e_padlock-x86_64.s",
 	chacha_asm_src	=> "chacha-x86_64.s",
@@ -183,7 +180,6 @@ my %targets=(
     },
     sparcv9_asm => {
 	template	=> 1,
-	cmll_asm_src    => "camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.S",
 	modes_asm_src   => "ghash-sparcv9.S",
 	poly1305_asm_src=> "poly1305-sparcv9.S",
     },
diff --git a/Configurations/README b/Configurations/README
index 3c47d4676d..664e8d86bd 100644
--- a/Configurations/README
+++ b/Configurations/README
@@ -240,9 +240,6 @@ In each table entry, the following keys are significant:
                                                 export vars as
                                                 accessor functions.
 
-        cmll_asm_src    => Assembler implementation of core CAMELLIA
-                           functions.
-                           Defaults to 'camellia.c cmll_misc.c cmll_cbc.c'
         modes_asm_src   => Assembler implementation of cipher modes,
                            currently the functions gcm_gmult_4bit and
                            gcm_ghash_4bit.
diff --git a/Configure b/Configure
index 256b060749..3a8ba0cd6b 100755
--- a/Configure
+++ b/Configure
@@ -3344,7 +3344,6 @@ sub print_table_entry
         "loutflag",
         "ex_libs",
         "bn_ops",
-        "cmll_asm_src",
         "modes_asm_src",
         "padlock_asm_src",
         "chacha_asm_src",
diff --git a/crypto/camellia/build.info b/crypto/camellia/build.info
index e36a19bd4d..8d74b9f095 100644
--- a/crypto/camellia/build.info
+++ b/crypto/camellia/build.info
@@ -1,7 +1,19 @@
 LIBS=../../libcrypto
-SOURCE[../../libcrypto]=\
-        cmll_ecb.c cmll_ofb.c cmll_cfb.c cmll_ctr.c \
-        {- $target{cmll_asm_src} -}
+
+$CMLLASM=camellia.c cmll_misc.c cmll_cbc.c
+IF[{- !$disabled{asm} -}]
+  $CMLLASM_x86=cmll-x86.s
+  $CMLLASM_x86_64=cmll-x86_64.s cmll_misc.c
+  $CMLLASM_sparcv9=camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.S
+
+  # Now that we have defined all the arch specific variables, use the
+  # appropriate one
+  IF[$CMLLASM_{- $target{asm_arch} -}]
+    $CMLLASM=$CMLLASM_{- $target{asm_arch} -}
+  ENDIF
+ENDIF
+
+SOURCE[../../libcrypto]=cmll_ecb.c cmll_ofb.c cmll_cfb.c cmll_ctr.c $CMLLASM
 
 GENERATE[cmll-x86.s]=asm/cmll-x86.pl \
         $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) \
-- 
2.34.1