Add a shared_target to the VC-common config
[openssl.git] / Configurations / 10-main.conf
index 4372d92614cf35c6e5feb5359d08dd4841e6f4d5..ecfbc9a91b697683216987b67035b03fb917ad8a 100644 (file)
@@ -1,9 +1,5 @@
 ## -*- mode: perl; -*-
 ## Standard openssl configuration targets.
-##
-## If you edit this file, run this command before committing
-##     make -f Makefile.in TABLE
-## This file is interpolated by the Configure script.
 
 %targets = (
 
@@ -53,7 +49,7 @@
         # with "Illegal mnemonic" error message.
         inherit_from     => [ "solaris-common", asm("x86_elf_asm") ],
         cc               => "gcc",
-        cflags           => add_before(" ", "-march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM"),
+        cflags           => add_before("-Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM"),
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3 -fomit-frame-pointer",
         thread_cflag     => "-pthread",
@@ -72,7 +68,7 @@
         #                                      <appro@fy.chalmers.se>
         inherit_from     => [ "solaris-common", asm("x86_64_asm") ],
         cc               => "gcc",
-        cflags           => add_before(" ", "-m64 -Wall -DL_ENDIAN"),
+        cflags           => add_before("-m64 -Wall -DL_ENDIAN"),
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
     "solaris-x86-cc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "cc",
-        cflags           => add_before(" ", "-xarch=generic -xstrconst -Xa -DL_ENDIAN"),
+        cflags           => add_before("-xarch=generic -xstrconst -Xa -DL_ENDIAN"),
         debug_cflags     => "-g",
         release_cflags   => "-xO5 -xregs=frameptr -xdepend -xbuiltin",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => add(" ", "-mt"),
-        ex_libs          => add(" ", "-lpthread"),
+        lflags           => add("-mt"),
+        ex_libs          => add("-lpthread"),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-KPIC",
         shared_ldflag    => "-G -dy -z text",
     "solaris64-x86_64-cc" => {
         inherit_from     => [ "solaris-common", asm("x86_64_asm") ],
         cc               => "cc",
-        cflags           => add_before(" ", "-xarch=generic64 -xstrconst -Xa -DL_ENDIAN"),
+        cflags           => add_before("-xarch=generic64 -xstrconst -Xa -DL_ENDIAN"),
         debug_cflags     => "-g",
         release_cflags   => "-xO5 -xdepend -xbuiltin",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => add(" ", "-mt"),
-        ex_libs          => add(" ", "-lpthread"),
+        lflags           => add("-mt"),
+        ex_libs          => add("-lpthread"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
         shared_cflag     => "-KPIC",
     "solaris-sparcv7-gcc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "gcc",
-        cflags           => add_before(" ", "-Wall -DB_ENDIAN -DBN_DIV2W"),
+        cflags           => add_before("-Wall -DB_ENDIAN -DBN_DIV2W"),
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
     },
     "solaris-sparcv8-gcc" => {
         inherit_from     => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ],
-        cflags           => add_before(" ", "-mcpu=v8"),
+        cflags           => add_before("-mcpu=v8"),
     },
     "solaris-sparcv9-gcc" => {
         # -m32 should be safe to add as long as driver recognizes
         # -mcpu=ultrasparc
         inherit_from     => [ "solaris-sparcv7-gcc", asm("sparcv9_asm") ],
-        cflags           => add_before(" ", "-m32 -mcpu=ultrasparc"),
+        cflags           => add_before("-m32 -mcpu=ultrasparc"),
         debug_cflags     => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__",
     },
     "solaris64-sparcv9-gcc" => {
     "solaris-sparcv7-cc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "cc",
-        cflags           => add_before(" ", "-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W"),
+        cflags           => add_before("-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W"),
         debug_cflags     => "-g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG",
         release_cflags   => "-xO5 -xdepend",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => add(" ", "-mt"),
-        ex_libs          => add(" ", "-lpthread"),
+        lflags           => add("-mt"),
+        ex_libs          => add("-lpthread"),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-KPIC",
         shared_ldflag    => "-G -dy -z text",
 ####
     "solaris-sparcv8-cc" => {
         inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv8_asm") ],
-        cflags           => add_before(" ", "-xarch=v8"),
+        cflags           => add_before("-xarch=v8"),
     },
     "solaris-sparcv9-cc" => {
         inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ],
-        cflags           => add_before(" ", "-xarch=v8plus -xtarget=ultra"),
+        cflags           => add_before("-xarch=v8plus -xtarget=ultra"),
     },
     "solaris64-sparcv9-cc" => {
         inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ],
-        cflags           => add_before(" ", "-xarch=v9 -xtarget=ultra"),
+        cflags           => add_before("-xarch=v9 -xtarget=ultra"),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_ldflag    => "-xarch=v9 -G -dy -z text",
         multilib         => "/64",
 #   more sense?
 # - Keep in mind that the HP compiler by default generates code
 #   suitable for execution on the host you're currently compiling at.
-#   If the toolkit is ment to be used on various PA-RISC processors
+#   If the toolkit is meant to be used on various PA-RISC processors
 #   consider './Configure hpux-parisc-[g]cc +DAportable'.
 # - -DMD32_XARRAY triggers workaround for compiler bug we ran into in
 #   32-bit message digests. (For the moment of this writing) HP C
 #   chew forever:-). For more details look-up MD32_XARRAY comment in
 #   crypto/sha/sha_lcl.h.
 # - originally there were 32-bit hpux-parisc2-* targets. They were
-#   scrapped, because a) they were not interchangable with other 32-bit
+#   scrapped, because a) they were not interchangeable with other 32-bit
 #   targets; a) when critical 32-bit assembly modules detect if they
 #   are executed on PA-RISC 2.0 and thus adequate performance is
 #   provided. 
     },
     "hpux-parisc1_1-cc" => {
         inherit_from     => [ "hpux-parisc-cc", asm("parisc11_asm") ],
-        cflags           => add_before(" ", "+DA1.1"),
+        cflags           => add_before("+DA1.1"),
         multilib         => "/pa1.1",
     },
     "hpux64-parisc2-cc" => {
     "linux-elf" => {
         inherit_from     => [ "linux-generic32", asm("x86_elf_asm") ],
         cc               => "gcc",
-        cflags           => "-march=i486 -DL_ENDIAN -Wall",
+        cflags           => "-DL_ENDIAN -Wall",
         debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG",
         release_cflags   => "-O3 -fomit-frame-pointer",
         debug_ex_libs    => "-lefence",
     "linux-aout" => {
         inherit_from     => [ asm("x86_asm") ],
         cc               => "gcc",
-        cflags           => "-DL_ENDIAN -march=i486 -Wall",
+        cflags           => "-DL_ENDIAN -Wall",
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3 -fomit-frame-pointer",
         thread_cflag     => "(unknown)",
     "android-armeabi" => {
         inherit_from     => [ "android", asm("armv4_asm") ],
     },
-    "android-armv7" => {
-        inherit_from     => [ "android-armeabi" ],
-        cflags           => add_before(" ", "-march=armv7-a"),
-    },
     "android-mips" => {
         inherit_from     => [ "android", asm("mips32_asm") ],
         perlasm_scheme   => "o32",
     "bsdi-elf-gcc" => {
         inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
-        cflags           => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall",
+        cflags           => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -Wall",
         thread_cflag     => "(unknown)",
         ex_libs          => "-ldl",
         bn_ops           => "BN_LLONG",
     "unixware-7-gcc" => {
         inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
-        cflags           => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall",
+        cflags           => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -Wall",
         thread_cflag     => "-D_REENTRANT",
         ex_libs          => "-lsocket -lnsl",
         bn_ops           => "BN_LLONG",
         template         => 1,
         cc               => "cl",
         cflags           => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE",
+        shared_target    => "win-shared", # meaningless except it gives Configure a hint
         dso_scheme       => "win32",
        build_scheme     => "mk1mf",
     },
     "VC-WIN64I" => {
         inherit_from     => [ "VC-common", asm("ia64_asm") ],
-        cflags           => add(" ", "-DUNICODE -D_UNICODE"),
+        cflags           => add("-DUNICODE -D_UNICODE"),
         sys_id           => "WIN64I",
         bn_ops           => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
         bn_obj           => sub { my $r=join(" ",@_); $r=~s/bn\-//; $r; },
     },
     "VC-WIN64A" => {
         inherit_from     => [ "VC-common", asm("x86_64_asm") ],
-        cflags           => add(" ", "-DUNICODE -D_UNICODE"),
+        cflags           => add("-DUNICODE -D_UNICODE"),
         sys_id           => "WIN64A",
         bn_ops           => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
         bn_obj           => sub { my $r=join(" ",@_); $r=~s/x86_64\-gcc/bn_asm/; $r; },
 #### MinGW
     "mingw" => {
         inherit_from     => [ asm("x86_asm"),
-                              sub { $config{no_shared} ? () : "x86_uplink" } ],
+                              sub { $disabled{shared} ? () : "x86_uplink" } ],
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m32 -Wall",
         debug_cflags     => "-g -O0",
         bn_ops           => "BN_LLONG EXPORT_VAR_AS_FN",
         perlasm_scheme   => "coff",
         dso_scheme       => "win32",
-        shared_target    => "cygwin-shared",
-        shared_cflag     => add(" ", "-D_WINDLL"),
+        shared_target    => "mingw-shared",
+        shared_cflag     => add("-D_WINDLL"),
         shared_ldflag    => "-static-libgcc",
         shared_rcflag    => "--target=pe-i386",
         shared_extension => ".dll",
+        multilib         => "",
     },
     "mingw64" => {
         # As for OPENSSL_USE_APPLINK. Applink makes it possible to use
         bn_ops           => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
         perlasm_scheme   => "mingw64",
         dso_scheme       => "win32",
-        shared_target    => "cygwin-shared",
-        shared_cflag     => add(" ", "-D_WINDLL"),
+        shared_target    => "mingw-shared",
+        shared_cflag     => add("-D_WINDLL"),
         shared_ldflag    => "-static-libgcc",
         shared_rcflag    => "--target=pe-x86-64",
         shared_extension => ".dll",
+        multilib         => "64",
     },
 
 #### UEFI
     "hurd-x86" => {
         inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
-        cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall",
+        cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -Wall",
         thread_cflag     => "-pthread",
         ex_libs          => "-ldl",
         bn_ops           => "BN_LLONG",
         release_lflags   => "/NODEBUG/NOTRACEBACK",
         shared_target    => "vms-shared",
 
-        apps_extra_src   => "vms_decc_init.c",
+        apps_aux_src     => "vms_decc_init.c",
         build_file       => "descrip.mms",
         build_scheme     => [ "unified", "VMS" ],
     },
     },
     "vms-alpha-P32" => {
        inherit_from     => [ "vms-alpha" ],
-       cflags           => add(" ", "/POINTER_SIZE=32"),
+       cflags           => add("/POINTER_SIZE=32"),
     },
     "vms-alpha-P64" => {
        inherit_from     => [ "vms-alpha" ],
-       cflags           => add(" ", "/POINTER_SIZE=64"),
+       cflags           => add("/POINTER_SIZE=64"),
     },
     "vms-ia64" => {
         inherit_from     => [ "vms-generic" ],
     },
     "vms-ia64-P32" => {
        inherit_from     => [ "vms-ia64" ],
-       cflags           => add(" ", "/POINTER_SIZE=32"),
+       cflags           => add("/POINTER_SIZE=32"),
     },
     "vms-ia64-P64" => {
        inherit_from     => [ "vms-ia64" ],
-       cflags           => add(" ", "/POINTER_SIZE=64"),
+       cflags           => add("/POINTER_SIZE=64"),
     },
 
 );