Add whrlpool and camellia .s files to perlasm list

[openssl.git] / util / pl / unix.pl

diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index a15418705b4e75b637d4b96be9e89193861eba03..c975cb862fd8abde8d7d82724711cf6b5251c88d 100644 (file)
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -74,6 +74,12 @@ $bf_enc_src="";
          'aesni-sha256-x86_64' => 'crypto/aes',
           'rsaz-x86_64' => 'crypto/bn',
           'rsaz-avx2' => 'crypto/bn',
+         'aesni-mb-x86_64' => 'crypto/aes',
+         'sha1-mb-x86_64' => 'crypto/sha',
+         'sha256-mb-x86_64' => 'crypto/sha',
+         'ecp_nistz256-x86_64' => 'crypto/ec',
+         'wp-x86_64' => 'crypto/whrlpool',
+         'cmll-x86_64' => 'crypto/camellia',
          );
 
 # If I were feeling more clever, these could probably be extracted
@@ -84,6 +90,9 @@ sub platform_perlasm_compile_target
 
        for $p (keys %perl1)
                {
+# FIXME: export CC so rsaz-avx2 can test for it, since BSD make does
+# not export variables, unlike GNU make. But this also requires fixing
+# the .s.o rule to use CC!
                if ($target eq "\$(OBJ_D)/$p.o")
                        {
                        return << "EOF";
@@ -132,7 +141,7 @@ sub special_compile_target
                {
                return << "EOF";
 \$(TMP_D)/x86_64-gcc.o:        crypto/bn/asm/x86_64-gcc.c
-       \$(CC) \$(CFLAGS) -c -o \$@ crypto/bn/asm/x86_64-gcc.c
+       \$(CC) \$(LIB_CFLAGS) -c -o \$@ crypto/bn/asm/x86_64-gcc.c
 EOF
                }
        return undef;