Add support for C++ in Configurations/unix-Makefile.tmpl

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

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index c28e4e1b515e3b23ff28f21e728299270573b17c..8bb4de75f90ce7099914702c18af8402d2146b3a 100644 (file)
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -91,6 +91,12 @@
         ar              => "lib",
         arflags         => "/nologo",
         aroutflag       => "/out:",
+        rc               => "rc",
+        rcoutflag        => "/fo",
+        mt              => "mt",
+        mtflags         => "-nologo",
+        mtinflag        => "-manifest ",
+        mtoutflag       => "-outputresource:",
 
         build_file      => "makefile",
         build_scheme    => [ "unified", "windows" ],
@@ -185,7 +191,7 @@
        bn_asm_src      => "asm/sparcv8plus.S sparcv9-mont.S sparcv9a-mont.S vis3-mont.S sparct4-mont.S sparcv9-gf2m.S",
        ec_asm_src      => "ecp_nistz256.c ecp_nistz256-sparcv9.S",
        des_asm_src     => "des_enc-sparc.S fcrypt_b.c dest4-sparcv9.S",
-       aes_asm_src     => "aes_core.c aes_cbc.c aes-sparcv9.S aest4-sparcv9.S",
+       aes_asm_src     => "aes_core.c aes_cbc.c aes-sparcv9.S aest4-sparcv9.S aesfx-sparcv9.S",
        md5_asm_src     => "md5-sparcv9.S",
        sha1_asm_src    => "sha1-sparcv9.S sha256-sparcv9.S sha512-sparcv9.S",
        cmll_asm_src    => "camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.S",
@@ -203,21 +209,22 @@
     alpha_asm => {
        template        => 1,
        cpuid_asm_src   => "alphacpuid.s",
-       bn_asm_src      => "bn_asm.c alpha-mont.s",
-       sha1_asm_src    => "sha1-alpha.s",
-       modes_asm_src   => "ghash-alpha.s",
+       bn_asm_src      => "bn_asm.c alpha-mont.S",
+       sha1_asm_src    => "sha1-alpha.S",
+       modes_asm_src   => "ghash-alpha.S",
        perlasm_scheme  => "void"
     },
     mips32_asm => {
        template        => 1,
-       bn_asm_src      => "bn-mips.s mips-mont.s",
+       bn_asm_src      => "bn-mips.S mips-mont.S",
        aes_asm_src     => "aes_cbc.c aes-mips.S",
        sha1_asm_src    => "sha1-mips.S sha256-mips.S",
     },
     mips64_asm => {
        inherit_from    => [ "mips32_asm" ],
        template        => 1,
-       sha1_asm_src    => add("sha512-mips.S")
+       sha1_asm_src    => add("sha512-mips.S"),
+       poly1305_asm_src=> "poly1305-mips.S",
     },
     s390x_asm => {
        template        => 1,
@@ -244,7 +251,7 @@
     },
     aarch64_asm => {
        template        => 1,
-       cpuid_asm_src   => "armcap.c arm64cpuid.S mem_clr.c",
+       cpuid_asm_src   => "armcap.c arm64cpuid.S",
        ec_asm_src      => "ecp_nistz256.c ecp_nistz256-armv8.S",
        bn_asm_src      => "bn_asm.c armv8-mont.S",
        aes_asm_src     => "aes_core.c aes_cbc.c aesv8-armx.S vpaes-armv8.S",
@@ -268,7 +275,7 @@
        inherit_from    => [ "parisc11_asm" ],
        perlasm_scheme  => "64",
     },
-    ppc64_asm => {
+    ppc32_asm => {
        template        => 1,
        cpuid_asm_src   => "ppccpuid.s ppccap.c",
        bn_asm_src      => "bn-ppc.s ppc-mont.s ppc64-mont.s",
@@ -278,8 +285,10 @@
        chacha_asm_src  => "chacha-ppc.s",
        poly1305_asm_src=> "poly1305-ppc.s poly1305-ppcfp.s",
     },
-    ppc32_asm => {
-       inherit_from    => [ "ppc64_asm" ],
-       template        => 1
+    ppc64_asm => {
+       inherit_from    => [ "ppc32_asm" ],
+       template        => 1,
+       ec_asm_src      => "ecp_nistz256.c ecp_nistz256-ppc64.s",
+
     },
 );