Move to REF_DEBUG, for consistency.
[openssl.git] / Configurations / 10-main.conf
index eb46789..cda7e21 100644 (file)
@@ -1,15 +1,18 @@
+## -*- mode: perl; -*-
 ## Standard openssl configuration targets.
 ##
 ## If you edit this file, run this command before committing
-##     make -f Makefile.org TABLE
+##     make -f Makefile.in TABLE
 ## This file is interpolated by the Configure script.
 
 %targets = (
 
-# Basic configs that should work on any (32 and less bit) box
+#### Basic configs that should work on any 32-bit box
     "gcc" => {
         cc               => "gcc",
-        cflags           => "-O3",
+        cflags           => "",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
         thread_cflag     => "(unknown)",
         bn_ops           => "BN_LLONG",
     },
         thread_cflag     => "(unknown)",
     },
 
-####VOS Configurations
+#### VOS Configurations
     "vos-gcc" => {
-        inherit_from     => [ "no_asm_filler" ],
         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_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG",
+        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG",
         release_cflags   => "-O3",
         thread_cflag     => "(unknown)",
         sys_id           => "VOS",
         shared_extension => ".so",
     },
 
-#### Solaris x86 with GNU C setups
-# -DOPENSSL_NO_INLINE_ASM switches off inline assembler. We have to do it
-# here because whenever GNU C instantiates an assembler template it
-# surrounds it with #APP #NO_APP comment pair which (at least Solaris
-# 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic"
-# error message.
-    "solaris-x86-gcc" => {
-        inherit_from     => [ "x86_elf_asm" ],
-        cc               => "gcc",
-        cflags           => "-O3 -fomit-frame-pointer -march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+#### Solaros configirations
+    "solaris-common" => {
+        template         => 1,
+        cflags           => "-DFILIO_H",
+        ex_libs          => "-lsocket -lnsl -ldl",
         dso_scheme       => "dlfcn",
         shared_target    => "solaris-shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+#### Solaris x86 with GNU C setups
+    "solaris-x86-gcc" => {
+        # -DOPENSSL_NO_INLINE_ASM switches off inline assembler. We have
+        # to do it here because whenever GNU C instantiates an assembler
+        # template it surrounds it with #APP #NO_APP comment pair which
+        # (at least Solaris 7_x86) /usr/ccs/bin/as fails to assemble
+        # 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",
+        bn_ops           => "BN_LLONG",
         shared_cflag     => "-fPIC",
         shared_ldflag    => "-shared",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
-# -shared -static-libgcc might appear controversial, but modules taken
-# from static libgcc do not have relocations and linking them into our
-# shared objects doesn't have any negative side-effects. On the contrary,
-# doing so makes it possible to use gcc shared build with Sun C. Given
-# that gcc generates faster code [thanks to inline assembler], I would
-# actually recommend to consider using gcc shared build even with vendor
-# compiler:-)
-#                                              <appro@fy.chalmers.se>
     "solaris64-x86_64-gcc" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
-        cflags           => "-m64 -O3 -Wall -DL_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        # -shared -static-libgcc might appear controversial, but modules
+        # taken from static libgcc do not have relocations and linking
+        # them into our shared objects doesn't have any negative side
+        # effects. On the contrary, doing so makes it possible to use
+        # gcc shared build with Sun C. Given that gcc generates faster
+        # code [thanks to inline assembler], I would actually recommend
+        # to consider using gcc shared build even with vendor compiler:-)
+        #                                      <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",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
         shared_cflag     => "-fPIC",
         shared_ldflag    => "-m64 -shared -static-libgcc",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "/64",
     },
 
 #### Solaris x86 with Sun C setups
     "solaris-x86-cc" => {
-        inherit_from     => [ "no_asm_filler" ],
+        inherit_from     => [ "solaris-common" ],
         cc               => "cc",
-        cflags           => "-fast -xarch=generic -O -Xa",
+        cflags           => add_before("-xarch=generic -xstrconst -Xa -DL_ENDIAN"),
+        debug_cflags     => "-g",
+        release_cflags   => "-xO5 -xregs=frameptr -xdepend -xbuiltin",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
+        lflags           => add("-mt"),
+        ex_libs          => add("-lpthread"),
+        bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-KPIC",
         shared_ldflag    => "-G -dy -z text",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "solaris64-x86_64-cc" => {
-        inherit_from     => [ "x86_64_asm" ],
+        inherit_from     => [ "solaris-common", asm("x86_64_asm") ],
         cc               => "cc",
-        cflags           => "-fast -xarch=amd64 -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           => "-lsocket -lnsl -ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        lflags           => add("-mt"),
+        ex_libs          => add("-lpthread"),
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
         shared_cflag     => "-KPIC",
-        shared_ldflag    => "-xarch=amd64 -G -dy -z text",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        shared_ldflag    => "-xarch=generic64 -G -dy -z text",
         multilib         => "/64",
     },
 
 #### SPARC Solaris with GNU C setups
     "solaris-sparcv7-gcc" => {
-        inherit_from     => [ "no_asm_filler" ],
+        inherit_from     => [ "solaris-common" ],
         cc               => "gcc",
-        cflags           => "-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
+        cflags           => add_before("-Wall -DB_ENDIAN -DBN_DIV2W"),
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
+        thread_cflag     => "-pthread",
+        bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-fPIC",
         shared_ldflag    => "-shared",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
-####
     "solaris-sparcv8-gcc" => {
-        inherit_from     => [ "sparcv8_asm" ],
-        cc               => "gcc",
-        cflags           => "-mv8 -Wall -DB_ENDIAN",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g",
-        release_cflags   => "-O3 -fomit-frame-pointer -DBN_DIV2W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-shared",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ],
+        cflags           => add_before(" ", "-mcpu=v8"),
     },
-# -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
     "solaris-sparcv9-gcc" => {
-        inherit_from     => [ "sparcv9_asm" ],
-        cc               => "gcc",
-        cflags           => "-m32 -mcpu=ultrasparc -Wall -DB_ENDIAN -DBN_DIV2W",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__",
-        release_cflags   => "-O3 -fomit-frame-pointer",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "ULTRASPARC",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-shared",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        # -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__",
     },
     "solaris64-sparcv9-gcc" => {
-        inherit_from     => [ "sparcv9_asm" ],
-        cc               => "gcc",
-        cflags           => "-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "ULTRASPARC",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
-        shared_cflag     => "-fPIC",
+        inherit_from     => [ "solaris-sparcv9-gcc" ],
+        cflags           => sub { my $f=join(" ",@_); $f =~ s/\-m32/-m64/; $f; },
+        bn_ops           => "BN_LLONG RC4_CHAR",
         shared_ldflag    => "-m64 -shared",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "/64",
     },
 
 # SC4.2 is ok, better than gcc even on bn as long as you tell it -xarch=v8
 # SC5.0 note: Compiler common patch 107357-01 or later is required!
     "solaris-sparcv7-cc" => {
-        inherit_from     => [ "no_asm_filler" ],
+        inherit_from     => [ "solaris-common" ],
         cc               => "cc",
-        cflags           => "-xO5 -xstrconst -xdepend -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           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
+        lflags           => add("-mt"),
+        ex_libs          => add("-lpthread"),
+        bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-KPIC",
         shared_ldflag    => "-G -dy -z text",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
 ####
     "solaris-sparcv8-cc" => {
-        inherit_from     => [ "sparcv8_asm" ],
-        cc               => "cc",
-        cflags           => "-xarch=v8 -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O",
-        release_cflags   => "-xO5 -xdepend",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
-        shared_cflag     => "-KPIC",
-        shared_ldflag    => "-G -dy -z text",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv8_asm") ],
+        cflags           => add_before(" ", "-xarch=v8"),
     },
     "solaris-sparcv9-cc" => {
-        inherit_from     => [ "sparcv9_asm" ],
-        cc               => "cc",
-        cflags           => "-xtarget=ultra -xarch=v8plus -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O",
-        release_cflags   => "-xO5 -xdepend",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "ULTRASPARC",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
-        shared_cflag     => "-KPIC",
-        shared_ldflag    => "-G -dy -z text",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ],
+        cflags           => add_before(" ", "-xarch=v8plus -xtarget=ultra"),
     },
     "solaris64-sparcv9-cc" => {
-        inherit_from     => [ "sparcv9_asm" ],
-        cc               => "cc",
-        cflags           => "-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "ULTRASPARC",
-        lflags           => "-lsocket -lnsl -ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "solaris-shared",
-        shared_cflag     => "-KPIC",
+        inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ],
+        cflags           => add_before(" ", "-xarch=v9 -xtarget=ultra"),
+        bn_ops           => "BN_LLONG RC4_CHAR",
         shared_ldflag    => "-xarch=v9 -G -dy -z text",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "/64",
     },
 
 #### IRIX 5.x configs
 # -mips2 flag is added by ./config when appropriate.
     "irix-gcc" => {
-        inherit_from     => [ "mips32_asm" ],
+        inherit_from     => [ asm("mips32_asm") ],
         cc               => "gcc",
-        cflags           => "-O3 -DB_ENDIAN",
+        cflags           => "-DB_ENDIAN",
+        debug_cflags     => "-g -O0",
+        release_cflags   => "-O3",
         thread_cflag     => "(unknown)",
-        bn_ops           => "BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR",
+        bn_ops           => "BN_LLONG RC4_CHAR",
         perlasm_scheme   => "o32",
         dso_scheme       => "dlfcn",
         shared_target    => "irix-shared",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "irix-cc" => {
-        inherit_from     => [ "mips32_asm" ],
+        inherit_from     => [ asm("mips32_asm") ],
         cc               => "cc",
-        cflags           => "-O2 -use_readonly_const -DB_ENDIAN",
+        cflags           => "-use_readonly_const -DB_ENDIAN",
+        debug_cflags     => "-g -O0",
+        release_cflags   => "-O2",
         thread_cflag     => "(unknown)",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR",
+        bn_ops           => "BN_LLONG RC4_CHAR",
         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     => [ "mips64_asm" ],
+        inherit_from     => [ asm("mips64_asm") ],
         cc               => "gcc",
-        cflags           => "-mabi=n32 -O3 -DB_ENDIAN -DBN_DIV3W",
-        thread_cflag     => "-D_SGI_MP_SOURCE",
-        bn_ops           => "MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT",
+        cflags           => "-mabi=n32 -DB_ENDIAN -DBN_DIV3W",
+        debug_cflags     => "-g -O0",
+        release_cflags   => "-O3",
+        thread_cflag     => "-D_SGI_MP_SOURCE -pthread",
+        bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",
         perlasm_scheme   => "n32",
         dso_scheme       => "dlfcn",
         shared_target    => "irix-shared",
         multilib         => "32",
     },
     "irix-mips3-cc" => {
-        inherit_from     => [ "mips64_asm" ],
+        inherit_from     => [ asm("mips64_asm") ],
         cc               => "cc",
-        cflags           => "-n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W",
+        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",
-        bn_ops           => "DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT",
+        ex_libs          => "-lpthread",
+        bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",
         perlasm_scheme   => "n32",
         dso_scheme       => "dlfcn",
         shared_target    => "irix-shared",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "32",
     },
-# N64 ABI builds.
+    # N64 ABI builds.
     "irix64-mips4-gcc" => {
-        inherit_from     => [ "mips64_asm" ],
+        inherit_from     => [ asm("mips64_asm") ],
         cc               => "gcc",
-        cflags           => "-mabi=64 -mips4 -O3 -DB_ENDIAN -DBN_DIV3W",
+        cflags           => "-mabi=64 -mips4 -DB_ENDIAN -DBN_DIV3W",
+        debug_cflags     => "-g -O0",
+        release_cflags   => "-O3",
         thread_cflag     => "-D_SGI_MP_SOURCE",
-        bn_ops           => "RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG",
+        bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "64",
         dso_scheme       => "dlfcn",
         shared_target    => "irix-shared",
         multilib         => "64",
     },
     "irix64-mips4-cc" => {
-        inherit_from     => [ "mips64_asm" ],
+        inherit_from     => [ asm("mips64_asm") ],
         cc               => "cc",
-        cflags           => "-64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W",
+        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",
-        bn_ops           => "RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG",
+        ex_libs          => "-lpthread",
+        bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "64",
         dso_scheme       => "dlfcn",
         shared_target    => "irix-shared",
 # - 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
-#   consider './config +DAportable'.
-# - +DD64 is chosen in favour of +DA2.0W because it's meant to be
-#   compatible with *future* releases.
-# - If you run ./Configure hpux-parisc-[g]cc manually don't forget to
-#   pass -D_REENTRANT on HP-UX 10 and later.
+#   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
 #   doesn't seem to "digest" too many local variables (they make "him"
 #   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
+#   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>
-#
-# Since there is mention of this in shlib/hpux10-cc.sh
-    "hpux-parisc-cc-o4" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "cc",
-        cflags           => "-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldld",
-        bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "+Z",
-        shared_ldflag    => "-b",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
     "hpux-parisc-gcc" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "gcc",
-        cflags           => "-O3 -DB_ENDIAN -DBN_DIV2W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",
+        cflags           => "-DB_ENDIAN -DBN_DIV2W",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
+        thread_cflag     => "-pthread",
+        ex_libs          => "-Wl,+s -ldld",
+        bn_ops           => "BN_LLONG",
         dso_scheme       => "dl",
         shared_target    => "hpux-shared",
         shared_cflag     => "-fPIC",
         shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "hpux-parisc1_1-gcc" => {
-        inherit_from     => [ "parisc11_asm" ],
-        cc               => "gcc",
-        cflags           => "-O3 -DB_ENDIAN -DBN_DIV2W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-shared",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "hpux-parisc-gcc", asm("parisc11_asm") ],
         multilib         => "/pa1.1",
     },
-    "hpux-parisc2-gcc" => {
-        inherit_from     => [ "parisc20_32_asm" ],
-        cc               => "gcc",
-        cflags           => "-march=2.0 -O3 -DB_ENDIAN -D_REENTRANT",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-shared",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-        multilib         => "/pa20_32",
-    },
     "hpux64-parisc2-gcc" => {
+        inherit_from     => [ asm("parisc20_64_asm") ],
         cc               => "gcc",
-        cflags           => "-O3 -DB_ENDIAN -D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
-        bn_obj           => "pa-risc2W.o",
-        perlasm_scheme   => "void",
+        cflags           => "-DB_ENDIAN",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
+        thread_cflag     => "-D_REENTRANT",
+        ex_libs          => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         shared_cflag     => "-fpic",
         multilib         => "/pa20_64",
     },
 
-# More attempts at unified 10.X and 11.X targets for HP C compiler.
-#
-# Chris Ruemmler <ruemmler@cup.hp.com>
-# Kevin Steves <ks@hp.se>
+    # More attempts at unified 10.X and 11.X targets for HP C compiler.
+    #
+    # Chris Ruemmler <ruemmler@cup.hp.com>
+    # Kevin Steves <ks@hp.se>
     "hpux-parisc-cc" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "cc",
-        cflags           => "+O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY",
+        cflags           => "+Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY",
+        debug_cflags      => "+O0 +d -g",
+        release_cflags   => "+O3",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
+        ex_libs          => "-Wl,+s -ldld -lpthread",
+        bn_ops           => "RC4_CHAR",
         dso_scheme       => "dl",
         shared_target    => "hpux-shared",
         shared_cflag     => "+Z",
         shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "hpux-parisc1_1-cc" => {
-        inherit_from     => [ "parisc11_asm" ],
-        cc               => "cc",
-        cflags           => "+DA1.1 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "+Z",
-        shared_ldflag    => "-b",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "hpux-parisc-cc", asm("parisc11_asm") ],
+        cflags           => add_before(" ", "+DA1.1"),
         multilib         => "/pa1.1",
     },
-    "hpux-parisc2-cc" => {
-        inherit_from     => [ "parisc20_32_asm" ],
-        cc               => "cc",
-        cflags           => "+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "+Z",
-        shared_ldflag    => "-b",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-        multilib         => "/pa20_32",
-    },
     "hpux64-parisc2-cc" => {
-        inherit_from     => [ "parisc20_64_asm" ],
+        inherit_from     => [ asm("parisc20_64_asm") ],
         cc               => "cc",
-        cflags           => "+DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",
+        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",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         shared_cflag     => "+Z",
         multilib         => "/pa20_64",
     },
 
-# HP/UX IA-64 targets
+    # HP/UX IA-64 targets
     "hpux-ia64-cc" => {
-        inherit_from     => [ "ia64_asm" ],
+        inherit_from     => [ asm("ia64_asm") ],
         cc               => "cc",
-        cflags           => "-Ae +DD32 +O2 +Olit=all -z -DB_ENDIAN -D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",
+        cflags           => "-Ae +DD32 +Olit=all -z -DB_ENDIAN",
+        debug_cflags     => "+O0 +d -g",
+        release_cflags   => "+O2",
+        thread_cflag     => "-D_REENTRANT",
+        ex_libs          => "-ldl -lpthread",
+        bn_ops           => "SIXTY_FOUR_BIT",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         shared_cflag     => "+Z",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "/hpux32",
     },
-# Frank Geurts <frank.geurts@nl.abnamro.com> has patiently assisted with
-# with debugging of the following config.
+    # Frank Geurts <frank.geurts@nl.abnamro.com> has patiently assisted
+    # with debugging of the following config.
     "hpux64-ia64-cc" => {
-        inherit_from     => [ "ia64_asm" ],
+        inherit_from     => [ asm("ia64_asm") ],
         cc               => "cc",
-        cflags           => "-Ae +DD64 +O3 +Olit=all -z -DB_ENDIAN -D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",
+        cflags           => "-Ae +DD64 +Olit=all -z -DB_ENDIAN",
+        debug_cflags     => "+O0 +d -g",
+        release_cflags   => "+O3",
+        thread_cflag     => "-D_REENTRANT",
+        ex_libs          => "-ldl -lpthread",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         shared_cflag     => "+Z",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "/hpux64",
     },
-# GCC builds...
+    # GCC builds...
     "hpux-ia64-gcc" => {
-        inherit_from     => [ "ia64_asm" ],
+        inherit_from     => [ asm("ia64_asm") ],
         cc               => "gcc",
-        cflags           => "-O3 -DB_ENDIAN -D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",
+        cflags           => "-DB_ENDIAN",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
+        thread_cflag     => "-pthread",
+        ex_libs          => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         shared_cflag     => "-fpic",
         multilib         => "/hpux32",
     },
     "hpux64-ia64-gcc" => {
-        inherit_from     => [ "ia64_asm" ],
+        inherit_from     => [ asm("ia64_asm") ],
         cc               => "gcc",
-        cflags           => "-mlp64 -O3 -DB_ENDIAN -D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",
+        cflags           => "-mlp64 -DB_ENDIAN",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
+        thread_cflag     => "-pthread",
+        ex_libs          => "-ldl",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         shared_cflag     => "-fpic",
         multilib         => "/hpux64",
     },
 
-# Legacy HPUX 9.X configs...
-    "hpux-cc" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "cc",
-        cflags           => "-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O2 -z",
-        thread_cflag     => "(unknown)",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "DES_PTR DES_UNROLL DES_RISC1",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "+Z",
-        shared_ldflag    => "-b",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "hpux-gcc" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "gcc",
-        cflags           => "-DB_ENDIAN -DBN_DIV2W -O3",
-        thread_cflag     => "(unknown)",
-        lflags           => "-Wl,+s -ldld",
-        bn_ops           => "DES_PTR DES_UNROLL DES_RISC1",
-        dso_scheme       => "dl",
-        shared_target    => "hpux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-shared",
-        shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-
 #### HP MPE/iX http://jazz.external.hp.com/src/openssl/
     "MPE/iX-gcc" => {
         cc               => "gcc",
         cflags           => "-D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB",
         thread_cflag     => "(unknown)",
         sys_id           => "MPE",
-        lflags           => "-L/SYSLOG/PUB -lsyslog -lsocket -lcurses",
-        bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",
+        ex_libs          => "-L/SYSLOG/PUB -lsyslog -lsocket -lcurses",
+        bn_ops           => "BN_LLONG",
     },
 
-# DEC Alpha OSF/1/Tru64 targets.
-#
-#      "What's in a name? That which we call a rose
-#       By any other word would smell as sweet."
-#
-# - William Shakespeare, "Romeo & Juliet", Act II, scene II.
-#
-# For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version
-#
+#### DEC Alpha OSF/1/Tru64 targets.
     "osf1-alpha-gcc" => {
-        inherit_from     => [ "alpha_asm" ],
+        inherit_from     => [ asm("alpha_asm") ],
         cc               => "gcc",
         cflags           => "-O3",
         thread_cflag     => "(unknown)",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
         dso_scheme       => "dlfcn",
         shared_target    => "alpha-osf1-shared",
         shared_extension => ".so",
     },
     "osf1-alpha-cc" => {
-        inherit_from     => [ "alpha_asm" ],
+        inherit_from     => [ asm("alpha_asm") ],
         cc               => "cc",
         cflags           => "-std1 -tune host -O4 -readonly_strings",
         thread_cflag     => "(unknown)",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
         dso_scheme       => "dlfcn",
         shared_target    => "alpha-osf1-shared",
         shared_extension => ".so",
     },
     "tru64-alpha-cc" => {
-        inherit_from     => [ "alpha_asm" ],
+        inherit_from     => [ asm("alpha_asm") ],
         cc               => "cc",
         cflags           => "-std1 -tune host -fast -readonly_strings",
         thread_cflag     => "-pthread",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
         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     => [ "no_asm_filler" ],
         cc               => "gcc",
         cflags           => "-Wall",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g",
-        release_cflags   => "-O3 -fomit-frame-pointer",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG",
+        release_cflags   => "-O3",
+        thread_cflag     => "-pthread",
+        ex_libs          => "-ldl",
+        bn_ops           => "BN_LLONG RC4_CHAR",
         dso_scheme       => "dlfcn",
         shared_target    => "linux-shared",
         shared_cflag     => "-fPIC",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
+    "linux-generic64" => {
+        inherit_from     => [ "linux-generic32" ],
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
+    },
+
     "linux-ppc" => {
-        inherit_from     => [ "ppc32_asm" ],
-        cc               => "gcc",
-        cflags           => "-DB_ENDIAN -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL",
+        inherit_from     => [ "linux-generic32", asm("ppc32_asm") ],
         perlasm_scheme   => "linux32",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "linux-ppc64" => {
+        inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],
+        cflags           => "-m64 -Wall -DB_ENDIAN",
+        perlasm_scheme   => "linux64",
+        shared_ldflag    => "-m64",
+        multilib         => "64",
+    },
+    "linux-ppc64le" => {
+        inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],
+        cflags           => "-m64 -Wall -DL_ENDIAN",
+        perlasm_scheme   => "linux64le",
+        shared_ldflag    => "-m64",
     },
 
-#######################################################################
-# Note that -march is not among compiler options in below linux-armv4
-# target line. Not specifying one is intentional to give you choice to:
-#
-# a) rely on your compiler default by not specifying one;
-# b) specify your target platform explicitly for optimal performance,
-#    e.g. -march=armv6 or -march=armv7-a;
-# c) build "universal" binary that targets *range* of platforms by
-#    specifying minimum and maximum supported architecture;
-#
-# As for c) option. It actually makes no sense to specify maximum to be
-# less than ARMv7, because it's the least requirement for run-time
-# switch between platform-specific code paths. And without run-time
-# switch performance would be equivalent to one for minimum. Secondly,
-# there are some natural limitations that you'd have to accept and
-# respect. Most notably you can *not* build "universal" binary for
-# big-endian platform. This is because ARMv7 processor always picks
-# instructions in little-endian order. Another similar limitation is
-# that -mthumb can't "cross" -march=armv6t2 boundary, because that's
-# where it became Thumb-2. Well, this limitation is a bit artificial,
-# because it's not really impossible, but it's deemed too tricky to
-# support. And of course you have to be sure that your binutils are
-# actually up to the task of handling maximum target platform. With all
-# this in mind here is an example of how to configure "universal" build:
-#
-#       ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8
-#
     "linux-armv4" => {
-        inherit_from     => [ "armv4_asm" ],
-        cc               => "gcc",
-        cflags           => "-O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        ################################################################
+        # Note that -march is not among compiler options in linux-armv4
+        # target description. Not specifying one is intentional to give
+        # you choice to:
+        #
+        # a) rely on your compiler default by not specifying one;
+        # b) specify your target platform explicitly for optimal
+        # performance, e.g. -march=armv6 or -march=armv7-a;
+        # c) build "universal" binary that targets *range* of platforms
+        # by specifying minimum and maximum supported architecture;
+        #
+        # As for c) option. It actually makes no sense to specify
+        # maximum to be less than ARMv7, because it's the least
+        # requirement for run-time switch between platform-specific
+        # code paths. And without run-time switch performance would be
+        # equivalent to one for minimum. Secondly, there are some
+        # natural limitations that you'd have to accept and respect.
+        # Most notably you can *not* build "universal" binary for
+        # big-endian platform. This is because ARMv7 processor always
+        # picks instructions in little-endian order. Another similar
+        # limitation is that -mthumb can't "cross" -march=armv6t2
+        # boundary, because that's where it became Thumb-2. Well, this
+        # limitation is a bit artificial, because it's not really
+        # impossible, but it's deemed too tricky to support. And of
+        # course you have to be sure that your binutils are actually
+        # up to the task of handling maximum target platform. With all
+        # this in mind here is an example of how to configure
+        # "universal" build:
+        #
+        # ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8
+        #
+        inherit_from     => [ "linux-generic32", asm("armv4_asm") ],
+        perlasm_scheme   => "linux32",
     },
     "linux-aarch64" => {
-        inherit_from     => [ "aarch64_asm" ],
-        cc               => "gcc",
-        cflags           => "-O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        inherit_from     => [ "linux-generic64", asm("aarch64_asm") ],
         perlasm_scheme   => "linux64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
-# Configure script adds minimally required -march for assembly support,
-# if no -march was specified at command line. mips32 and mips64 below
-# refer to contemporary MIPS Architecture specifications, MIPS32 and
-# MIPS64, rather than to kernel bitness.
+    "linux-arm64ilp32" => {  # https://wiki.linaro.org/Platform/arm64-ilp32
+        inherit_from     => [ "linux-generic32", asm("aarch64_asm") ],
+        cflags           => "-mabi=ilp32 -Wall",
+        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR",
+        perlasm_scheme   => "linux64",
+        shared_ldflag    => "-mabi=ilp32",
+    },
+
     "linux-mips32" => {
-        inherit_from     => [ "mips32_asm" ],
-        cc               => "gcc",
-        cflags           => "-mabi=32 -O3 -Wall -DBN_DIV3W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        # 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",
         perlasm_scheme   => "o32",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        shared_ldflag    => "-mabi=32",
     },
+    # mips32 and mips64 below refer to contemporary MIPS Architecture
+    # specifications, MIPS32 and MIPS64, rather than to kernel bitness.
     "linux-mips64" => {
-        inherit_from     => [ "mips64_asm" ],
-        cc               => "gcc",
-        cflags           => "-mabi=n32 -O3 -Wall -DBN_DIV3W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        inherit_from     => [ "linux-generic32", asm("mips64_asm") ],
+        cflags           => "-mabi=n32 -Wall -DBN_DIV3W",
+        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR",
         perlasm_scheme   => "n32",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
         shared_ldflag    => "-mabi=n32",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "32",
     },
     "linux64-mips64" => {
-        inherit_from     => [ "mips64_asm" ],
-        cc               => "gcc",
+        inherit_from     => [ "linux-generic64", asm("mips64_asm") ],
         cflags           => "-mabi=64 -O3 -Wall -DBN_DIV3W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
         perlasm_scheme   => "64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
         shared_ldflag    => "-mabi=64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "64",
     },
-#### IA-32 targets...
-    "linux-ia32-icc" => {
-        inherit_from     => [ "x86_elf_asm" ],
-        cc               => "icc",
-        cflags           => "-DL_ENDIAN -O2",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl -no_cpprt",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-KPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
+
+    #### IA-32 targets...
     "linux-elf" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ "linux-generic32", asm("x86_elf_asm") ],
         cc               => "gcc",
-        cflags           => "-DL_ENDIAN -Wall",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -g -march=i486",
+        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",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        debug_lflags     => "-lefence",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        debug_ex_libs    => "-lefence",
+        bn_ops           => "BN_LLONG",
     },
     "linux-aout" => {
-        inherit_from     => [ "x86_asm" ],
+        inherit_from     => [ asm("x86_asm") ],
         cc               => "gcc",
-        cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall",
+        cflags           => "-DL_ENDIAN -march=i486 -Wall",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3 -fomit-frame-pointer",
         thread_cflag     => "(unknown)",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        bn_ops           => "BN_LLONG",
         perlasm_scheme   => "a.out",
     },
-####
-    "linux-generic64" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "gcc",
-        cflags           => "-Wall",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g",
-        release_cflags   => "-O3",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "linux-ppc64" => {
-        inherit_from     => [ "ppc64_asm" ],
-        cc               => "gcc",
-        cflags           => "-m64 -DB_ENDIAN -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL",
-        perlasm_scheme   => "linux64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-        multilib         => "64",
-    },
-    "linux-ppc64le" => {
-        inherit_from     => [ "ppc64_asm" ],
-        cc               => "gcc",
-        cflags           => "-m64 -DL_ENDIAN -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL",
-        perlasm_scheme   => "linux64le",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "linux-ia64" => {
-        inherit_from     => [ "ia64_asm" ],
-        cc               => "gcc",
-        cflags           => "-DL_ENDIAN -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "linux-ia64-icc" => {
-        inherit_from     => [ "ia64_asm" ],
-        cc               => "icc",
-        cflags           => "-DL_ENDIAN -O2 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl -no_cpprt",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
+
     "linux-x86_64" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
+        inherit_from     => [ "linux-generic64", asm("x86_64_asm") ],
         cflags           => "-m64 -DL_ENDIAN -Wall",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g",
-        release_cflags   => "-O3",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
         shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "64",
     },
     "linux-x86_64-clang" => {
-        inherit_from     => [ "x86_64_asm" ],
+        inherit_from     => [ "linux-x86_64" ],
         cc               => "clang",
-        cflags           => "-m64 -DL_ENDIAN -O3 -Weverything $clang_disabled_warnings -Qunused-arguments",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
-        perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-        multilib         => "64",
-    },
-    "linux-x86_64-icc" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "icc",
-        cflags           => "-DL_ENDIAN -O2",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl -no_cpprt",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
-        perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-        multilib         => "64",
+        cflags           => "-m64 -DL_ENDIAN -Wall -Wextra -Qunused-arguments",
     },
     "linux-x32" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
-        cflags           => "-mx32 -DL_ENDIAN -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL",
+        inherit_from     => [ "linux-generic32", asm("x86_64_asm") ],
+        cflags           => "-mx32 -DL_ENDIAN -Wall",
+        bn_ops           => "SIXTY_FOUR_BIT",
         perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
         shared_ldflag    => "-mx32",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "x32",
     },
-    "linux64-s390x" => {
-        inherit_from     => [ "s390x_asm" ],
-        cc               => "gcc",
-        cflags           => "-m64 -DB_ENDIAN -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL",
+
+    "linux-ia64" => {
+        inherit_from     => [ "linux-generic64", asm("ia64_asm") ],
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
+    },
+
+    "linux64-s390x" => {
+        inherit_from     => [ "linux-generic64", asm("s390x_asm") ],
+        cflags           => "-m64 -Wall -DB_ENDIAN",
         perlasm_scheme   => "64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
         shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "64",
     },
-#### So called "highgprs" target for z/Architecture CPUs
-# "Highgprs" is kernel feature first implemented in Linux 2.6.32, see
-# /proc/cpuinfo. The idea is to preserve most significant bits of
-# general purpose registers not only upon 32-bit process context
-# switch, but even on asynchronous signal delivery to such process.
-# This makes it possible to deploy 64-bit instructions even in legacy
-# application context and achieve better [or should we say adequate]
-# performance. The build is binary compatible with linux-generic32,
-# and the idea is to be able to install the resulting libcrypto.so
-# alongside generic one, e.g. as /lib/highgprs/libcrypto.so.x.y, for
-# ldconfig and run-time linker to autodiscover. Unfortunately it
-# doesn't work just yet, because of couple of bugs in glibc
-# sysdeps/s390/dl-procinfo.c affecting ldconfig and ld.so.1...
     "linux32-s390x" => {
-        inherit_from     => [ "s390x_32_asm" ],
-        cc               => "gcc",
-        cflags           => "-m31 -Wa,-mzarch -DB_ENDIAN -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL",
+        #### So called "highgprs" target for z/Architecture CPUs
+        # "Highgprs" is kernel feature first implemented in Linux
+        # 2.6.32, see /proc/cpuinfo. The idea is to preserve most
+        # significant bits of general purpose registers not only
+        # upon 32-bit process context switch, but even on
+        # asynchronous signal delivery to such process. This makes
+        # it possible to deploy 64-bit instructions even in legacy
+        # application context and achieve better [or should we say
+        # adequate] performance. The build is binary compatible with
+        # linux-generic32, and the idea is to be able to install the
+        # resulting libcrypto.so alongside generic one, e.g. as
+        # /lib/highgprs/libcrypto.so.x.y, for ldconfig and run-time
+        # linker to autodiscover. Unfortunately it doesn't work just
+        # yet, because of couple of bugs in glibc
+        # 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",
+        bn_obj           => sub { my $r=join(" ",@_); $r=~s/bn\-s390x/bn_asm/; $r; },
         perlasm_scheme   => "31",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
         shared_ldflag    => "-m31",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "/highgprs",
     },
-#### SPARC Linux setups
-# Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently
-# assisted with debugging of following two configs.
+
+    #### SPARC Linux setups
+    # Ray Miller <ray.miller@computing-services.oxford.ac.uk> has
+    # patiently assisted with debugging of following two configs.
     "linux-sparcv8" => {
-        inherit_from     => [ "sparcv8_asm" ],
-        cc               => "gcc",
-        cflags           => "-mv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "linux-generic32", asm("sparcv8_asm") ],
+        cflags           => "-mcpu=v8 -Wall -DB_ENDIAN -DBN_DIV2W",
     },
-# it's a real mess with -mcpu=ultrasparc option under Linux, but
-# -Wa,-Av8plus should do the trick no matter what.
     "linux-sparcv9" => {
-        inherit_from     => [ "sparcv9_asm" ],
-        cc               => "gcc",
-        cflags           => "-m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "ULTRASPARC",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
+        # 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",
         shared_ldflag    => "-m32",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
-# GCC 3.1 is a requirement
     "linux64-sparcv9" => {
-        inherit_from     => [ "sparcv9_asm" ],
-        cc               => "gcc",
-        cflags           => "-m64 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "ULTRASPARC",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
+        # GCC 3.1 is a requirement
+        inherit_from     => [ "linux-generic64", asm("sparcv9_asm") ],
+        cflags           => "-m64 -mcpu=ultrasparc -Wall -DB_ENDIAN",
+        bn_ops           => "BN_LLONG RC4_CHAR",
         shared_ldflag    => "-m64",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         multilib         => "64",
     },
-#### Alpha Linux with GNU C and Compaq C setups
-# Special notes:
-# - linux-alpha+bwx-gcc is ment to be used from ./config only. If you
-#   ought to run './Configure linux-alpha+bwx-gcc' manually, do
-#   complement the command line with -mcpu=ev56, -mcpu=ev6 or whatever
-#   which is appropriate.
-# - If you use ccc keep in mind that -fast implies -arch host and the
-#   compiler is free to issue instructions which gonna make elder CPU
-#   choke. If you wish to build "blended" toolkit, add -arch generic
-#   *after* -fast and invoke './Configure linux-alpha-ccc' manually.
+
     "linux-alpha-gcc" => {
-        inherit_from     => [ "alpha_asm" ],
-        cc               => "gcc",
-        cflags           => "-O3 -DL_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "linux-alpha+bwx-gcc" => {
-        inherit_from     => [ "alpha_asm" ],
-        cc               => "gcc",
-        cflags           => "-O3 -DL_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
-    "linux-alpha-ccc" => {
-        inherit_from     => [ "alpha_asm" ],
-        cc               => "ccc",
-        cflags           => "-fast -readonly_strings -DL_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL",
-    },
-    "linux-alpha+bwx-ccc" => {
-        inherit_from     => [ "alpha_asm" ],
-        cc               => "ccc",
-        cflags           => "-fast -readonly_strings -DL_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL",
+        inherit_from     => [ "linux-generic64", asm("alpha_asm") ],
+        cflags           => "-DL_ENDIAN",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
     },
-#
-# TI_CGT_C6000_7.3.x is a requirement
     "linux-c64xplus" => {
+        # 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",
         ranlib           => "true",
     },
 
-# Android: linux-* but without pointers to headers and libs.
+#### Android: linux-* but without pointers to headers and libs.
+    #
+    # It takes pair of prior-set environment variables to make it work:
+    #
+    # CROSS_SYSROOT=/some/where/android-ndk-<ver>/platforms/android-<apiver>/arch-<
+    # CROSS_COMPILE=<prefix>
+    #
+    # As well as PATH adjusted to cover ${CROSS_COMPILE}gcc and company.
+    # For example to compile for ICS and ARM with NDK 10d, you'd:
+    #
+    # ANDROID_NDK=/some/where/android-ndk-10d
+    # CROSS_SYSROOT=$ANDROID_NDK/platforms/android-14/arch-arm
+    # CROSS_COMPILE=arm-linux-adroideabi-
+    # PATH=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.8/prebuild/linux-x86_64/
+    #
     "android" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "gcc",
-        cflags           => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "linux-generic32" ],
+        # Special note about unconditional -fPIC and -pie. The underlying
+        # reason is that Lollipop refuses to run non-PIE. But what about
+        # older systems and NDKs? -fPIC was never problem, so the only
+        # concern if -pie. Older toolchains, e.g. r4, appear to handle it
+        # and binaries turn mostly functional. "Mostly" means that oldest
+        # Androids, such as Froyo, fail to handle executable, but newer
+        # 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",
+        lflags           => "-pie",
+        ex_libs          => "-ldl",
+        shared_cflag     => "",
     },
     "android-x86" => {
-        inherit_from     => [ "android_x86_elf_asm" ],
-        cc               => "gcc",
-        cflags           => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "android", asm("x86_asm") ],
+        release_cflags   => "-O3 -fomit-frame-pointer",
+        bn_ops           => "BN_LLONG",
+        perlasm_scheme   => "android",
+    },
+    ################################################################
+    # Contemporary Android applications can provide multiple JNI
+    # providers in .apk, targeting multiple architectures. Among
+    # them there is "place" for two ARM flavours: generic eabi and
+    # armv7-a/hard-float. However, it should be noted that OpenSSL's
+    # ability to engage NEON is not constrained by ABI choice, nor
+    # is your ability to call OpenSSL from your application code
+    # compiled with floating-point ABI other than default 'soft'.
+    # [Latter thanks to __attribute__((pcs("aapcs"))) declaration.]
+    # This means that choice of ARM libraries you provide in .apk
+    # is driven by application needs. For example if application
+    # itself benefits from NEON or is floating-point intensive, then
+    # it might be appropriate to provide both libraries. Otherwise
+    # just generic eabi would do. But in latter case it would be
+    # appropriate to
+    #
+    #   ./Configure android-armeabi -D__ARM_MAX_ARCH__=8
+    #
+    # in order to build "universal" binary and allow OpenSSL take
+    # advantage of NEON when it's available.
+    #
+    "android-armeabi" => {
+        inherit_from     => [ "android", asm("armv4_asm") ],
     },
     "android-armv7" => {
-        inherit_from     => [ "armv4_asm" ],
-        cc               => "gcc",
-        cflags           => "-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "android-armeabi" ],
+        cflags           => add_before(" ", "-march=armv7-a"),
     },
     "android-mips" => {
-        inherit_from     => [ "mips32_asm" ],
-        cc               => "gcc",
-        cflags           => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        inherit_from     => [ "android", asm("mips32_asm") ],
         perlasm_scheme   => "o32",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
 
-#### *BSD [do see comment about ${BSDthreads} in Configure!]
+    "android64" => {
+        inherit_from     => [ "linux-generic64" ],
+        cflags           => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall",
+        debug_cflags     => "-O0 -g",
+        lflags           => "-pie",
+        ex_libs          => "-ldl",
+        shared_cflag     => "",
+    },
+    "android64-aarch64" => {
+        inherit_from     => [ "android64", asm("aarch64_asm") ],
+        perlasm_scheme   => "linux64",
+    },
+
+#### *BSD
     "BSD-generic32" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "gcc",
-        cflags           => "-O3 -fomit-frame-pointer -Wall",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL",
+        # 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?
+        cc               => "cc",
+        cflags           => "-Wall",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O3",
+        thread_cflag     => "-pthread -D_THREAD_SAFE -D_REENTRANT",
+        bn_ops           => "BN_LLONG",
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
         shared_cflag     => "-fPIC",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
-    "BSD-x86" => {
-        inherit_from     => [ "x86_asm" ],
-        cc               => "gcc",
-        cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -Wall",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
-        perlasm_scheme   => "a.out",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "BSD-generic64" => {
+        inherit_from     => [ "BSD-generic32" ],
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
     },
-    "BSD-x86-elf" => {
-        inherit_from     => [ "x86_elf_asm" ],
-        cc               => "gcc",
+
+    "BSD-x86" => {
+        inherit_from     => [ "BSD-generic32", asm("x86_asm") ],
         cflags           => "-DL_ENDIAN -Wall",
-        debug_cflags     => "-g",
         release_cflags   => "-O3 -fomit-frame-pointer",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
-        dso_scheme       => "dlfcn",
+        bn_ops           => "BN_LLONG",
         shared_target    => "bsd-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        perlasm_scheme   => "a.out",
     },
-    "BSD-sparcv8" => {
-        inherit_from     => [ "sparcv8_asm" ],
-        cc               => "gcc",
-        cflags           => "-DB_ENDIAN -O3 -mv8 -Wall",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "BSD-x86-elf" => {
+        inherit_from     => [ "BSD-x86" ],
+        perlasm_scheme   => "elf",
     },
 
-    "BSD-generic64" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "gcc",
-        cflags           => "-O3 -Wall",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    "BSD-sparcv8" => {
+        inherit_from     => [ "BSD-generic32", asm("sparcv8_asm") ],
+        cflags           => "-mcpu=v8 -Wall -DB_ENDIAN",
     },
-# -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.
     "BSD-sparc64" => {
-        inherit_from     => [ "sparcv9_asm" ],
-        cc               => "gcc",
-        cflags           => "-DB_ENDIAN -O3 -DMD32_REG_T=int -Wall",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        # -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",
+        bn_ops           => "BN_LLONG",
     },
+
     "BSD-ia64" => {
-        inherit_from     => [ "ia64_asm" ],
-        cc               => "gcc",
-        cflags           => "-DL_ENDIAN -O3 -Wall",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+        inherit_from     => [ "BSD-generic64", asm("ia64_asm") ],
+        cflags           => "-DL_ENDIAN -Wall",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
     },
+
     "BSD-x86_64" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
-        cflags           => "-DL_ENDIAN -O3 -Wall",
-        thread_cflag     => "${BSDthreads}",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        inherit_from     => [ "BSD-generic64", asm("x86_64_asm") ],
+        cflags           => "-DL_ENDIAN -Wall",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
 
     "bsdi-elf-gcc" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall",
         thread_cflag     => "(unknown)",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        ex_libs          => "-ldl",
+        bn_ops           => "BN_LLONG",
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
         shared_cflag     => "-fPIC",
         cflags           => "-O -Wall",
         unistd           => "<libc.h>",
         thread_cflag     => "(unknown)",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        bn_ops           => "BN_LLONG",
     },
     "nextstep3.3" => {
         cc               => "cc",
         cflags           => "-O3 -Wall",
         unistd           => "<libc.h>",
         thread_cflag     => "(unknown)",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        bn_ops           => "BN_LLONG",
     },
 
 # QNX
         cc               => "cc",
         cflags           => "-DL_ENDIAN -DTERMIO",
         thread_cflag     => "(unknown)",
-        bn_ops           => "${x86_gcc_des} ${x86_gcc_opts}",
     },
     "QNX6" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "gcc",
-        lflags           => "-lsocket",
+        ex_libs          => "-lsocket",
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
         shared_cflag     => "-fPIC",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "QNX6-i386" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -O2 -Wall",
-        lflags           => "-lsocket",
-        bn_ops           => "${x86_gcc_des} ${x86_gcc_opts}",
+        ex_libs          => "-lsocket",
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
         shared_cflag     => "-fPIC",
         cc               => "cc",
         cflags           => "-DFILIO_H -DNO_STRINGS_H",
         thread_cflag     => "-Kthread",
-        lflags           => "-lsocket -lnsl -lresolv -lx",
-        bn_ops           => "${x86_gcc_des} ${x86_gcc_opts}",
+        ex_libs          => "-lsocket -lnsl -lresolv -lx",
     },
     "unixware-2.1" => {
         cc               => "cc",
         cflags           => "-O -DFILIO_H",
         thread_cflag     => "-Kthread",
-        lflags           => "-lsocket -lnsl -lresolv -lx",
-        bn_ops           => "${x86_gcc_des} ${x86_gcc_opts}",
+        ex_libs          => "-lsocket -lnsl -lresolv -lx",
     },
     "unixware-7" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "cc",
         cflags           => "-O -DFILIO_H -Kalloca",
         thread_cflag     => "-Kthread",
-        lflags           => "-lsocket -lnsl",
-        bn_ops           => "BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}",
+        ex_libs          => "-lsocket -lnsl",
+        bn_ops           => "BN_LLONG",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
         shared_target    => "svr5-shared",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "unixware-7-gcc" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => "-lsocket -lnsl",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        ex_libs          => "-lsocket -lnsl",
+        bn_ops           => "BN_LLONG",
         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     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "cc",
         cflags           => "-belf",
         thread_cflag     => "(unknown)",
-        lflags           => "-lsocket -lnsl",
-        bn_ops           => "${x86_gcc_des} ${x86_gcc_opts}",
+        ex_libs          => "-lsocket -lnsl",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
         shared_target    => "svr3-shared",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "sco5-gcc" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-O3 -fomit-frame-pointer",
         thread_cflag     => "(unknown)",
-        lflags           => "-lsocket -lnsl",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        ex_libs          => "-lsocket -lnsl",
+        bn_ops           => "BN_LLONG",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
         shared_target    => "svr3-shared",
     },
 
 #### IBM's AIX.
-    "aix3-cc" => {
-        cc               => "cc",
-        cflags           => "-O -DB_ENDIAN -qmaxmem=16384",
-        thread_cflag     => "(unknown)",
-        sys_id           => "AIX",
-        bn_ops           => "BN_LLONG RC4_CHAR",
-    },
     "aix-gcc" => {
-        inherit_from     => [ "ppc32_asm" ],
+        inherit_from     => [ asm("ppc32_asm") ],
         cc               => "gcc",
-        cflags           => "-O -DB_ENDIAN",
+        cflags           => "-DB_ENDIAN",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O",
         thread_cflag     => "-pthread",
         sys_id           => "AIX",
         bn_ops           => "BN_LLONG RC4_CHAR",
         arflags          => "-X32",
     },
     "aix64-gcc" => {
-        inherit_from     => [ "ppc64_asm" ],
+        inherit_from     => [ asm("ppc64_asm") ],
         cc               => "gcc",
-        cflags           => "-maix64 -O -DB_ENDIAN",
+        cflags           => "-maix64 -DB_ENDIAN",
+        debug_cflags     => "-O0 -g",
+        release_cflags   => "-O",
         thread_cflag     => "-pthread",
         sys_id           => "AIX",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         arflags          => "-X64",
     },
-# Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
-# at build time. $OBJECT_MODE is respected at ./config stage!
+    # Below targets assume AIX 5. Idea is to effectively disregard
+    # $OBJECT_MODE at build time. $OBJECT_MODE is respected at
+    # ./config stage!
     "aix-cc" => {
-        inherit_from     => [ "ppc32_asm" ],
+        inherit_from     => [ asm("ppc32_asm") ],
         cc               => "cc",
-        cflags           => "-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
+        cflags           => "-q32 -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
+        debug_cflags     => "",
+        release_cflags   => "-O",
         thread_cflag     => "-qthreaded -D_THREAD_SAFE",
         sys_id           => "AIX",
         bn_ops           => "BN_LLONG RC4_CHAR",
         arflags          => "-X 32",
     },
     "aix64-cc" => {
-        inherit_from     => [ "ppc64_asm" ],
+        inherit_from     => [ asm("ppc64_asm") ],
         cc               => "cc",
-        cflags           => "-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
+        cflags           => "-q64 -DB_ENDIAN -qmaxmem=16384 -qro -qroconst",
+        debug_cflags     => "",
+        release_cflags   => "-O",
         thread_cflag     => "-qthreaded -D_THREAD_SAFE",
         sys_id           => "AIX",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         cc               => "c89",
         cflags           => "-O -XLLML -XLLMK -XL -DB_ENDIAN -DCHARSET_EBCDIC",
         thread_cflag     => "(unknown)",
-        lflags           => "-lsocket -lnsl",
-        bn_ops           => "THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR",
+        ex_libs          => "-lsocket -lnsl",
+        bn_ops           => "THIRTY_TWO_BIT RC4_CHAR",
     },
 
 # OS/390 Unix an EBCDIC-based Unix system on IBM mainframe
         cc               => "c89.sh",
         cflags           => "-O -DB_ENDIAN -DCHARSET_EBCDIC -DNO_SYS_PARAM_H  -D_ALL_SOURCE",
         thread_cflag     => "(unknown)",
-        bn_ops           => "THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR",
+        bn_ops           => "THIRTY_TWO_BIT RC4_CHAR",
     },
 
-# Visual C targets
+#### Visual C targets
 #
 # Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64
 #
 # 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.
-    "VC-WIN64I" => {
+    "VC-common" => {
+        template         => 1,
         cc               => "cl",
-        cflags           => "-W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE",
-        sys_id           => "WIN64I",
-        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",
-        cpuid_obj        => "ia64cpuid.o",
-        bn_obj           => "ia64.o ia64-mont.o",
-        aes_obj          => "aes_core.o aes_cbc.o aes-ia64.o",
-        md5_obj          => "md5-ia64.o",
-        sha1_obj         => "sha1-ia64.o sha256-ia64.o sha512-ia64.o",
-        modes_obj        => "ghash-ia64.o",
-        perlasm_scheme   => "ias",
+        cflags           => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE",
         dso_scheme       => "win32",
+       build_scheme     => "mk1mf",
     },
-    "debug-VC-WIN64I" => {
-        cc               => "cl",
-        cflags           => "-W3 -wd4090 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE",
+    "VC-WIN64I" => {
+        inherit_from     => [ "VC-common", asm("ia64_asm") ],
+        cflags           => add(" ", "-DUNICODE -D_UNICODE"),
         sys_id           => "WIN64I",
-        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",
-        cpuid_obj        => "ia64cpuid.o",
-        bn_obj           => "ia64.o",
-        aes_obj          => "aes_core.o aes_cbc.o aes-ia64.o",
-        md5_obj          => "md5-ia64.o",
-        sha1_obj         => "sha1-ia64.o sha256-ia64.o sha512-ia64.o",
-        modes_obj        => "ghash-ia64.o",
+        bn_ops           => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
+        bn_obj           => sub { my $r=join(" ",@_); $r=~s/bn\-//; $r; },
+        rc4_obj          => "",
         perlasm_scheme   => "ias",
-        dso_scheme       => "win32",
+       build_scheme     => [ "mk1mf", "VC-W64" ],
     },
     "VC-WIN64A" => {
-        inherit_from     => [ "win_x86_64_asm" ],
-        cc               => "cl",
-        cflags           => "-W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE",
-        debug_cflags     => "-Zi",
+        inherit_from     => [ "VC-common", asm("x86_64_asm") ],
+        cflags           => add(" ", "-DUNICODE -D_UNICODE"),
         sys_id           => "WIN64A",
-        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",
+        bn_ops           => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
+        bn_obj           => sub { my $r=join(" ",@_); $r=~s/x86_64\-gcc/bn_asm/; $r; },
         perlasm_scheme   => "auto",
-        dso_scheme       => "win32",
+       build_scheme     => [ "mk1mf", "VC-W64" ],
     },
-# x86 Win32 target defaults to ANSI API, if you want UNICODE, complement
-# 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
     "VC-WIN32" => {
-        inherit_from     => [ "x86_asm" ],
-        cc               => "cl",
-        cflags           => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE",
-        debug_cflags     => "-Zi",
+        # 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") ],
         sys_id           => "WIN32",
-        bn_ops           => "BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}",
+        bn_ops           => "BN_LLONG EXPORT_VAR_AS_FN",
         perlasm_scheme   => "win32n",
-        dso_scheme       => "win32",
+       build_scheme     => [ "mk1mf", "VC-W32" ],
     },
-# Unified CE target
     "VC-CE" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "cl",
         sys_id           => "WINCE",
-        bn_ops           => "BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}",
+        bn_ops           => "BN_LLONG EXPORT_VAR_AS_FN",
         dso_scheme       => "win32",
+       build_scheme     => [ "mk1mf", "VC-WCE" ],
     },
 
-# Borland C++ 4.5
+#### Borland C++ 4.5
     "BC-32" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "bcc32",
         sys_id           => "WIN32",
-        bn_ops           => "BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN",
+        bn_ops           => "BN_LLONG EXPORT_VAR_AS_FN",
         dso_scheme       => "win32",
+       build_scheme     => [ "mk1mf", "BC" ],
     },
 
-# MinGW
+#### MinGW
     "mingw" => {
-        inherit_from     => [ "x86_asm" ],
+        inherit_from     => [ asm("x86_asm") ],
         cc               => "gcc",
-        cflags           => "-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall",
+        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",
         sys_id           => "MINGW32",
-        lflags           => "-lws2_32 -lgdi32 -lcrypt32",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN",
+        ex_libs          => "-lws2_32 -lgdi32 -lcrypt32",
+        bn_ops           => "BN_LLONG EXPORT_VAR_AS_FN",
         perlasm_scheme   => "coff",
         dso_scheme       => "win32",
         shared_target    => "cygwin-shared",
         shared_cflag     => "-D_WINDLL -DOPENSSL_USE_APPLINK",
-        shared_ldflag    => "-mno-cygwin",
-        shared_extension => ".dll.a",
-    },
-# As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll
-# compiled with one compiler with application compiled with another
-# compiler. It's possible to engage Applink support in mingw64 build,
-# but it's not done, because till mingw64 supports structured exception
-# handling, one can't seriously 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.
+        shared_ldflag    => "-static-libgcc",
+        shared_rcflag    => "--target=pe-i386",
+        shared_extension => ".dll",
+    },
     "mingw64" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "gcc",
-        cflags           => "-mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE",
+        # As for OPENSSL_USE_APPLINK. Applink makes it possible to use
+        # .dll compiled with one compiler with application compiled with
+        # another compiler. It's possible to engage Applink support in
+        # mingw64 build, but it's not done, because till mingw64
+        # supports structured exception handling, one can't seriously
+        # 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") ],
+        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",
         sys_id           => "MINGW64",
-        lflags           => "-lws2_32 -lgdi32 -lcrypt32",
-        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",
+        ex_libs          => "-lws2_32 -lgdi32 -lcrypt32",
+        bn_ops           => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
         perlasm_scheme   => "mingw64",
         dso_scheme       => "win32",
         shared_target    => "cygwin-shared",
         shared_cflag     => "-D_WINDLL",
-        shared_ldflag    => "-mno-cygwin",
-        shared_extension => ".dll.a",
+        shared_ldflag    => "-static-libgcc",
+        shared_rcflag    => "--target=pe-x86-64",
+        shared_extension => ".dll",
     },
 
-# UWIN
+#### UEFI
+    "UEFI" => {
+        cc               => "cc",
+        cflags           => "-DL_ENDIAN -O",
+        sys_id           => "UEFI",
+    },
+
+#### UWIN
     "UWIN" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "cc",
         cflags           => "-DTERMIOS -DL_ENDIAN -O -Wall",
         sys_id           => "UWIN",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        bn_ops           => "BN_LLONG",
         dso_scheme       => "win32",
     },
 
-# Cygwin
-    "Cygwin" => {
-        inherit_from     => [ "x86_asm" ],
+#### Cygwin
+    "Cygwin-x86" => {
+        inherit_from     => [ asm("x86_asm") ],
         cc               => "gcc",
-        cflags           => "-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall",
+        cflags           => "-DTERMIOS -DL_ENDIAN -Wall",
+        debug_cflags     => "-g -O0",
+        release_cflags   => "-O3 -fomit-frame-pointer",
         sys_id           => "CYGWIN",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        bn_ops           => "BN_LLONG",
         perlasm_scheme   => "coff",
         dso_scheme       => "dlfcn",
         shared_target    => "cygwin-shared",
         shared_cflag     => "-D_WINDLL",
         shared_ldflag    => "-shared",
-        shared_extension => ".dll.a",
+        shared_extension => ".dll",
     },
     "Cygwin-x86_64" => {
-        inherit_from     => [ "x86_64_asm" ],
+        inherit_from     => [ asm("x86_64_asm") ],
         cc               => "gcc",
-        cflags           => "-DTERMIOS -DL_ENDIAN -O3 -Wall",
+        cflags           => "-DTERMIOS -DL_ENDIAN -Wall",
+        debug_cflags     => "-g -O0",
+        release_cflags   => "-O3",
         sys_id           => "CYGWIN",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "mingw64",
         dso_scheme       => "dlfcn",
         shared_target    => "cygwin-shared",
         shared_cflag     => "-D_WINDLL",
         shared_ldflag    => "-shared",
-        shared_extension => ".dll.a",
+        shared_extension => ".dll",
+    },
+    # Backward compatibility for those using this target
+    "Cygwin" => {
+       inherit_from     => [ "Cygwin-x86" ]
+    },
+    # In case someone constructs the Cygwin target name themself
+    "Cygwin-i386" => {
+       inherit_from     => [ "Cygwin-x86" ]
+    },
+    "Cygwin-i486" => {
+       inherit_from     => [ "Cygwin-x86" ]
+    },
+    "Cygwin-i586" => {
+       inherit_from     => [ "Cygwin-x86" ]
+    },
+    "Cygwin-i686" => {
+       inherit_from     => [ "Cygwin-x86" ]
     },
 
-# NetWare from David Ward (dsward@novell.com)
+#### NetWare from David Ward (dsward@novell.com)
 # requires either MetroWerks NLM development tools, or gcc / nlmconv
 # NetWare defaults socket bio to WinSock sockets. However,
 # the builds can be configured to use BSD sockets instead.
 # netware-clib => legacy CLib c-runtime support
     "netware-clib" => {
         cc               => "mwccnlm",
-        bn_ops           => "${x86_gcc_opts}",
+       build_scheme     => [ "mk1mf", "netware" ],
     },
     "netware-clib-bsdsock" => {
         cc               => "mwccnlm",
-        bn_ops           => "${x86_gcc_opts}",
+       build_scheme     => [ "mk1mf", "netware" ],
     },
     "netware-clib-gcc" => {
         cc               => "i586-netware-gcc",
         cflags           => "-nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall",
-        bn_ops           => "${x86_gcc_opts}",
     },
     "netware-clib-bsdsock-gcc" => {
         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",
-        bn_ops           => "${x86_gcc_opts}",
     },
-# netware-libc => LibC/NKS support
+    # netware-libc => LibC/NKS support
     "netware-libc" => {
         cc               => "mwccnlm",
-        bn_ops           => "BN_LLONG ${x86_gcc_opts}",
+        bn_ops           => "BN_LLONG",
+       build_scheme     => [ "mk1mf", "netware" ],
     },
     "netware-libc-bsdsock" => {
         cc               => "mwccnlm",
-        bn_ops           => "BN_LLONG ${x86_gcc_opts}",
+        bn_ops           => "BN_LLONG",
+       build_scheme     => [ "mk1mf", "netware" ],
     },
     "netware-libc-gcc" => {
         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 ${x86_gcc_opts}",
+        bn_ops           => "BN_LLONG",
     },
     "netware-libc-bsdsock-gcc" => {
         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 ${x86_gcc_opts}",
+        bn_ops           => "BN_LLONG",
     },
 
-# DJGPP
+#### DJGPP
     "DJGPP" => {
-        inherit_from     => [ "x86_asm" ],
+        inherit_from     => [ asm("x86_asm") ],
         cc               => "gcc",
         cflags           => "-I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall",
         sys_id           => "MSDOS",
-        lflags           => "-L/dev/env/WATT_ROOT/lib -lwatt",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        ex_libs          => "-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 from Bernhard Simon <simon@zid.tuwien.ac.at>
     "ultrix-cc" => {
         cc               => "cc",
         cflags           => "-std1 -O -Olimit 2500 -DL_ENDIAN",
 ##"ultrix","cc:-O2 -DNOPROTO -DNOCONST -DL_ENDIAN::(unknown):::::::",
 
 ##### MacOS X (a.k.a. Darwin) setup
-    "darwin-ppc-cc" => {
-        inherit_from     => [ "ppc32_asm" ],
+    "darwin-common" => {
+        template         => 1,
         cc               => "cc",
-        cflags           => "-arch ppc -DB_ENDIAN -Wa,-force_cpusubtype_ALL",
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall -O",
+        cflags           => "",
+        debug_cflags     => "-g -O0",
         release_cflags   => "-O3",
         thread_cflag     => "-D_REENTRANT",
         sys_id           => "MACOSX",
-        lflags           => "-Wl,-search_paths_first%",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
+        plib_lflags      => "-Wl,-search_paths_first",
+        bn_ops           => "BN_LLONG RC4_CHAR",
         perlasm_scheme   => "osx32",
         dso_scheme       => "dlfcn",
         shared_target    => "darwin-shared",
         shared_cflag     => "-fPIC -fno-common",
-        shared_ldflag    => "-arch ppc -dynamiclib",
+        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",
+        perlasm_scheme   => "osx32",
+        shared_ldflag    => "-arch ppc -dynamiclib",
+    },
     "darwin64-ppc-cc" => {
-        inherit_from     => [ "ppc64_asm" ],
-        cc               => "cc",
-        cflags           => "-arch ppc64 -O3 -DB_ENDIAN",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "MACOSX",
-        lflags           => "-Wl,-search_paths_first%",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
+        inherit_from     => [ "darwin-common", asm("ppc64_asm") ],
+        cflags           => "-arch ppc64 -DB_ENDIAN",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         perlasm_scheme   => "osx64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "darwin-shared",
-        shared_cflag     => "-fPIC -fno-common",
         shared_ldflag    => "-arch ppc64 -dynamiclib",
-        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
     },
     "darwin-i386-cc" => {
-        inherit_from     => [ "x86_asm_nocast" ],
-        cc               => "cc",
+        inherit_from     => [ "darwin-common", asm("x86_asm") ],
         cflags           => "-arch i386 -DL_ENDIAN",
-        debug_cflags     => "-g3",
         release_cflags   => "-O3 -fomit-frame-pointer",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "MACOSX",
-        lflags           => "-Wl,-search_paths_first%",
-        bn_ops           => "BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR",
+        bn_ops           => "BN_LLONG RC4_INT",
         perlasm_scheme   => "macosx",
-        dso_scheme       => "dlfcn",
-        shared_target    => "darwin-shared",
-        shared_cflag     => "-fPIC -fno-common",
         shared_ldflag    => "-arch i386 -dynamiclib",
-        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
     },
     "darwin64-x86_64-cc" => {
-        inherit_from     => [ "x86_64_asm" ],
-        cc               => "cc",
+        inherit_from     => [ "darwin-common", asm("x86_64_asm") ],
         cflags           => "-arch x86_64 -DL_ENDIAN -Wall",
-        debug_cflags     => "-ggdb -g2 -O0",
-        release_cflags   => "-O3",
-        thread_cflag     => "-D_REENTRANT",
-        sys_id           => "MACOSX",
-        lflags           => "-Wl,-search_paths_first%",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "macosx",
-        dso_scheme       => "dlfcn",
-        shared_target    => "darwin-shared",
-        shared_cflag     => "-fPIC -fno-common",
         shared_ldflag    => "-arch x86_64 -dynamiclib",
-        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
     },
-# iPhoneOS/iOS
+
+#### iPhoneOS/iOS
 #
 # It takes three prior-set environment variables to make it work:
 #
 #
 # CROSS_COMPILE=`xcode-select --print-path`/Toolchains/XcodeDefault.xctoolchain/usr/bin/
 # CROSS_TOP=`xcode-select --print-path`/Platforms/iPhoneOS.platform/Developer
-# CROSS_SDK=iPhoneOS7.0.sdk
+# CROSS_SDK=iPhoneOS.sdk
 #
     "iphoneos-cross" => {
-        inherit_from     => [ "no_asm_filler" ],
-        cc               => "cc",
-        cflags           => "-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common",
-        thread_cflag     => "-D_REENTRANT",
+        inherit_from     => [ "darwin-common" ],
+        cflags           => "-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
         sys_id           => "iOS",
-        lflags           => "-Wl,-search_paths_first%",
-        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
-        dso_scheme       => "dlfcn",
-        shared_target    => "darwin-shared",
-        shared_cflag     => "-fPIC -fno-common",
-        shared_ldflag    => "-dynamiclib",
-        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+    },
+    "ios-cross" => {
+        inherit_from     => [ "darwin-common", asm("armv4_asm") ],
+        # 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",
+        sys_id           => "iOS",
+        perlasm_scheme   => "ios32",
     },
     "ios64-cross" => {
-        inherit_from     => [ "aarch64_asm" ],
-        cc               => "cc",
-        cflags           => "-O3 -arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
-        thread_cflag     => "-D_REENTRANT",
+        inherit_from     => [ "darwin-common", asm("aarch64_asm") ],
+        cflags           => "-arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
         sys_id           => "iOS",
-        lflags           => "-Wl,-search_paths_first%",
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         perlasm_scheme   => "ios64",
-        dso_scheme       => "dlfcn",
-        shared_target    => "darwin-shared",
-        shared_cflag     => "-fPIC -fno-common",
-        shared_ldflag    => "-dynamiclib",
-        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-    },
-
-##### A/UX
-    "aux3-gcc" => {
-        cc               => "gcc",
-        cflags           => "-O2 -DTERMIO",
-        thread_cflag     => "(unknown)",
-        sys_id           => "AUX",
-        lflags           => "-lbsd",
-        bn_ops           => "RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
     },
 
 ##### GNU Hurd
     "hurd-x86" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall",
-        thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
-        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+        thread_cflag     => "-pthread",
+        ex_libs          => "-ldl",
+        bn_ops           => "BN_LLONG",
         dso_scheme       => "dlfcn",
         shared_target    => "linux-shared",
         shared_cflag     => "-fPIC",
         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",
-        lflags           => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/common",
+        ex_libs          => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/common",
     },
     "vxworks-ppcgen" => {
         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",
-        lflags           => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon",
+        ex_libs          => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon",
     },
     "vxworks-ppc405" => {
         cc               => "ccppc",
     },
     "vxworks-ppc750-debug" => {
         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_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g",
+        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",
     },
         lflags           => "-r",
     },
     "vxworks-simlinux" => {
-        inherit_from     => [ "no_asm_filler" ],
         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     => [ "mips32_asm" ],
+        inherit_from     => [ 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",
         sys_id           => "VXWORKS",
-        lflags           => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon",
+        ex_libs          => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon",
         perlasm_scheme   => "o32",
         ranlib           => "ranlibmips",
     },
 
-# uClinux
+#### uClinux
     "uClinux-dist" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "$ENV{'CC'}",
         cflags           => "\$(CFLAGS)",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => "\$(LDFLAGS) \$(LDLIBS)",
+        plib_lflags      => "\$(LDFLAGS)",
+        ex_libs          => "\$(LDLIBS)",
         bn_ops           => "BN_LLONG",
         dso_scheme       => "$ENV{'LIBSSL_dlfcn'}",
         shared_target    => "linux-shared",
         ranlib           => "$ENV{'RANLIB'}",
     },
     "uClinux-dist64" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "$ENV{'CC'}",
         cflags           => "\$(CFLAGS)",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => "\$(LDFLAGS) \$(LDLIBS)",
+        plib_lflags      => "\$(LDFLAGS)",
+        ex_libs          => "\$(LDLIBS)",
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         dso_scheme       => "$ENV{'LIBSSL_dlfcn'}",
         shared_target    => "linux-shared",
         ranlib           => "$ENV{'RANLIB'}",
     },
 
+    ##### VMS
+    "vms-generic" => {
+        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",
+        shared_target    => "vms-shared",
+
+        apps_extra_src   => "vms_decc_init.c",
+        build_file       => "descrip.mms",
+        build_scheme     => [ "unified", "VMS" ],
+    },
+
+    # VMS on VAX is *unsupported*
+    #"vms-asm" => {
+    #   template          => 1,
+    #   bn_obj            => "[.asm]vms.obj vms-helper.obj"
+    #},
+    #"vms-vax" => {
+    #   inherit_from      => [ "vms-generic", asm("vms-asm") ],
+    #   as                => "MACRO",
+    #   debug_aflags      => "/NOOPTIMIZE/DEBUG",
+    #   release_aflags    => "/OPTIMIZE/NODEBUG",
+    #   bn_opts           => "THIRTY_TWO_BIT RC4_CHAR RC4_CHUNK DES_PTR BF_PTR",
+    #},
+    "vms-alpha" => {
+        inherit_from     => [ "vms-generic" ],
+        #as               => "???",
+        #debug_aflags     => "/NOOPTIMIZE/DEBUG",
+        #release_aflags   => "/OPTIMIZE/NODEBUG",
+        bn_opts          => "SIXTY_FOUR_BIT RC4_INT RC4_CHUNK_LL DES_PTR BF_PTR",
+    },
+    "vms-alpha-P32" => {
+       inherit_from     => [ "vms-alpha" ],
+       cflags           => add("/POINTER_SIZE=32"),
+    },
+    "vms-alpha-P64" => {
+       inherit_from     => [ "vms-alpha" ],
+       cflags           => add("/POINTER_SIZE=64"),
+    },
+    "vms-ia64" => {
+        inherit_from     => [ "vms-generic" ],
+        #as               => "I4S",
+        #debug_aflags     => "/NOOPTIMIZE/DEBUG",
+        #release_aflags   => "/OPTIMIZE/NODEBUG",
+        bn_opts          => "SIXTY_FOUR_BIT RC4_INT RC4_CHUNK_LL DES_PTR BF_PTR",
+    },
+    "vms-ia64-P32" => {
+       inherit_from     => [ "vms-ia64" ],
+       cflags           => add("/POINTER_SIZE=32"),
+    },
+    "vms-ia64-P64" => {
+       inherit_from     => [ "vms-ia64" ],
+       cflags           => add("/POINTER_SIZE=64"),
+    },
+
 );