sha/asm/keccak1600-armv4.pl: adapt for multi-platform.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index bd8fd39c7f6ef30c2d421ee20856200437a64a64..ffc5fe5d33a89bfcbd53c03bc4a1f1e27a3b560a 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -325,6 +325,7 @@ my @disablables = (
     "async",
     "autoalginit",
     "autoerrinit",
     "async",
     "autoalginit",
     "autoerrinit",

+    "autoload-config",

     "bf",
     "blake2",
     "camellia",
     "bf",
     "blake2",
     "camellia",


@@ -423,10 +424,10 @@ my %deprecated_disablables = (
     "ui" => "ui-console",
     );
 
     "ui" => "ui-console",
     );
 

-# All of the following is disabled by default (RC5 was enabled before 0.9.8):
+# All of the following are disabled by default:

 
 our %disabled = ( # "what"         => "comment"
 
 our %disabled = ( # "what"         => "comment"

-                  "asan"               => "default",
+                 "asan"                => "default",

                  "crypto-mdebug"       => "default",
                  "crypto-mdebug-backtrace" => "default",
                  "devcryptoeng"        => "default",
                  "crypto-mdebug"       => "default",
                  "crypto-mdebug-backtrace" => "default",
                  "devcryptoeng"        => "default",


@@ -1358,6 +1359,9 @@ unless ($disabled{asm}) {
        push @{$config{lib_defines}}, "SHA256_ASM" if ($target{sha1_asm_src} =~ /sha256/);
        push @{$config{lib_defines}}, "SHA512_ASM" if ($target{sha1_asm_src} =~ /sha512/);
     }
        push @{$config{lib_defines}}, "SHA256_ASM" if ($target{sha1_asm_src} =~ /sha256/);
        push @{$config{lib_defines}}, "SHA512_ASM" if ($target{sha1_asm_src} =~ /sha512/);
     }

+    if ($target{keccak1600_asm_src} ne $table{DEFAULTS}->{keccak1600_asm_src}) {
+       push @{$config{lib_defines}}, "KECCAK1600_ASM";
+    }

     if ($target{rc4_asm_src} ne $table{DEFAULTS}->{rc4_asm_src}) {
        push @{$config{lib_defines}}, "RC4_ASM";
     }
     if ($target{rc4_asm_src} ne $table{DEFAULTS}->{rc4_asm_src}) {
        push @{$config{lib_defines}}, "RC4_ASM";
     }


@@ -1476,7 +1480,6 @@ if ($strict_warnings)
 
        die "ERROR --strict-warnings requires gcc[>=4] or gcc-alike"
             unless $gccver >= 4;
 
        die "ERROR --strict-warnings requires gcc[>=4] or gcc-alike"
             unless $gccver >= 4;

-       $gcc_devteam_warn .= " -Wmisleading-indentation" if $gccver >= 6;

        foreach $wopt (split /\s+/, $gcc_devteam_warn)
                {
                push @{$config{cflags}}, $wopt
        foreach $wopt (split /\s+/, $gcc_devteam_warn)
                {
                push @{$config{cflags}}, $wopt


@@ -1631,7 +1634,9 @@ if ($builder eq "unified") {
        die "*** Couldn't find any of:\n", join("\n", @build_file_templates), "\n";
     }
     $config{build_file_templates}
        die "*** Couldn't find any of:\n", join("\n", @build_file_templates), "\n";
     }
     $config{build_file_templates}

-      = [ $build_file_template,
+      = [ cleanfile($srcdir, catfile("Configurations", "common0.tmpl"),
+                    $blddir),
+          $build_file_template,

           cleanfile($srcdir, catfile("Configurations", "common.tmpl"),
                     $blddir) ];
 
           cleanfile($srcdir, catfile("Configurations", "common.tmpl"),
                     $blddir) ];