make update

[openssl.git] / Configurations / 00-base-templates.conf

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 5c73ce35ade0a176ceb33e17ba5d80e240603ce4..1da5c5f0d04e209b699fe9091984c9882c2b9019 100644 (file)
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -14,11 +14,6 @@ my %targets=(
        thread_scheme   => "(unknown)", # Assume we don't know
        thread_defines  => [],
 
-       padlock_asm_src => "",
-       chacha_asm_src  => "chacha_enc.c",
-       poly1305_asm_src        => "",
-       keccak1600_asm_src      => "keccak1600.c",
-
        unistd          => "<unistd.h>",
        shared_target   => "",
        shared_cflag    => "",
@@ -32,8 +27,8 @@ my %targets=(
        build_scheme    => [ "unified", "unix" ],
        build_file      => "Makefile",
 
-       AR              => "ar",
-       ARFLAGS         => "r",
+       AR              => "(unused)",
+       ARFLAGS         => "(unused)",
        CC              => "cc",
        HASHBANGPERL    => "/usr/bin/env perl",
        RANLIB          => sub { which("$config{cross_compile_prefix}ranlib")
@@ -52,7 +47,7 @@ my %targets=(
 
        defines         =>
            sub {
-                my @defs = ();
+                my @defs = ( 'OPENSSL_BUILDING_OPENSSL' );
                 push @defs, "ZLIB" unless $disabled{zlib};
                 push @defs, "ZLIB_SHARED" unless $disabled{"zlib-dynamic"};
                 return [ @defs ];
@@ -71,7 +66,7 @@ my %targets=(
         template        => 1,
 
         AR              => "ar",
-        ARFLAGS         => "r",
+        ARFLAGS         => "qc",
         CC              => "cc",
         lflags          =>
             sub { $withargs{zlib_lib} ? "-L".$withargs{zlib_lib} : () },
@@ -151,80 +146,4 @@ my %targets=(
 
         perl_platform    => 'VMS',
     },
-
-    x86_asm => {
-       template        => 1,
-       padlock_asm_src => "e_padlock-x86.s",
-       chacha_asm_src  => "chacha-x86.s",
-       poly1305_asm_src=> "poly1305-x86.s",
-    },
-    x86_elf_asm => {
-       template        => 1,
-       inherit_from    => [ "x86_asm" ],
-    },
-    x86_64_asm => {
-       template        => 1,
-       padlock_asm_src => "e_padlock-x86_64.s",
-       chacha_asm_src  => "chacha-x86_64.s",
-       poly1305_asm_src=> "poly1305-x86_64.s",
-       keccak1600_asm_src      => "keccak1600-x86_64.s",
-    },
-    ia64_asm => {
-       template        => 1,
-       chacha_asm_src  => "chacha-ia64.S",
-       poly1305_asm_src=> "asm/poly1305-ia64.S",
-    },
-    sparcv9_asm => {
-       template        => 1,
-       poly1305_asm_src=> "poly1305-sparcv9.S",
-    },
-    sparcv8_asm => {
-       template        => 1,
-    },
-    alpha_asm => {
-       template        => 1,
-    },
-    mips32_asm => {
-       template        => 1,
-    },
-    mips64_asm => {
-       inherit_from    => [ "mips32_asm" ],
-       template        => 1,
-       poly1305_asm_src=> "poly1305-mips.S",
-    },
-    s390x_asm => {
-       template        => 1,
-       chacha_asm_src  => "chacha-s390x.S",
-       poly1305_asm_src=> "poly1305-s390x.S",
-       keccak1600_asm_src      => "keccak1600-s390x.S",
-    },
-    armv4_asm => {
-       template        => 1,
-       chacha_asm_src  => "chacha-armv4.S",
-       poly1305_asm_src=> "poly1305-armv4.S",
-       keccak1600_asm_src      => "keccak1600-armv4.S",
-    },
-    aarch64_asm => {
-       template        => 1,
-       chacha_asm_src  => "chacha-armv8.S",
-       poly1305_asm_src=> "poly1305-armv8.S",
-       keccak1600_asm_src      => "keccak1600-armv8.S",
-    },
-    parisc11_asm => {
-       template        => 1,
-    },
-    parisc20_64_asm => {
-       template        => 1,
-       inherit_from    => [ "parisc11_asm" ],
-    },
-    ppc32_asm => {
-       template        => 1,
-       chacha_asm_src  => "chacha-ppc.s",
-       poly1305_asm_src=> "poly1305-ppc.s poly1305-ppcfp.s",
-    },
-    ppc64_asm => {
-       inherit_from    => [ "ppc32_asm" ],
-       template        => 1,
-       keccak1600_asm_src      => "keccak1600-ppc64.s",
-    },
 );