Fix a few Configure errors
[openssl.git] / Configurations / 10-main.conf
index 840061f8bbe46491e466ad53890b54c210bfc99f..cddf268b6746e13b907da24d8bbf76896f2ff061 100644 (file)
 ## -*- 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.
+
+sub picker {
+    my %opts = @_;
+    return sub { add($opts{default} || (),
+                     $opts{$config{build_type}} || ())->(); }
+}
+
+sub threads {
+    my @flags = @_;
+    return sub { add($disabled{threads} ? () : @flags)->(); }
+}
+
+sub combine {
+    my @stuff = @_;
+    return sub { add(@stuff)->(); }
+}
+
+# Helper functions for the Windows configs
+my $vc_win64a_info = {};
+sub vc_win64a_info {
+    unless (%$vc_win64a_info) {
+        if (`nasm -v 2>NUL` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) {
+            $vc_win64a_info = { as        => "nasm",
+                                asflags   => "-f win64 -DNEAR -Ox -g",
+                                asoutflag => "-o" };
+        } else {
+            $vc_win64a_info = { as        => "ml64",
+                                asflags   => "/c /Cp /Cx /Zi",
+                                asoutflag => "/Fo" };
+        }
+    }
+    return $vc_win64a_info;
+}
+
+my $vc_wince_info = {};
+sub vc_wince_info {
+    unless (%$vc_wince_info) {
+        # sanity check
+        die '%OSVERSION% is not defined' if (!defined($ENV{'OSVERSION'}));
+        die '%PLATFORM% is not defined'  if (!defined($ENV{'PLATFORM'}));
+        die '%TARGETCPU% is not defined' if (!defined($ENV{'TARGETCPU'}));
+
+        #
+        # Idea behind this is to mimic flags set by eVC++ IDE...
+        #
+        my $wcevers = $ENV{'OSVERSION'};                    # WCENNN
+        die '%OSVERSION% value is insane'
+            if ($wcevers !~ /^WCE([1-9])([0-9]{2})$/);
+        my $wcecdefs = "-D_WIN32_WCE=$1$2 -DUNDER_CE=$1$2"; # -D_WIN32_WCE=NNN
+        my $wcelflag = "/subsystem:windowsce,$1.$2";        # ...,N.NN
+
+        my $wceplatf =  $ENV{'PLATFORM'};
+
+        $wceplatf =~ tr/a-z0-9 /A-Z0-9_/;
+        $wcecdefs .= " -DWCE_PLATFORM_$wceplatf";
+
+        my $wcetgt = $ENV{'TARGETCPU'};                     # just shorter name...
+      SWITCH: for($wcetgt) {
+          /^X86/        && do { $wcecdefs.=" -Dx86 -D_X86_ -D_i386_ -Di_386_";
+                                $wcelflag.=" /machine:X86";     last; };
+          /^ARMV4[IT]/  && do { $wcecdefs.=" -DARM -D_ARM_ -D$wcetgt";
+                                $wcecdefs.=" -DTHUMB -D_THUMB_" if($wcetgt=~/T$/);
+                                $wcecdefs.=" -QRarch4T -QRinterwork-return";
+                                $wcelflag.=" /machine:THUMB";   last; };
+          /^ARM/        && do { $wcecdefs.=" -DARM -D_ARM_ -D$wcetgt";
+                                $wcelflag.=" /machine:ARM";     last; };
+          /^MIPSIV/     && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
+                                $wcecdefs.=" -D_MIPS64 -QMmips4 -QMn32";
+                                $wcelflag.=" /machine:MIPSFPU"; last; };
+          /^MIPS16/     && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
+                                $wcecdefs.=" -DMIPSII -QMmips16";
+                                $wcelflag.=" /machine:MIPS16";  last; };
+          /^MIPSII/     && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
+                                $wcecdefs.=" -QMmips2";
+                                $wcelflag.=" /machine:MIPS";    last; };
+          /^R4[0-9]{3}/ && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000";
+                                $wcelflag.=" /machine:MIPS";    last; };
+          /^SH[0-9]/    && do { $wcecdefs.=" -D$wcetgt -D_${wcetgt}_ -DSHx";
+                                $wcecdefs.=" -Qsh4" if ($wcetgt =~ /^SH4/);
+                                $wcelflag.=" /machine:$wcetgt"; last; };
+          { $wcecdefs.=" -D$wcetgt -D_${wcetgt}_";
+            $wcelflag.=" /machine:$wcetgt";                     last; };
+      }
+
+        $vc_wince_info = { cflags => $wcecdefs,
+                           lflags => $wcelflag };
+    }
+    return $vc_wince_info;
+}
+
 
 %targets = (
 
 #### Basic configs that should work on any 32-bit box
     "gcc" => {
         cc               => "gcc",
-        cflags           => "",
-        debug_cflags     => "-O0 -g",
-        release_cflags   => "-O3",
-        thread_cflag     => "(unknown)",
+        cflags           => picker(debug   => "-O0 -g",
+                                   release => "-O3"),
+        thread_scheme    => "(unknown)",
         bn_ops           => "BN_LLONG",
     },
     "cc" => {
         cc               => "cc",
         cflags           => "-O",
-        thread_cflag     => "(unknown)",
+        thread_scheme    => "(unknown)",
     },
 
 #### VOS Configurations
     "vos-gcc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "gcc",
-        cflags           => "-Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN",
-        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG",
-        release_cflags   => "-O3",
-        thread_cflag     => "(unknown)",
+        cflags           => picker(default => "-Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN",
+                                   debug   => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG",
+                                   release => "-O3"),
+        thread_scheme    => "(unknown)",
         sys_id           => "VOS",
         lflags           => "-Wl,-map",
         bn_ops           => "BN_LLONG",
         shared_extension => ".so",
     },
 
-#### Solaros configurations
+#### Solaris configurations
     "solaris-common" => {
+        inherit_from     => [ "BASE_unix" ],
         template         => 1,
         cflags           => "-DFILIO_H",
-        ex_libs          => "-lresolv -lsocket -lnsl -ldl",
+        ex_libs          => add("-lresolv -lsocket -lnsl -ldl"),
         dso_scheme       => "dlfcn",
+        thread_scheme    => "pthreads",
         shared_target    => "solaris-shared",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
         # 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"),
-        debug_cflags     => "-O0 -g",
-        release_cflags   => "-O3 -fomit-frame-pointer",
-        thread_cflag     => "-pthread",
+        cflags           => add_before(picker(default => "-Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM",
+                                              debug   => "-O0 -g",
+                                              release => "-O3 -fomit-frame-pointer"),
+                                       threads("-pthread")),
         bn_ops           => "BN_LLONG",
         shared_cflag     => "-fPIC",
         shared_ldflag    => "-shared",
         #                                      <appro@fy.chalmers.se>
         inherit_from     => [ "solaris-common", asm("x86_64_asm") ],
         cc               => "gcc",
-        cflags           => add_before(" ", "-m64 -Wall -DL_ENDIAN"),
-        debug_cflags     => "-O0 -g",
-        release_cflags   => "-O3",
-        thread_cflag     => "-pthread",
+        cflags           => add_before(picker(default => "-m64 -Wall -DL_ENDIAN",
+                                              debug   => "-O0 -g",
+                                              release => "-O3"),
+                                       threads("-pthread")),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
         shared_cflag     => "-fPIC",
     "solaris-x86-cc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "cc",
-        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"),
+        cflags           => add_before(picker(default => "-xarch=generic -xstrconst -Xa -DL_ENDIAN",
+                                              debug   => "-g",
+                                              release => "-xO5 -xregs=frameptr -xdepend -xbuiltin"),
+                                       threads("-D_REENTRANT")),
+        lflags           => add(threads("-mt")),
+        ex_libs          => add(threads("-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"),
-        debug_cflags     => "-g",
-        release_cflags   => "-xO5 -xdepend -xbuiltin",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => add(" ", "-mt"),
-        ex_libs          => add(" ", "-lpthread"),
+        cflags           => add_before(picker(default => "-xarch=generic64 -xstrconst -Xa -DL_ENDIAN",
+                                              debug   => "-g",
+                                              release => "-xO5 -xdepend -xbuiltin"),
+                                       threads("-D_REENTRANT")),
+        thread_scheme    => "pthreads",
+        lflags           => add(threads("-mt")),
+        ex_libs          => add(threads("-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"),
-        debug_cflags     => "-O0 -g",
-        release_cflags   => "-O3",
-        thread_cflag     => "-pthread",
+        cflags           => add_before(picker(default => "-Wall -DB_ENDIAN -DBN_DIV2W",
+                                              debug   => "-O0 -g",
+                                              release => "-O3"),
+                                       threads("-pthread")),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-fPIC",
         shared_ldflag    => "-shared",
     },
     "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"),
-        debug_cflags     => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__",
+        cflags           => add_before(picker(default => "-m32 -mcpu=ultrasparc",
+                                              debug   => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__")),
     },
     "solaris64-sparcv9-gcc" => {
         inherit_from     => [ "solaris-sparcv9-gcc" ],
     "solaris-sparcv7-cc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "cc",
-        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"),
+        cflags           => add_before(picker(default => "-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W",
+                                              debug   => "-g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG",
+                                              release => "-xO5 -xdepend"),
+                                       threads("-D_REENTRANT")),
+        lflags           => add(threads("-mt")),
+        ex_libs          => add(threads("-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",
 #### IRIX 5.x configs
 # -mips2 flag is added by ./config when appropriate.
     "irix-gcc" => {
-        inherit_from     => [ asm("mips32_asm") ],
+        inherit_from     => [ "BASE_unix", asm("mips32_asm") ],
         cc               => "gcc",
-        cflags           => "-DB_ENDIAN",
-        debug_cflags     => "-g -O0",
-        release_cflags   => "-O3",
-        thread_cflag     => "(unknown)",
+        cflags           => picker(default => "-DB_ENDIAN",
+                                   debug   => "-g -O0",
+                                   release => "-O3"),
         bn_ops           => "BN_LLONG RC4_CHAR",
+        thread_scheme    => "(unknown)",
         perlasm_scheme   => "o32",
         dso_scheme       => "dlfcn",
         shared_target    => "irix-shared",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "irix-cc" => {
-        inherit_from     => [ asm("mips32_asm") ],
+        inherit_from     => [ "BASE_unix", asm("mips32_asm") ],
         cc               => "cc",
-        cflags           => "-use_readonly_const -DB_ENDIAN",
-        debug_cflags     => "-g -O0",
-        release_cflags   => "-O2",
-        thread_cflag     => "(unknown)",
+        cflags           => picker(default => "-use_readonly_const -DB_ENDIAN",
+                                   debug   => "-g -O0",
+                                   release => "-O2"),
         bn_ops           => "BN_LLONG RC4_CHAR",
+        thread_scheme    => "(unknown)",
         perlasm_scheme   => "o32",
         dso_scheme       => "dlfcn",
         shared_target    => "irix-shared",
 # Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke
 # './Configure irix-cc -o32' manually.
     "irix-mips3-gcc" => {
-        inherit_from     => [ asm("mips64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("mips64_asm") ],
         cc               => "gcc",
-        cflags           => "-mabi=n32 -DB_ENDIAN -DBN_DIV3W",
-        debug_cflags     => "-g -O0",
-        release_cflags   => "-O3",
-        thread_cflag     => "-D_SGI_MP_SOURCE -pthread",
+        cflags           => combine(picker(default => "-mabi=n32 -DB_ENDIAN -DBN_DIV3W",
+                                           debug   => "-g -O0",
+                                           release => "-O3"),
+                                    threads("-D_SGI_MP_SOURCE -pthread")),
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",
+        thread_scheme    => "pthreads",
         perlasm_scheme   => "n32",
         dso_scheme       => "dlfcn",
         shared_target    => "irix-shared",
         multilib         => "32",
     },
     "irix-mips3-cc" => {
-        inherit_from     => [ asm("mips64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("mips64_asm") ],
         cc               => "cc",
-        cflags           => "-n32 -mips3 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W",
-        debug_cflags     => "-g -O0",
-        release_cflags   => "-O2",
-        thread_cflag     => "-D_SGI_MP_SOURCE",
-        ex_libs          => "-lpthread",
+        cflags           => combine(picker(default => "-n32 -mips3 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W",
+                                           debug   => "-g -O0",
+                                           release => "-O2"),
+                                    threads("-D_SGI_MP_SOURCE")),
+        ex_libs          => add(threads("-lpthread")),
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",
+        thread_scheme    => "pthreads",
         perlasm_scheme   => "n32",
         dso_scheme       => "dlfcn",
         shared_target    => "irix-shared",
     },
     # N64 ABI builds.
     "irix64-mips4-gcc" => {
-        inherit_from     => [ asm("mips64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("mips64_asm") ],
         cc               => "gcc",
-        cflags           => "-mabi=64 -mips4 -DB_ENDIAN -DBN_DIV3W",
-        debug_cflags     => "-g -O0",
-        release_cflags   => "-O3",
-        thread_cflag     => "-D_SGI_MP_SOURCE",
+        cflags           => combine(picker(default => "-mabi=64 -mips4 -DB_ENDIAN -DBN_DIV3W",
+                                           debug   => "-g -O0",
+                                           release => "-O3"),
+                                    threads("-D_SGI_MP_SOURCE")),
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",
+        thread_scheme    => "pthreads",
         perlasm_scheme   => "64",
         dso_scheme       => "dlfcn",
         shared_target    => "irix-shared",
         multilib         => "64",
     },
     "irix64-mips4-cc" => {
-        inherit_from     => [ asm("mips64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("mips64_asm") ],
         cc               => "cc",
-        cflags           => "-64 -mips4 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W",
-        debug_cflags     => "-g -O0",
-        release_cflags   => "-O2",
-        thread_cflag     => "-D_SGI_MP_SOURCE",
-        ex_libs          => "-lpthread",
+        cflags           => combine(picker(default => "-64 -mips4 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W",
+                                           debug   => "-g -O0",
+                                           release => "-O2"),
+                                    threads("-D_SGI_MP_SOURCE")),
+        ex_libs          => add(threads("-lpthread")),
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",
+        thread_scheme    => "pthreads",
         perlasm_scheme   => "64",
         dso_scheme       => "dlfcn",
         shared_target    => "irix-shared",
 #   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. 
 #                                      <appro@fy.chalmers.se>
     "hpux-parisc-gcc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "gcc",
-        cflags           => "-DB_ENDIAN -DBN_DIV2W",
-        debug_cflags     => "-O0 -g",
-        release_cflags   => "-O3",
-        thread_cflag     => "-pthread",
-        ex_libs          => "-Wl,+s -ldld",
+        cflags           => combine(picker(default => "-DB_ENDIAN -DBN_DIV2W",
+                                           debug   => "-O0 -g",
+                                           release => "-O3"),
+                                    threads("-pthread")),
+        ex_libs          => add("-Wl,+s -ldld"),
         bn_ops           => "BN_LLONG",
+        thread_scheme    => "pthreads",
         dso_scheme       => "dl",
         shared_target    => "hpux-shared",
         shared_cflag     => "-fPIC",
         multilib         => "/pa1.1",
     },
     "hpux64-parisc2-gcc" => {
-        inherit_from     => [ asm("parisc20_64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("parisc20_64_asm") ],
         cc               => "gcc",
-        cflags           => "-DB_ENDIAN",
-        debug_cflags     => "-O0 -g",
-        release_cflags   => "-O3",
-        thread_cflag     => "-D_REENTRANT",
-        ex_libs          => "-ldl",
+        cflags           => combine(picker(default => "-DB_ENDIAN",
+                                           debug   => "-O0 -g",
+                                           release => "-O3"),
+                                    threads("-D_REENTRANT")),
+        ex_libs          => add("-ldl"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
+        thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         shared_cflag     => "-fpic",
     # Chris Ruemmler <ruemmler@cup.hp.com>
     # Kevin Steves <ks@hp.se>
     "hpux-parisc-cc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "cc",
-        cflags           => "+Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY",
-        debug_cflags      => "+O0 +d -g",
-        release_cflags   => "+O3",
-        thread_cflag     => "-D_REENTRANT",
-        ex_libs          => "-Wl,+s -ldld -lpthread",
+        cflags           => combine(picker(default => "+Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY",
+                                           debug   => "+O0 +d -g",
+                                           release => "+O3"),
+                                    threads("-D_REENTRANT")),
+        ex_libs          => add("-Wl,+s -ldld",threads("-lpthread")),
         bn_ops           => "RC4_CHAR",
+        thread_scheme    => "pthreads",
         dso_scheme       => "dl",
         shared_target    => "hpux-shared",
         shared_cflag     => "+Z",
     },
     "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" => {
-        inherit_from     => [ asm("parisc20_64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("parisc20_64_asm") ],
         cc               => "cc",
-        cflags           => "+DD64 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY",
-        debug_cflags      => "+O0 +d -g",
-        release_cflags   => "+O3",
-        thread_cflag     => "-D_REENTRANT",
-        ex_libs          => "-ldl -lpthread",
+        cflags           => combine(picker(default => "+DD64 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY",
+                                           debug   => "+O0 +d -g",
+                                           release => "+O3"),
+                                    threads("-D_REENTRANT")),
+        ex_libs          => add("-ldl",threads("-lpthread")),
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
+        thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         shared_cflag     => "+Z",
 
     # HP/UX IA-64 targets
     "hpux-ia64-cc" => {
-        inherit_from     => [ asm("ia64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("ia64_asm") ],
         cc               => "cc",
-        cflags           => "-Ae +DD32 +Olit=all -z -DB_ENDIAN",
-        debug_cflags     => "+O0 +d -g",
-        release_cflags   => "+O2",
-        thread_cflag     => "-D_REENTRANT",
-        ex_libs          => "-ldl -lpthread",
+        cflags           => combine(picker(default => "-Ae +DD32 +Olit=all -z -DB_ENDIAN",
+                                           debug   => "+O0 +d -g",
+                                           release => "+O2"),
+                                    threads("-D_REENTRANT")),
+        ex_libs          => add("-ldl",threads("-lpthread")),
         bn_ops           => "SIXTY_FOUR_BIT",
+        thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         shared_cflag     => "+Z",
     # Frank Geurts <frank.geurts@nl.abnamro.com> has patiently assisted
     # with debugging of the following config.
     "hpux64-ia64-cc" => {
-        inherit_from     => [ asm("ia64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("ia64_asm") ],
         cc               => "cc",
-        cflags           => "-Ae +DD64 +Olit=all -z -DB_ENDIAN",
-        debug_cflags     => "+O0 +d -g",
-        release_cflags   => "+O3",
-        thread_cflag     => "-D_REENTRANT",
-        ex_libs          => "-ldl -lpthread",
+        cflags           => combine(picker(default => "-Ae +DD64 +Olit=all -z -DB_ENDIAN",
+                                           debug   => "+O0 +d -g",
+                                           release => "+O3"),
+                                    threads("-D_REENTRANT")),
+        ex_libs          => add("-ldl", threads("-lpthread")),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
+        thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         shared_cflag     => "+Z",
     },
     # GCC builds...
     "hpux-ia64-gcc" => {
-        inherit_from     => [ asm("ia64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("ia64_asm") ],
         cc               => "gcc",
-        cflags           => "-DB_ENDIAN",
-        debug_cflags     => "-O0 -g",
-        release_cflags   => "-O3",
-        thread_cflag     => "-pthread",
-        ex_libs          => "-ldl",
+        cflags           => combine(picker(default => "-DB_ENDIAN",
+                                           debug   => "-O0 -g",
+                                           release => "-O3"),
+                                    threads("-pthread")),
+        ex_libs          => add("-ldl"),
         bn_ops           => "SIXTY_FOUR_BIT",
+        thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         shared_cflag     => "-fpic",
         multilib         => "/hpux32",
     },
     "hpux64-ia64-gcc" => {
-        inherit_from     => [ asm("ia64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("ia64_asm") ],
         cc               => "gcc",
-        cflags           => "-mlp64 -DB_ENDIAN",
-        debug_cflags     => "-O0 -g",
-        release_cflags   => "-O3",
-        thread_cflag     => "-pthread",
-        ex_libs          => "-ldl",
+        cflags           => combine(picker(default => "-mlp64 -DB_ENDIAN",
+                                           debug   => "-O0 -g",
+                                           release => "-O3"),
+                                    threads("-pthread")),
+        ex_libs          => add("-ldl"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
+        thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         shared_cflag     => "-fpic",
 
 #### HP MPE/iX http://jazz.external.hp.com/src/openssl/
     "MPE/iX-gcc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "gcc",
         cflags           => "-D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB",
-        thread_cflag     => "(unknown)",
         sys_id           => "MPE",
-        ex_libs          => "-L/SYSLOG/PUB -lsyslog -lsocket -lcurses",
+        ex_libs          => add("-L/SYSLOG/PUB -lsyslog -lsocket -lcurses"),
+        thread_scheme    => "(unknown)",
         bn_ops           => "BN_LLONG",
     },
 
 #### DEC Alpha OSF/1/Tru64 targets.
     "osf1-alpha-gcc" => {
-        inherit_from     => [ asm("alpha_asm") ],
+        inherit_from     => [ "BASE_unix", asm("alpha_asm") ],
         cc               => "gcc",
         cflags           => "-O3",
-        thread_cflag     => "(unknown)",
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
+        thread_scheme    => "(unknown)",
         dso_scheme       => "dlfcn",
         shared_target    => "alpha-osf1-shared",
         shared_extension => ".so",
     },
     "osf1-alpha-cc" => {
-        inherit_from     => [ asm("alpha_asm") ],
+        inherit_from     => [ "BASE_unix", asm("alpha_asm") ],
         cc               => "cc",
         cflags           => "-std1 -tune host -O4 -readonly_strings",
-        thread_cflag     => "(unknown)",
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
+        thread_scheme    => "(unknown)",
         dso_scheme       => "dlfcn",
         shared_target    => "alpha-osf1-shared",
         shared_extension => ".so",
     },
     "tru64-alpha-cc" => {
-        inherit_from     => [ asm("alpha_asm") ],
+        inherit_from     => [ "BASE_unix", asm("alpha_asm") ],
         cc               => "cc",
-        cflags           => "-std1 -tune host -fast -readonly_strings",
-        thread_cflag     => "-pthread",
+        cflags           => combine("-std1 -tune host -fast -readonly_strings",
+                                    threads("-pthread")),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
+        thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
         shared_target    => "alpha-osf1-shared",
         shared_ldflag    => "-msym",
 # *-generic* is endian-neutral target, but ./config is free to
 # throw in -D[BL]_ENDIAN, whichever appropriate...
     "linux-generic32" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "gcc",
-        cflags           => "-Wall",
-        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG",
-        release_cflags   => "-O3",
-        thread_cflag     => "-pthread",
-        ex_libs          => "-ldl",
+        cflags           => combine(picker(default => "-Wall",
+                                           debug   => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG",
+                                           release => "-O3"),
+                                    threads("-pthread")),
+        ex_libs          => add("-ldl"),
         bn_ops           => "BN_LLONG RC4_CHAR",
+        thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
         shared_target    => "linux-shared",
         shared_cflag     => "-fPIC",
     },
     "linux-ppc64" => {
         inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],
-        cflags           => "-m64 -Wall -DB_ENDIAN",
+        cflags           => add("-m64 -DB_ENDIAN"),
         perlasm_scheme   => "linux64",
         shared_ldflag    => "-m64",
         multilib         => "64",
     },
     "linux-ppc64le" => {
         inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],
-        cflags           => "-m64 -Wall -DL_ENDIAN",
+        cflags           => add("-m64 -DL_ENDIAN"),
         perlasm_scheme   => "linux64le",
         shared_ldflag    => "-m64",
     },
     },
     "linux-arm64ilp32" => {  # https://wiki.linaro.org/Platform/arm64-ilp32
         inherit_from     => [ "linux-generic32", asm("aarch64_asm") ],
-        cflags           => "-mabi=ilp32 -Wall",
+        cflags           => add("-mabi=ilp32"),
         bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR",
         perlasm_scheme   => "linux64",
         shared_ldflag    => "-mabi=ilp32",
         # Configure script adds minimally required -march for assembly
         # support, if no -march was specified at command line.
         inherit_from     => [ "linux-generic32", asm("mips32_asm") ],
-        cflags           => "-mabi=32 -Wall -DBN_DIV3W",
+        cflags           => add("-mabi=32 -DBN_DIV3W"),
         perlasm_scheme   => "o32",
         shared_ldflag    => "-mabi=32",
     },
     # specifications, MIPS32 and MIPS64, rather than to kernel bitness.
     "linux-mips64" => {
         inherit_from     => [ "linux-generic32", asm("mips64_asm") ],
-        cflags           => "-mabi=n32 -Wall -DBN_DIV3W",
+        cflags           => add("-mabi=n32 -DBN_DIV3W"),
         bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR",
         perlasm_scheme   => "n32",
         shared_ldflag    => "-mabi=n32",
     },
     "linux64-mips64" => {
         inherit_from     => [ "linux-generic64", asm("mips64_asm") ],
-        cflags           => "-mabi=64 -O3 -Wall -DBN_DIV3W",
+        cflags           => add("-mabi=64 -DBN_DIV3W"),
         perlasm_scheme   => "64",
         shared_ldflag    => "-mabi=64",
         multilib         => "64",
     #### IA-32 targets...
     "linux-elf" => {
         inherit_from     => [ "linux-generic32", asm("x86_elf_asm") ],
-        cc               => "gcc",
-        cflags           => "-march=i486 -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",
+        cflags           => add(picker(default => "-DL_ENDIAN",
+                                       release => "-fomit-frame-pointer")),
+        ex_libs          => add(picker(debug => "-lefence")),
         bn_ops           => "BN_LLONG",
     },
     "linux-aout" => {
-        inherit_from     => [ asm("x86_asm") ],
+        inherit_from     => [ "BASE_unix", asm("x86_asm") ],
         cc               => "gcc",
-        cflags           => "-DL_ENDIAN -march=i486 -Wall",
-        debug_cflags     => "-O0 -g",
-        release_cflags   => "-O3 -fomit-frame-pointer",
-        thread_cflag     => "(unknown)",
+        cflags           => add(picker(default => "-DL_ENDIAN -Wall",
+                                       debug   => "-O0 -g",
+                                       release => "-O3 -fomit-frame-pointer")),
         bn_ops           => "BN_LLONG",
+        thread_scheme    => "(unknown)",
         perlasm_scheme   => "a.out",
     },
 
     "linux-x86_64" => {
         inherit_from     => [ "linux-generic64", asm("x86_64_asm") ],
-        cflags           => "-m64 -DL_ENDIAN -Wall",
+        cflags           => add("-m64 -DL_ENDIAN"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
         shared_ldflag    => "-m64",
     "linux-x86_64-clang" => {
         inherit_from     => [ "linux-x86_64" ],
         cc               => "clang",
-        cflags           => "-m64 -DL_ENDIAN -Wall -Wextra -Qunused-arguments",
+        cflags           => add("-Wextra -Qunused-arguments"),
     },
     "linux-x32" => {
         inherit_from     => [ "linux-generic32", asm("x86_64_asm") ],
-        cflags           => "-mx32 -DL_ENDIAN -Wall",
+        cflags           => add("-mx32 -DL_ENDIAN"),
         bn_ops           => "SIXTY_FOUR_BIT",
         perlasm_scheme   => "elf",
         shared_ldflag    => "-mx32",
 
     "linux64-s390x" => {
         inherit_from     => [ "linux-generic64", asm("s390x_asm") ],
-        cflags           => "-m64 -Wall -DB_ENDIAN",
+        cflags           => add("-m64 -DB_ENDIAN"),
         perlasm_scheme   => "64",
         shared_ldflag    => "-m64",
         multilib         => "64",
         # sysdeps/s390/dl-procinfo.c affecting ldconfig and ld.so.1...
         #
         inherit_from     => [ "linux-generic32", asm("s390x_asm") ],
-        cflags           => "-m31 -Wall -Wa,-mzarch -DB_ENDIAN",
+        cflags           => add("-m31 -Wa,-mzarch -DB_ENDIAN"),
         bn_obj           => sub { my $r=join(" ",@_); $r=~s/bn\-s390x/bn_asm/; $r; },
         perlasm_scheme   => "31",
         shared_ldflag    => "-m31",
     # patiently assisted with debugging of following two configs.
     "linux-sparcv8" => {
         inherit_from     => [ "linux-generic32", asm("sparcv8_asm") ],
-        cflags           => "-mcpu=v8 -Wall -DB_ENDIAN -DBN_DIV2W",
+        cflags           => add("-mcpu=v8 -DB_ENDIAN -DBN_DIV2W"),
     },
     "linux-sparcv9" => {
         # it's a real mess with -mcpu=ultrasparc option under Linux,
         # but -Wa,-Av8plus should do the trick no matter what.
         inherit_from     => [ "linux-generic32", asm("sparcv9_asm") ],
-        cflags           => "-m32 -mcpu=ultrasparc -Wall -Wa,-Av8plus -DB_ENDIAN -DBN_DIV2W",
+        cflags           => add("-m32 -mcpu=ultrasparc -Wa,-Av8plus -DB_ENDIAN -DBN_DIV2W"),
         shared_ldflag    => "-m32",
     },
     "linux64-sparcv9" => {
         # GCC 3.1 is a requirement
         inherit_from     => [ "linux-generic64", asm("sparcv9_asm") ],
-        cflags           => "-m64 -mcpu=ultrasparc -Wall -DB_ENDIAN",
+        cflags           => add("-m64 -mcpu=ultrasparc -DB_ENDIAN"),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_ldflag    => "-m64",
         multilib         => "64",
 
     "linux-alpha-gcc" => {
         inherit_from     => [ "linux-generic64", asm("alpha_asm") ],
-        cflags           => "-DL_ENDIAN",
+        cflags           => add("-DL_ENDIAN"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
     },
     "linux-c64xplus" => {
+        inherit_from     => [ "BASE_unix" ],
         # TI_CGT_C6000_7.3.x is a requirement
         cc               => "cl6x",
-        cflags           => "--linux -ea=.s -eo=.o -mv6400+ -o2 -ox -ms -pden -DOPENSSL_SMALL_FOOTPRINT",
-        thread_cflag     => "-D_REENTRANT",
+        cflags           => combine("--linux -ea=.s -eo=.o -mv6400+ -o2 -ox -ms -pden -DOPENSSL_SMALL_FOOTPRINT",
+                                    threads("-D_REENTRANT")),
         bn_ops           => "BN_LLONG",
         cpuid_asm_src    => "c64xpluscpuid.s",
         bn_asm_src       => "asm/bn-c64xplus.asm c64xplus-gf2m.s",
         modes_asm_src    => "ghash-c64xplus.s",
         chacha_asm_src   => "chacha-c64xplus.s",
         poly1305_asm_src => "poly1305-c64xplus.s",
+        thread_scheme    => "pthreads",
         perlasm_scheme   => "void",
         dso_scheme       => "dlfcn",
         shared_target    => "linux-shared",
         # systems are perfectly capable of executing binaries targeting
         # Froyo. Keep in mind that in the nutshell Android builds are
         # about JNI, i.e. shared libraries, not applications.
-        cflags           => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall",
-        debug_cflags     => "-O0 -g",
+        cflags           => picker(default => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall",
+                                   debug   => "-O0 -g",
+                                   release => "-O3"),
         lflags           => "-pie",
-        ex_libs          => "-ldl",
         shared_cflag     => "",
     },
     "android-x86" => {
         inherit_from     => [ "android", asm("x86_asm") ],
-        release_cflags   => "-O3 -fomit-frame-pointer",
+        cflags           => add(picker(release => "-fomit-frame-pointer")),
         bn_ops           => "BN_LLONG",
         perlasm_scheme   => "android",
     },
     "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",
 
     "android64" => {
         inherit_from     => [ "linux-generic64" ],
-        cflags           => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall",
-        debug_cflags     => "-O0 -g",
+        cflags           => picker(default => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall",
+                                   debug   => "-O0 -g",
+                                   release => "-O3"),
         lflags           => "-pie",
-        ex_libs          => "-ldl",
         shared_cflag     => "",
     },
     "android64-aarch64" => {
 
 #### *BSD
     "BSD-generic32" => {
-        # As for thread_cflag. Idea is to maintain "collective" set of
+        # As for thread cflag. Idea is to maintain "collective" set of
         # flags, which would cover all BSD flavors. -pthread applies
         # to them all, but is treated differently. OpenBSD expands is
         # as -D_POSIX_THREAD -lc_r, which is sufficient. FreeBSD 4.x
         # expands it as -lc_r, which has to be accompanied by explicit
         # -D_THREAD_SAFE and sometimes -D_REENTRANT. FreeBSD 5.x
         # expands it as -lc_r, which seems to be sufficient?
+        inherit_from     => [ "BASE_unix" ],
         cc               => "cc",
-        cflags           => "-Wall",
-        debug_cflags     => "-O0 -g",
-        release_cflags   => "-O3",
-        thread_cflag     => "-pthread -D_THREAD_SAFE -D_REENTRANT",
+        cflags           => combine(picker(default => "-Wall",
+                                           debug   => "-O0 -g",
+                                           release => "-O3"),
+                                    threads("-pthread -D_THREAD_SAFE -D_REENTRANT")),
         bn_ops           => "BN_LLONG",
+        thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
         shared_cflag     => "-fPIC",
 
     "BSD-x86" => {
         inherit_from     => [ "BSD-generic32", asm("x86_asm") ],
-        cflags           => "-DL_ENDIAN -Wall",
-        release_cflags   => "-O3 -fomit-frame-pointer",
+        cflags           => add(picker(default => "-DL_ENDIAN",
+                                       release => "-fomit-frame-pointer")),
         bn_ops           => "BN_LLONG",
         shared_target    => "bsd-shared",
         perlasm_scheme   => "a.out",
 
     "BSD-sparcv8" => {
         inherit_from     => [ "BSD-generic32", asm("sparcv8_asm") ],
-        cflags           => "-mcpu=v8 -Wall -DB_ENDIAN",
+        cflags           => add("-mcpu=v8 -DB_ENDIAN"),
     },
     "BSD-sparc64" => {
         # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
         # simply *happens* to work around a compiler bug in gcc 3.3.3,
         # triggered by RIPEMD160 code.
         inherit_from     => [ "BSD-generic64", asm("sparcv9_asm") ],
-        cflags           => "-DB_ENDIAN -DMD32_REG_T=int -Wall",
+        cflags           => add("-DB_ENDIAN -DMD32_REG_T=int"),
         bn_ops           => "BN_LLONG",
     },
 
     "BSD-ia64" => {
         inherit_from     => [ "BSD-generic64", asm("ia64_asm") ],
-        cflags           => "-DL_ENDIAN -Wall",
+        cflags           => add_before("-DL_ENDIAN"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
     },
 
     "BSD-x86_64" => {
         inherit_from     => [ "BSD-generic64", asm("x86_64_asm") ],
-        cflags           => "-DL_ENDIAN -Wall",
+        cflags           => add_before("-DL_ENDIAN"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
     },
 
     "bsdi-elf-gcc" => {
-        inherit_from     => [ asm("x86_elf_asm") ],
+        inherit_from     => [ "BASE_unix", asm("x86_elf_asm") ],
         cc               => "gcc",
-        cflags           => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall",
-        thread_cflag     => "(unknown)",
-        ex_libs          => "-ldl",
+        cflags           => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -Wall",
+        ex_libs          => add("-ldl"),
         bn_ops           => "BN_LLONG",
+        thread_scheme    => "(unknown)",
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
         shared_cflag     => "-fPIC",
     },
 
     "nextstep" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "cc",
         cflags           => "-O -Wall",
         unistd           => "<libc.h>",
-        thread_cflag     => "(unknown)",
         bn_ops           => "BN_LLONG",
+        thread_scheme    => "(unknown)",
     },
     "nextstep3.3" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "cc",
         cflags           => "-O3 -Wall",
         unistd           => "<libc.h>",
-        thread_cflag     => "(unknown)",
         bn_ops           => "BN_LLONG",
+        thread_scheme    => "(unknown)",
     },
 
 # QNX
     "qnx4" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "cc",
         cflags           => "-DL_ENDIAN -DTERMIO",
-        thread_cflag     => "(unknown)",
+        thread_scheme    => "(unknown)",
     },
     "QNX6" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "gcc",
-        ex_libs          => "-lsocket",
+        ex_libs          => add("-lsocket"),
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
         shared_cflag     => "-fPIC",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "QNX6-i386" => {
-        inherit_from     => [ asm("x86_elf_asm") ],
+        inherit_from     => [ "BASE_unix", asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -O2 -Wall",
-        ex_libs          => "-lsocket",
+        ex_libs          => add("-lsocket"),
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
         shared_cflag     => "-fPIC",
 #
 # UnixWare 2.0x fails destest with -O.
     "unixware-2.0" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "cc",
-        cflags           => "-DFILIO_H -DNO_STRINGS_H",
-        thread_cflag     => "-Kthread",
-        ex_libs          => "-lsocket -lnsl -lresolv -lx",
+        cflags           => combine("-DFILIO_H -DNO_STRINGS_H",
+                                    threads("-Kthread")),
+        ex_libs          => add("-lsocket -lnsl -lresolv -lx"),
+        thread_scheme    => "uithreads",
     },
     "unixware-2.1" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "cc",
-        cflags           => "-O -DFILIO_H",
-        thread_cflag     => "-Kthread",
-        ex_libs          => "-lsocket -lnsl -lresolv -lx",
+        cflags           => combine("-O -DFILIO_H",
+                                    threads("-Kthread")),
+        ex_libs          => add("-lsocket -lnsl -lresolv -lx"),
+        thread_scheme    => "uithreads",
     },
     "unixware-7" => {
-        inherit_from     => [ asm("x86_elf_asm") ],
+        inherit_from     => [ "BASE_unix", asm("x86_elf_asm") ],
         cc               => "cc",
-        cflags           => "-O -DFILIO_H -Kalloca",
-        thread_cflag     => "-Kthread",
-        ex_libs          => "-lsocket -lnsl",
+        cflags           => combine("-O -DFILIO_H -Kalloca",
+                                    threads("-Kthread")),
+        ex_libs          => add("-lsocket -lnsl"),
+        thread_scheme    => "uithreads",
         bn_ops           => "BN_LLONG",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "unixware-7-gcc" => {
-        inherit_from     => [ asm("x86_elf_asm") ],
+        inherit_from     => [ "BASE_unix", asm("x86_elf_asm") ],
         cc               => "gcc",
-        cflags           => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        ex_libs          => "-lsocket -lnsl",
+        cflags           => combine("-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -Wall",
+                                    threads("-D_REENTRANT")),
+        ex_libs          => add("-lsocket -lnsl"),
         bn_ops           => "BN_LLONG",
+        thread_scheme    => "pthreads",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
         shared_target    => "gnu-shared",
     },
 # SCO 5 - Ben Laurie <ben@algroup.co.uk> says the -O breaks the SCO cc.
     "sco5-cc" => {
-        inherit_from     => [ asm("x86_elf_asm") ],
+        inherit_from     => [ "BASE_unix", asm("x86_elf_asm") ],
         cc               => "cc",
         cflags           => "-belf",
-        thread_cflag     => "(unknown)",
-        ex_libs          => "-lsocket -lnsl",
+        ex_libs          => add("-lsocket -lnsl"),
+        thread_scheme    => "(unknown)",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
         shared_target    => "svr3-shared",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "sco5-gcc" => {
-        inherit_from     => [ asm("x86_elf_asm") ],
+        inherit_from     => [ "BASE_unix", asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-O3 -fomit-frame-pointer",
-        thread_cflag     => "(unknown)",
-        ex_libs          => "-lsocket -lnsl",
+        ex_libs          => add("-lsocket -lnsl"),
         bn_ops           => "BN_LLONG",
+        thread_scheme    => "(unknown)",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
         shared_target    => "svr3-shared",
 
 #### IBM's AIX.
     "aix-gcc" => {
-        inherit_from     => [ asm("ppc32_asm") ],
+        inherit_from     => [ "BASE_unix", asm("ppc32_asm") ],
         cc               => "gcc",
-        cflags           => "-DB_ENDIAN",
-        debug_cflags     => "-O0 -g",
-        release_cflags   => "-O",
-        thread_cflag     => "-pthread",
+        cflags           => combine(picker(default => "-DB_ENDIAN",
+                                           debug   => "-O0 -g",
+                                           release => "-O"),
+                                    threads("-pthread")),
         sys_id           => "AIX",
         bn_ops           => "BN_LLONG RC4_CHAR",
+        thread_scheme    => "pthreads",
         perlasm_scheme   => "aix32",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
         arflags          => "-X32",
     },
     "aix64-gcc" => {
-        inherit_from     => [ asm("ppc64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("ppc64_asm") ],
         cc               => "gcc",
-        cflags           => "-maix64 -DB_ENDIAN",
-        debug_cflags     => "-O0 -g",
-        release_cflags   => "-O",
-        thread_cflag     => "-pthread",
+        cflags           => combine(picker(default => "-maix64 -DB_ENDIAN",
+                                           debug   => "-O0 -g",
+                                           release => "-O"),
+                                    threads("-pthread")),
         sys_id           => "AIX",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
+        thread_scheme    => "pthreads",
         perlasm_scheme   => "aix64",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
     # $OBJECT_MODE at build time. $OBJECT_MODE is respected at
     # ./config stage!
     "aix-cc" => {
-        inherit_from     => [ asm("ppc32_asm") ],
+        inherit_from     => [ "BASE_unix", asm("ppc32_asm") ],
         cc               => "cc",
-        cflags           => "-q32 -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
-        debug_cflags     => "",
-        release_cflags   => "-O",
-        thread_cflag     => "-qthreaded -D_THREAD_SAFE",
+        cflags           => combine(picker(default => "-q32 -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
+                                           debug   => "-O0 -g",
+                                           release => "-O"),
+                                    threads("-qthreaded -D_THREAD_SAFE")),
         sys_id           => "AIX",
         bn_ops           => "BN_LLONG RC4_CHAR",
+        thread_scheme    => "pthreads",
         perlasm_scheme   => "aix32",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
         arflags          => "-X 32",
     },
     "aix64-cc" => {
-        inherit_from     => [ asm("ppc64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("ppc64_asm") ],
         cc               => "cc",
-        cflags           => "-q64 -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
-        debug_cflags     => "",
-        release_cflags   => "-O",
-        thread_cflag     => "-qthreaded -D_THREAD_SAFE",
+        cflags           => combine(picker(default => "-q64 -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
+                                           debug   => "-O0 -g",
+                                           release => "-O"),
+                                    threads("-qthreaded -D_THREAD_SAFE")),
         sys_id           => "AIX",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
+        thread_scheme    => "pthreads",
         perlasm_scheme   => "aix64",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
 
 # SIEMENS BS2000/OSD: an EBCDIC-based mainframe
     "BS2000-OSD" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "c89",
         cflags           => "-O -XLLML -XLLMK -XL -DB_ENDIAN -DCHARSET_EBCDIC",
-        thread_cflag     => "(unknown)",
-        ex_libs          => "-lsocket -lnsl",
+        ex_libs          => add("-lsocket -lnsl"),
         bn_ops           => "THIRTY_TWO_BIT RC4_CHAR",
+        thread_scheme    => "(unknown)",
     },
 
 # OS/390 Unix an EBCDIC-based Unix system on IBM mainframe
 # IBM compiler does not like the -L switch after any object modules.
 #
     "OS390-Unix" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "c89.sh",
         cflags           => "-O -DB_ENDIAN -DCHARSET_EBCDIC -DNO_SYS_PARAM_H  -D_ALL_SOURCE",
-        thread_cflag     => "(unknown)",
         bn_ops           => "THIRTY_TWO_BIT RC4_CHAR",
+        thread_scheme    => "(unknown)",
     },
 
 #### Visual C targets
 # positives in some situations. Disabling it altogether masks both
 # legitimate and false cases, but as we compile on multiple platforms,
 # we rely on other compilers to catch legitimate cases.
+#
+# Also note that we force threads no matter what.  Configuring "no-threads"
+# is ignored.
     "VC-common" => {
+        inherit_from     => [ "BASE_Windows" ],
         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",
+        coutflag         => "/Fo",
+        lib_cflags       => "/Zl /Zi /Fdlib",
+        dso_cflags       => "/Zi",
+        bin_cflags       => "/Zi /Fdapp",
+        lflags           => add("/debug"),
+        shared_cflag     => "-D_WINDLL",
+        shared_ldflag    => "/dll",
+        shared_target    => "win-shared", # meaningless except it gives Configure a hint
+        thread_scheme    => "winthreads",
         dso_scheme       => "win32",
-       build_scheme     => "mk1mf",
+    },
+    "VC-noCE-common" => {
+        inherit_from     => [ "VC-common", "uplink_common" ],
+        cflags           => add(picker(default => "-DUNICODE -D_UNICODE",
+                                       debug   =>
+                                       sub {
+                                           ($disabled{shared} ? "/MT" : "/MD")
+                                               ."d /Od -DDEBUG -D_DEBUG";
+                                       },
+                                       release =>
+                                       sub {
+                                           ($disabled{shared} ? "/MT" : "/MD")
+                                               ." /Ox /O2 /Ob2";
+                                       })),
+        bin_lflags       => add("/subsystem:console /opt:ref"),
+        ex_libs          => sub {
+            my @ex_libs = ();
+            push @ex_libs, 'ws2_32.lib' unless $disabled{sock};
+            push @ex_libs, 'gdi32.lib advapi32.lib crypt32.lib user32.lib';
+            return join(" ", @ex_libs);
+        },
+    },
+    "VC-WIN64-common" => {
+        inherit_from     => [ "VC-noCE-common" ],
+        ex_libs          => sub {
+            my @ex_libs = ();
+            push @ex_libs, 'bufferoverflowu.lib' if (`cl 2>&1` =~ /14\.00\.4[0-9]{4}\./);
+            return join(" ", @_, @ex_libs);
+        },
+        bn_ops           => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
+        build_scheme     => add("VC-W64", { separator => undef }),
     },
     "VC-WIN64I" => {
-        inherit_from     => [ "VC-common", asm("ia64_asm") ],
-        cflags           => add(" ", "-DUNICODE -D_UNICODE"),
+        inherit_from     => [ "VC-WIN64-common", asm("ia64_asm") ],
+        as               => "ias",
+        asflags          => "-d debug",
+        asoutflag        => "-o",
         sys_id           => "WIN64I",
-        bn_ops           => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
-        bn_obj           => sub { my $r=join(" ",@_); $r=~s/bn\-//; $r; },
-        rc4_obj          => "",
+        rc4_asm_src      => "",
         perlasm_scheme   => "ias",
-       build_scheme     => [ "mk1mf", "VC-W64" ],
     },
     "VC-WIN64A" => {
-        inherit_from     => [ "VC-common", asm("x86_64_asm") ],
-        cflags           => add(" ", "-DUNICODE -D_UNICODE"),
+        inherit_from     => [ "VC-WIN64-common", asm("x86_64_asm") ],
+        as               => sub { vc_win64a_info()->{as} },
+        asflags          => sub { vc_win64a_info()->{asflags} },
+        asoutflag        => sub { vc_win64a_info()->{asoutflag} },
         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; },
+        bn_asm_src       => sub { return undef unless @_;
+                                  my $r=join(" ",@_); $r=~s|asm/x86_64-gcc|bn_asm|; $r; },
         perlasm_scheme   => "auto",
-       build_scheme     => [ "mk1mf", "VC-W64" ],
     },
     "VC-WIN32" => {
         # x86 Win32 target defaults to ANSI API, if you want UNICODE,
         # configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE'
-        inherit_from     => [ "VC-common", asm("x86_asm") ],
+        inherit_from     => [ "VC-noCE-common", asm("x86_asm") ],
+        as               => sub { my $ver=`nasm -v 2>NUL`;
+                                  my $vew=`nasmw -v 2>NUL`;
+                                  return $ver ge $vew ? "nasm" : "nasmw" },
+        asflags          => "-f win32",
+        asoutflag        => "-o",
+        ex_libs          => sub {
+            my @ex_libs = ();
+            # WIN32 UNICODE build gets linked with unicows.lib for
+            # backward compatibility with Win9x.
+            push @ex_libs, 'unicows.lib'
+                if (grep { $_ eq "UNICODE" } @user_defines);
+            return join(" ", @ex_libs, @_);
+        },
         sys_id           => "WIN32",
         bn_ops           => "BN_LLONG EXPORT_VAR_AS_FN",
         perlasm_scheme   => "win32n",
-       build_scheme     => [ "mk1mf", "VC-W32" ],
+        build_scheme     => add("VC-W32", { separator => undef }),
     },
     "VC-CE" => {
+        inherit_from     => [ "VC-common" ],
+        as               => "ml",
+        asflags          => "/nologo /Cp /coff /c /Cx /Zi",
+        asoutflag        => "/Fo",
         cc               => "cl",
+        cflags           =>
+            picker(default =>
+                   combine('/W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYS_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -DOPENSSL_SMALL_FOOTPRINT',
+                           sub { vc_wince_info()->{cflags}; },
+                           sub { defined($ENV{'WCECOMPAT'})
+                                     ? '-I$(WCECOMPAT)/include' : (); },
+                           sub { defined($ENV{'PORTSDK_LIBPATH'})
+                                     ? '-I$(PORTSDK_LIBPATH)/../../include' : (); },
+                           sub { `cl 2>&1` =~ /Version ([0-9]+)\./ && $1>=14
+                                     ? ($disabled{shared} ? " /MT" : " /MD")
+                                     : " /MC"; }),
+                   debug   => "/Od -DDEBUG -D_DEBUG",
+                   release => "/O1i"),
+        lflags           => combine("/nologo /opt:ref",
+                                    sub { vc_wince_info()->{lflags}; },
+                                    sub { defined($ENV{PORTSDK_LIBPATH})
+                                              ? "/entry:mainCRTstartup" : (); }),
         sys_id           => "WINCE",
         bn_ops           => "BN_LLONG EXPORT_VAR_AS_FN",
-        dso_scheme       => "win32",
-       build_scheme     => [ "mk1mf", "VC-WCE" ],
+        ex_libs          => sub {
+            my @ex_libs = ();
+            push @ex_libs, 'ws2.lib' unless $disabled{sock};
+            push @ex_libs, 'crypt32.lib';
+            if (defined($ENV{WCECOMPAT})) {
+                my $x = '$(WCECOMPAT)/lib';
+                if (-f "$x/$ENV{TARGETCPU}/wcecompatex.lib") {
+                    $x .= '/$(TARGETCPU)/wcecompatex.lib';
+                } else {
+                    $x .= '/wcecompatex.lib';
+                }
+                push @ex_libs, $x;
+            }
+            push @ex_libs, '$(PORTSDK_LIBPATH)/portlib.lib'
+                if (defined($ENV{'PORTSDK_LIBPATH'}));
+            push @ex_libs, ' /nodefaultlib coredll.lib corelibc.lib'
+                if ($ENV{'TARGETCPU'} eq "X86");
+            return @ex_libs;
+        },
+        build_scheme     => add("VC-WCE", { separator => undef }),
     },
 
-#### Borland C++ 4.5
-    "BC-32" => {
-        cc               => "bcc32",
-        sys_id           => "WIN32",
-        bn_ops           => "BN_LLONG EXPORT_VAR_AS_FN",
-        dso_scheme       => "win32",
-       build_scheme     => [ "mk1mf", "BC" ],
-    },
+###### Borland C++ 4.5
+##    "BC-32" => {
+##        inherit_from     => [ "BASE_Windows" ],
+##        cc               => "bcc32",
+##        sys_id           => "WIN32",
+##        bn_ops           => "BN_LLONG EXPORT_VAR_AS_FN",
+##        dso_scheme       => "win32",
+##        build_scheme     => add("BC", { separator => undef }),
+##    },
 
 #### MinGW
     "mingw" => {
-        inherit_from     => [ asm("x86_asm") ],
+        inherit_from     => [ "BASE_unix", asm("x86_asm"),
+                              sub { $disabled{shared} ? () : "x86_uplink" } ],
         cc               => "gcc",
-        cflags           => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m32 -Wall",
-        debug_cflags     => "-g -O0",
-        release_cflags   => "-O3 -fomit-frame-pointer",
-        thread_cflag     => "-D_MT",
+        cflags           => combine(picker(default => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m32 -Wall",
+                                           debug   => "-g -O0",
+                                           release => "-O3 -fomit-frame-pointer"),
+                                    threads("-D_MT")),
         sys_id           => "MINGW32",
-        ex_libs          => "-lws2_32 -lgdi32 -lcrypt32",
+        ex_libs          => add("-lws2_32 -lgdi32 -lcrypt32"),
         bn_ops           => "BN_LLONG EXPORT_VAR_AS_FN",
+        thread_scheme    => "winthreads",
         perlasm_scheme   => "coff",
         dso_scheme       => "win32",
-        shared_target    => "cygwin-shared",
-        shared_cflag     => "-D_WINDLL -DOPENSSL_USE_APPLINK",
+        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
         # consider its binaries for using with non-mingw64 run-time
         # environment. And as mingw64 is always consistent with itself,
         # Applink is never engaged and can as well be omitted.
-        inherit_from     => [ asm("x86_64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("x86_64_asm") ],
         cc               => "gcc",
-        cflags           => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m64 -Wall",
-        debug_cflags     => "-g -O0",
-        release_cflags   => "-O3",
-        thread_cflag     => "-D_MT",
+        cflags           => combine(picker(default => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m64 -Wall",
+                                           debug   => "-g -O0",
+                                           release => "-O3"),
+                                    threads("-D_MT")),
         sys_id           => "MINGW64",
-        ex_libs          => "-lws2_32 -lgdi32 -lcrypt32",
+        ex_libs          => add("-lws2_32 -lgdi32 -lcrypt32"),
         bn_ops           => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
+        thread_scheme    => "winthreads",
         perlasm_scheme   => "mingw64",
         dso_scheme       => "win32",
-        shared_target    => "cygwin-shared",
-        shared_cflag     => "-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
     "UEFI" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "cc",
         cflags           => "-DL_ENDIAN -O",
         sys_id           => "UEFI",
 
 #### UWIN
     "UWIN" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "cc",
         cflags           => "-DTERMIOS -DL_ENDIAN -O -Wall",
         sys_id           => "UWIN",
 
 #### Cygwin
     "Cygwin-x86" => {
-        inherit_from     => [ asm("x86_asm") ],
+        inherit_from     => [ "BASE_unix", asm("x86_asm") ],
         cc               => "gcc",
-        cflags           => "-DTERMIOS -DL_ENDIAN -Wall",
-        debug_cflags     => "-g -O0",
-        release_cflags   => "-O3 -fomit-frame-pointer",
+        cflags           => picker(default => "-DTERMIOS -DL_ENDIAN -Wall",
+                                   debug   => "-g -O0",
+                                   release => "-O3 -fomit-frame-pointer"),
         sys_id           => "CYGWIN",
         bn_ops           => "BN_LLONG",
         perlasm_scheme   => "coff",
         shared_extension => ".dll",
     },
     "Cygwin-x86_64" => {
-        inherit_from     => [ asm("x86_64_asm") ],
+        inherit_from     => [ "BASE_unix", asm("x86_64_asm") ],
         cc               => "gcc",
-        cflags           => "-DTERMIOS -DL_ENDIAN -Wall",
-        debug_cflags     => "-g -O0",
-        release_cflags   => "-O3",
+        cflags           => picker(default => "-DTERMIOS -DL_ENDIAN -Wall",
+                                   debug   => "-g -O0",
+                                   release => "-O3"),
         sys_id           => "CYGWIN",
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "mingw64",
 # the builds can be configured to use BSD sockets instead.
 # netware-clib => legacy CLib c-runtime support
     "netware-clib" => {
+        inherit_from     => [ "BASE_Windows" ],
         cc               => "mwccnlm",
-       build_scheme     => [ "mk1mf", "netware" ],
+        build_scheme     => add("netware", { separator => undef }),
     },
     "netware-clib-bsdsock" => {
+        inherit_from     => [ "BASE_Windows" ],
         cc               => "mwccnlm",
-       build_scheme     => [ "mk1mf", "netware" ],
+        build_scheme     => add("netware", { separator => undef }),
     },
     "netware-clib-gcc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "i586-netware-gcc",
         cflags           => "-nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall",
     },
     "netware-clib-bsdsock-gcc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "i586-netware-gcc",
         cflags           => "-nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall",
     },
     # netware-libc => LibC/NKS support
     "netware-libc" => {
+        inherit_from     => [ "BASE_Windows" ],
         cc               => "mwccnlm",
         bn_ops           => "BN_LLONG",
-       build_scheme     => [ "mk1mf", "netware" ],
+        build_scheme     => add("netware", { separator => undef }),
     },
     "netware-libc-bsdsock" => {
+        inherit_from     => [ "BASE_Windows" ],
         cc               => "mwccnlm",
         bn_ops           => "BN_LLONG",
-       build_scheme     => [ "mk1mf", "netware" ],
+        build_scheme     => add("netware", { separator => undef }),
     },
     "netware-libc-gcc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "i586-netware-gcc",
         cflags           => "-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall",
         bn_ops           => "BN_LLONG",
     },
     "netware-libc-bsdsock-gcc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "i586-netware-gcc",
         cflags           => "-nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall",
         bn_ops           => "BN_LLONG",
         cc               => "gcc",
         cflags           => "-I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall",
         sys_id           => "MSDOS",
-        ex_libs          => "-L/dev/env/WATT_ROOT/lib -lwatt",
+        ex_libs          => add("-L/dev/env/WATT_ROOT/lib -lwatt"),
         bn_ops           => "BN_LLONG",
         perlasm_scheme   => "a.out",
     },
 
 #### Ultrix from Bernhard Simon <simon@zid.tuwien.ac.at>
     "ultrix-cc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "cc",
         cflags           => "-std1 -O -Olimit 2500 -DL_ENDIAN",
-        thread_cflag     => "(unknown)",
+        thread_scheme    => "(unknown)",
     },
     "ultrix-gcc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "gcc",
         cflags           => "-O3 -DL_ENDIAN",
-        thread_cflag     => "(unknown)",
         bn_ops           => "BN_LLONG",
+        thread_scheme    => "(unknown)",
     },
 # K&R C is no longer supported; you need gcc on old Ultrix installations
 ##"ultrix","cc:-O2 -DNOPROTO -DNOCONST -DL_ENDIAN::(unknown):::::::",
 
 ##### MacOS X (a.k.a. Darwin) setup
     "darwin-common" => {
+        inherit_from     => [ "BASE_unix" ],
         template         => 1,
         cc               => "cc",
-        cflags           => "",
-        debug_cflags     => "-g -O0",
-        release_cflags   => "-O3",
-        thread_cflag     => "-D_REENTRANT",
+        cflags           => combine(picker(default => "",
+                                           debug   => "-g -O0",
+                                           release => "-O3"),
+                                   threads("-D_REENTRANT")),
         sys_id           => "MACOSX",
         plib_lflags      => "-Wl,-search_paths_first",
         bn_ops           => "BN_LLONG RC4_CHAR",
+        thread_scheme    => "pthreads",
         perlasm_scheme   => "osx32",
         dso_scheme       => "dlfcn",
+        ranlib           => "ranlib -c",
         shared_target    => "darwin-shared",
-        shared_cflag     => "-fPIC -fno-common",
+        shared_cflag     => "-fPIC",
         shared_ldflag    => "-dynamiclib",
         shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
     },
     "darwin-ppc-cc" => {
         inherit_from     => [ "darwin-common", asm("ppc32_asm") ],
-        cflags           => "-arch ppc -DB_ENDIAN -Wa,-force_cpusubtype_ALL",
+        cflags           => add("-arch ppc -DB_ENDIAN -Wa,-force_cpusubtype_ALL"),
         perlasm_scheme   => "osx32",
         shared_ldflag    => "-arch ppc -dynamiclib",
     },
     "darwin64-ppc-cc" => {
         inherit_from     => [ "darwin-common", asm("ppc64_asm") ],
-        cflags           => "-arch ppc64 -DB_ENDIAN",
+        cflags           => add("-arch ppc64 -DB_ENDIAN"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         perlasm_scheme   => "osx64",
         shared_ldflag    => "-arch ppc64 -dynamiclib",
     },
     "darwin-i386-cc" => {
         inherit_from     => [ "darwin-common", asm("x86_asm") ],
-        cflags           => "-arch i386 -DL_ENDIAN",
-        release_cflags   => "-O3 -fomit-frame-pointer",
+        cflags           => add(picker(default => "-arch i386 -DL_ENDIAN",
+                                       release => "-fomit-frame-pointer")),
         bn_ops           => "BN_LLONG RC4_INT",
         perlasm_scheme   => "macosx",
         shared_ldflag    => "-arch i386 -dynamiclib",
     },
     "darwin64-x86_64-cc" => {
         inherit_from     => [ "darwin-common", asm("x86_64_asm") ],
-        cflags           => "-arch x86_64 -DL_ENDIAN -Wall",
+        cflags           => add("-arch x86_64 -DL_ENDIAN -Wall"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "macosx",
         shared_ldflag    => "-arch x86_64 -dynamiclib",
 #
     "iphoneos-cross" => {
         inherit_from     => [ "darwin-common" ],
-        cflags           => "-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
+        cflags           => add("-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"),
         sys_id           => "iOS",
     },
     "ios-cross" => {
         # It should be possible to go below iOS 6 and even add -arch armv6,
         # thus targeting iPhone pre-3GS, but it's assumed to be irrelevant
         # at this point.
-        cflags           => "-arch armv7 -mios-version-min=6.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
+        cflags           => add("-arch armv7 -mios-version-min=6.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"),
         sys_id           => "iOS",
         perlasm_scheme   => "ios32",
     },
     "ios64-cross" => {
         inherit_from     => [ "darwin-common", asm("aarch64_asm") ],
-        cflags           => "-arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
+        cflags           => add("-arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"),
         sys_id           => "iOS",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         perlasm_scheme   => "ios64",
 
 ##### GNU Hurd
     "hurd-x86" => {
+        inherit_from     => [ "BASE_unix" ],
         inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
-        cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall",
-        thread_cflag     => "-pthread",
-        ex_libs          => "-ldl",
+        cflags           => combine("-DL_ENDIAN -O3 -fomit-frame-pointer -Wall",
+                                    threads("-pthread")),
+        ex_libs          => add("-ldl"),
         bn_ops           => "BN_LLONG",
+        thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
         shared_target    => "linux-shared",
         shared_cflag     => "-fPIC",
 
 ##### OS/2 EMX
     "OS2-EMX" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "gcc",
     },
 
 ##### VxWorks for various targets
     "vxworks-ppc60x" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "ccppc",
         cflags           => "-D_REENTRANT -mrtp -mhard-float -mstrict-align -fno-implicit-fp -DPPC32_fp60x -O2 -fstrength-reduce -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/usr/h/wrn/coreip",
         sys_id           => "VXWORKS",
-        ex_libs          => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/common",
+        ex_libs          => add("-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/common"),
     },
     "vxworks-ppcgen" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "ccppc",
         cflags           => "-D_REENTRANT -mrtp -msoft-float -mstrict-align -O1 -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/usr/h/wrn/coreip",
         sys_id           => "VXWORKS",
-        ex_libs          => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon",
+        ex_libs          => add("-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon"),
     },
     "vxworks-ppc405" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "ccppc",
         cflags           => "-g -msoft-float -mlongcall -DCPU=PPC405 -I\$(WIND_BASE)/target/h",
         sys_id           => "VXWORKS",
         lflags           => "-r",
     },
     "vxworks-ppc750" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "ccppc",
         cflags           => "-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG)",
         sys_id           => "VXWORKS",
         lflags           => "-r",
     },
     "vxworks-ppc750-debug" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "ccppc",
         cflags           => "-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g",
         sys_id           => "VXWORKS",
         lflags           => "-r",
     },
     "vxworks-ppc860" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "ccppc",
         cflags           => "-nostdinc -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I\$(WIND_BASE)/target/h",
         sys_id           => "VXWORKS",
         lflags           => "-r",
     },
     "vxworks-simlinux" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "ccpentium",
         cflags           => "-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DL_ENDIAN -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/h -I\$(WIND_BASE)/target/h/wrn/coreip -DOPENSSL_NO_HW_PADLOCK",
         sys_id           => "VXWORKS",
         ranlib           => "ranlibpentium",
     },
     "vxworks-mips" => {
-        inherit_from     => [ asm("mips32_asm") ],
+        inherit_from     => [ "BASE_unix", asm("mips32_asm") ],
         cc               => "ccmips",
-        cflags           => "-mrtp -mips2 -O -G 0 -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/h/wrn/coreip",
-        thread_cflag     => "-D_REENTRANT",
+        cflags           => combine("-mrtp -mips2 -O -G 0 -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/h/wrn/coreip",
+                                    threads("-D_REENTRANT")),
         sys_id           => "VXWORKS",
-        ex_libs          => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon",
+        ex_libs          => add("-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon"),
+        thread_scheme    => "pthreads",
         perlasm_scheme   => "o32",
         ranlib           => "ranlibmips",
     },
 
 #### uClinux
     "uClinux-dist" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "$ENV{'CC'}",
-        cflags           => "\$(CFLAGS)",
-        thread_cflag     => "-D_REENTRANT",
+        cflags           => combine("\$(CFLAGS)",
+                                    threads("-D_REENTRANT")),
         plib_lflags      => "\$(LDFLAGS)",
-        ex_libs          => "\$(LDLIBS)",
+        ex_libs          => add("\$(LDLIBS)"),
         bn_ops           => "BN_LLONG",
+        thread_scheme    => "pthreads",
         dso_scheme       => "$ENV{'LIBSSL_dlfcn'}",
         shared_target    => "linux-shared",
         shared_cflag     => "-fPIC",
         ranlib           => "$ENV{'RANLIB'}",
     },
     "uClinux-dist64" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "$ENV{'CC'}",
-        cflags           => "\$(CFLAGS)",
-        thread_cflag     => "-D_REENTRANT",
+        cflags           => combine("\$(CFLAGS)",
+                                    threads("-D_REENTRANT")),
         plib_lflags      => "\$(LDFLAGS)",
-        ex_libs          => "\$(LDLIBS)",
+        ex_libs          => add("\$(LDLIBS)"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
+        thread_scheme    => "pthreads",
         dso_scheme       => "$ENV{'LIBSSL_dlfcn'}",
         shared_target    => "linux-shared",
         shared_cflag     => "-fPIC",
 
     ##### VMS
     "vms-generic" => {
+        inherit_from     => [ "BASE_VMS" ],
         template         => 1,
         cc               => "CC/DECC",
-        cflags           => "/STANDARD=RELAXED/NOLIST/PREFIX=ALL/NAMES=(AS_IS,SHORTENED)",
-        debug_cflags     => "/NOOPTIMIZE/DEBUG",
-        release_cflags   => "/OPTIMIZE/NODEBUG",
-        lflags           => "/MAP",
-        debug_lflags     => "/DEBUG/TRACEBACK",
-        release_lflags   => "/NODEBUG/NOTRACEBACK",
+        cflags           => picker(default => "/STANDARD=RELAXED/NOLIST/PREFIX=ALL/NAMES=(AS_IS,SHORTENED)",
+                                   debug   => "/NOOPTIMIZE/DEBUG",
+                                   release => "/OPTIMIZE/NODEBUG"),
+        lflags           => picker(default => "/MAP",
+                                   debug   => "/DEBUG/TRACEBACK",
+                                   release => "/NODEBUG/NOTRACEBACK"),
         shared_target    => "vms-shared",
+        thread_scheme    => "pthreads",
 
-        apps_extra_src   => "vms_decc_init.c",
-        build_file       => "descrip.mms",
-        build_scheme     => [ "unified", "VMS" ],
+        apps_aux_src     => "vms_decc_init.c",
     },
 
     # VMS on VAX is *unsupported*
     },
     "vms-alpha-P32" => {
        inherit_from     => [ "vms-alpha" ],
-       cflags           => add(" ", "/POINTER_SIZE=32"),
+       cflags           => add("/POINTER_SIZE=32"),
+       ex_libs          => sub { join(",", map { s|SHR([\./])|SHR32$1|g; $_ } @_) },
     },
     "vms-alpha-P64" => {
        inherit_from     => [ "vms-alpha" ],
-       cflags           => add(" ", "/POINTER_SIZE=64"),
+       cflags           => add("/POINTER_SIZE=64"),
+       ex_libs          => sub { join(",", map { s|SHR([\./])|SHR64$1|g; $_ } @_) },
     },
     "vms-ia64" => {
         inherit_from     => [ "vms-generic" ],
     },
     "vms-ia64-P32" => {
        inherit_from     => [ "vms-ia64" ],
-       cflags           => add(" ", "/POINTER_SIZE=32"),
+       cflags           => add("/POINTER_SIZE=32"),
+       ex_libs          => sub { join(",", map { s|SHR([\./])|SHR32$1|g; $_ } @_) },
     },
     "vms-ia64-P64" => {
        inherit_from     => [ "vms-ia64" ],
-       cflags           => add(" ", "/POINTER_SIZE=64"),
+       cflags           => add("/POINTER_SIZE=64"),
+       ex_libs          => sub { join(",", map { s|SHR([\./])|SHR64$1|g; $_ } @_) },
     },
 
 );