projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Move to REF_DEBUG, for consistency.
[openssl.git] / Configurations / 10-main.conf
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 32e4e15988d23862b66c3d8b866be4a9064f1dd9..cda7e21d7d6a1694de6a9b6d30ba1985092cb9a0 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -26,7 +26,7 @@
     "vos-gcc" => {
         cc               => "gcc",
         cflags           => "-Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN",
     "vos-gcc" => {
         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",
+        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG",
         release_cflags   => "-O3",
         thread_cflag     => "(unknown)",
         sys_id           => "VOS",
         release_cflags   => "-O3",
         thread_cflag     => "(unknown)",
         sys_id           => "VOS",
@@ -39,7 +39,7 @@
     "solaris-common" => {
         template         => 1,
         cflags           => "-DFILIO_H",
     "solaris-common" => {
         template         => 1,
         cflags           => "-DFILIO_H",
-        lflags           => "-lsocket -lnsl -ldl",
+        ex_libs          => "-lsocket -lnsl -ldl",
         dso_scheme       => "dlfcn",
         shared_target    => "solaris-shared",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         dso_scheme       => "dlfcn",
         shared_target    => "solaris-shared",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -53,7 +53,7 @@
         # with "Illegal mnemonic" error message.
         inherit_from     => [ "solaris-common", asm("x86_elf_asm") ],
         cc               => "gcc",
         # with "Illegal mnemonic" error message.
         inherit_from     => [ "solaris-common", asm("x86_elf_asm") ],
         cc               => "gcc",
-        cflags           => sub { join(" ","-march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM",@_) },
+        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",
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3 -fomit-frame-pointer",
         thread_cflag     => "-pthread",
@@ -72,7 +72,7 @@
         #                                      <appro@fy.chalmers.se>
         inherit_from     => [ "solaris-common", asm("x86_64_asm") ],
         cc               => "gcc",
         #                                      <appro@fy.chalmers.se>
         inherit_from     => [ "solaris-common", asm("x86_64_asm") ],
         cc               => "gcc",
-        cflags           => sub { join(" ","-m64 -Wall -DL_ENDIAN",@_) },
+        cflags           => add_before("-m64 -Wall -DL_ENDIAN"),
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
@@ -87,11 +87,12 @@
     "solaris-x86-cc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "cc",
     "solaris-x86-cc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "cc",
-        cflags           => sub { join(" ","-xarch=generic -xstrconst -Xa -DL_ENDIAN",@_) },
+        cflags           => add_before("-xarch=generic -xstrconst -Xa -DL_ENDIAN"),
         debug_cflags     => "-g",
         release_cflags   => "-xO5 -xregs=frameptr -xdepend -xbuiltin",
         thread_cflag     => "-D_REENTRANT",
         debug_cflags     => "-g",
         release_cflags   => "-xO5 -xregs=frameptr -xdepend -xbuiltin",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => sub { join(" ",@_,"-mt -lpthread") },
+        lflags           => add("-mt"),
+        ex_libs          => add("-lpthread"),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-KPIC",
         shared_ldflag    => "-G -dy -z text",
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-KPIC",
         shared_ldflag    => "-G -dy -z text",
@@ -99,11 +100,12 @@
     "solaris64-x86_64-cc" => {
         inherit_from     => [ "solaris-common", asm("x86_64_asm") ],
         cc               => "cc",
     "solaris64-x86_64-cc" => {
         inherit_from     => [ "solaris-common", asm("x86_64_asm") ],
         cc               => "cc",
-        cflags           => sub { join(" ","-xarch=generic64 -xstrconst -Xa -DL_ENDIAN",@_) },
+        cflags           => add_before("-xarch=generic64 -xstrconst -Xa -DL_ENDIAN"),
         debug_cflags     => "-g",
         release_cflags   => "-xO5 -xdepend -xbuiltin",
         thread_cflag     => "-D_REENTRANT",
         debug_cflags     => "-g",
         release_cflags   => "-xO5 -xdepend -xbuiltin",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => sub { join(" ",@_,"-mt -lpthread") },
+        lflags           => add("-mt"),
+        ex_libs          => add("-lpthread"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
         shared_cflag     => "-KPIC",
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
         shared_cflag     => "-KPIC",
@@ -115,7 +117,7 @@
     "solaris-sparcv7-gcc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "gcc",
     "solaris-sparcv7-gcc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "gcc",
-        cflags           => sub { join(" ","-Wall -DB_ENDIAN -DBN_DIV2W",@_) },
+        cflags           => add_before("-Wall -DB_ENDIAN -DBN_DIV2W"),
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
@@ -132,7 +134,7 @@
         # -mcpu=ultrasparc
         inherit_from     => [ "solaris-sparcv7-gcc", asm("sparcv9_asm") ],
         cflags           => add_before(" ", "-m32 -mcpu=ultrasparc"),
         # -mcpu=ultrasparc
         inherit_from     => [ "solaris-sparcv7-gcc", asm("sparcv9_asm") ],
         cflags           => add_before(" ", "-m32 -mcpu=ultrasparc"),
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__",
+        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     => [ "solaris-sparcv9-gcc" ],
     },
     "solaris64-sparcv9-gcc" => {
         inherit_from     => [ "solaris-sparcv9-gcc" ],
@@ -149,11 +151,12 @@
     "solaris-sparcv7-cc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "cc",
     "solaris-sparcv7-cc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "cc",
-        cflags           => sub { join(" ","-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W",@_) },
-        debug_cflags     => "-g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG",
+        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",
         release_cflags   => "-xO5 -xdepend",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => sub { join(" ",@_,"-mt -lpthread") },
+        lflags           => add("-mt"),
+        ex_libs          => add("-lpthread"),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-KPIC",
         shared_ldflag    => "-G -dy -z text",
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-KPIC",
         shared_ldflag    => "-G -dy -z text",
@@ -228,7 +231,7 @@
         debug_cflags     => "-g -O0",
         release_cflags   => "-O2",
         thread_cflag     => "-D_SGI_MP_SOURCE",
         debug_cflags     => "-g -O0",
         release_cflags   => "-O2",
         thread_cflag     => "-D_SGI_MP_SOURCE",
-        lflags           => "-lpthread",
+        ex_libs          => "-lpthread",
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",
         perlasm_scheme   => "n32",
         dso_scheme       => "dlfcn",
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",
         perlasm_scheme   => "n32",
         dso_scheme       => "dlfcn",
@@ -260,7 +263,7 @@
         debug_cflags     => "-g -O0",
         release_cflags   => "-O2",
         thread_cflag     => "-D_SGI_MP_SOURCE",
         debug_cflags     => "-g -O0",
         release_cflags   => "-O2",
         thread_cflag     => "-D_SGI_MP_SOURCE",
-        lflags           => "-lpthread",
+        ex_libs          => "-lpthread",
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "64",
         dso_scheme       => "dlfcn",
         bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "64",
         dso_scheme       => "dlfcn",
@@ -304,7 +307,7 @@
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
-        lflags           => "-Wl,+s -ldld",
+        ex_libs          => "-Wl,+s -ldld",
         bn_ops           => "BN_LLONG",
         dso_scheme       => "dl",
         shared_target    => "hpux-shared",
         bn_ops           => "BN_LLONG",
         dso_scheme       => "dl",
         shared_target    => "hpux-shared",
@@ -323,7 +326,7 @@
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-D_REENTRANT",
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl",
+        ex_libs          => "-ldl",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
@@ -343,7 +346,7 @@
         debug_cflags      => "+O0 +d -g",
         release_cflags   => "+O3",
         thread_cflag     => "-D_REENTRANT",
         debug_cflags      => "+O0 +d -g",
         release_cflags   => "+O3",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => "-Wl,+s -ldld -lpthread",
+        ex_libs          => "-Wl,+s -ldld -lpthread",
         bn_ops           => "RC4_CHAR",
         dso_scheme       => "dl",
         shared_target    => "hpux-shared",
         bn_ops           => "RC4_CHAR",
         dso_scheme       => "dl",
         shared_target    => "hpux-shared",
@@ -363,7 +366,7 @@
         debug_cflags      => "+O0 +d -g",
         release_cflags   => "+O3",
         thread_cflag     => "-D_REENTRANT",
         debug_cflags      => "+O0 +d -g",
         release_cflags   => "+O3",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl -lpthread",
+        ex_libs          => "-ldl -lpthread",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
@@ -381,7 +384,7 @@
         debug_cflags     => "+O0 +d -g",
         release_cflags   => "+O2",
         thread_cflag     => "-D_REENTRANT",
         debug_cflags     => "+O0 +d -g",
         release_cflags   => "+O2",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl -lpthread",
+        ex_libs          => "-ldl -lpthread",
         bn_ops           => "SIXTY_FOUR_BIT",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         bn_ops           => "SIXTY_FOUR_BIT",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
@@ -399,7 +402,7 @@
         debug_cflags     => "+O0 +d -g",
         release_cflags   => "+O3",
         thread_cflag     => "-D_REENTRANT",
         debug_cflags     => "+O0 +d -g",
         release_cflags   => "+O3",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => "-ldl -lpthread",
+        ex_libs          => "-ldl -lpthread",
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
@@ -416,7 +419,7 @@
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
-        lflags           => "-ldl",
+        ex_libs          => "-ldl",
         bn_ops           => "SIXTY_FOUR_BIT",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         bn_ops           => "SIXTY_FOUR_BIT",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
@@ -432,7 +435,7 @@
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
-        lflags           => "-ldl",
+        ex_libs          => "-ldl",
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         dso_scheme       => "dlfcn",
         shared_target    => "hpux-shared",
@@ -448,7 +451,7 @@
         cflags           => "-D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB",
         thread_cflag     => "(unknown)",
         sys_id           => "MPE",
         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",
+        ex_libs          => "-L/SYSLOG/PUB -lsyslog -lsocket -lcurses",
         bn_ops           => "BN_LLONG",
     },
 
         bn_ops           => "BN_LLONG",
     },
 
@@ -493,10 +496,10 @@
     "linux-generic32" => {
         cc               => "gcc",
         cflags           => "-Wall",
     "linux-generic32" => {
         cc               => "gcc",
         cflags           => "-Wall",
-        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG",
+        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
-        lflags           => "-ldl",
+        ex_libs          => "-ldl",
         bn_ops           => "BN_LLONG RC4_CHAR",
         dso_scheme       => "dlfcn",
         shared_target    => "linux-shared",
         bn_ops           => "BN_LLONG RC4_CHAR",
         dso_scheme       => "dlfcn",
         shared_target    => "linux-shared",
@@ -604,9 +607,9 @@
         inherit_from     => [ "linux-generic32", asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-march=i486 -DL_ENDIAN -Wall",
         inherit_from     => [ "linux-generic32", asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-march=i486 -DL_ENDIAN -Wall",
-        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG",
+        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG",
         release_cflags   => "-O3 -fomit-frame-pointer",
         release_cflags   => "-O3 -fomit-frame-pointer",
-        debug_lflags     => "-lefence",
+        debug_ex_libs    => "-lefence",
         bn_ops           => "BN_LLONG",
     },
     "linux-aout" => {
         bn_ops           => "BN_LLONG",
     },
     "linux-aout" => {
@@ -756,7 +759,8 @@
         # about JNI, i.e. shared libraries, not applications.
         cflags           => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall",
         debug_cflags     => "-O0 -g",
         # about JNI, i.e. shared libraries, not applications.
         cflags           => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall",
         debug_cflags     => "-O0 -g",
-        lflags           => "-pie%-ldl",
+        lflags           => "-pie",
+        ex_libs          => "-ldl",
         shared_cflag     => "",
     },
     "android-x86" => {
         shared_cflag     => "",
     },
     "android-x86" => {
@@ -802,7 +806,8 @@
         inherit_from     => [ "linux-generic64" ],
         cflags           => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall",
         debug_cflags     => "-O0 -g",
         inherit_from     => [ "linux-generic64" ],
         cflags           => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall",
         debug_cflags     => "-O0 -g",
-        lflags           => "-pie%-ldl",
+        lflags           => "-pie",
+        ex_libs          => "-ldl",
         shared_cflag     => "",
     },
     "android64-aarch64" => {
         shared_cflag     => "",
     },
     "android64-aarch64" => {
@@ -879,7 +884,7 @@
         cc               => "gcc",
         cflags           => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall",
         thread_cflag     => "(unknown)",
         cc               => "gcc",
         cflags           => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall",
         thread_cflag     => "(unknown)",
-        lflags           => "-ldl",
+        ex_libs          => "-ldl",
         bn_ops           => "BN_LLONG",
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
         bn_ops           => "BN_LLONG",
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
@@ -910,7 +915,7 @@
     },
     "QNX6" => {
         cc               => "gcc",
     },
     "QNX6" => {
         cc               => "gcc",
-        lflags           => "-lsocket",
+        ex_libs          => "-lsocket",
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
         shared_cflag     => "-fPIC",
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
         shared_cflag     => "-fPIC",
@@ -920,7 +925,7 @@
         inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -O2 -Wall",
         inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -O2 -Wall",
-        lflags           => "-lsocket",
+        ex_libs          => "-lsocket",
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
         shared_cflag     => "-fPIC",
         dso_scheme       => "dlfcn",
         shared_target    => "bsd-gcc-shared",
         shared_cflag     => "-fPIC",
@@ -943,20 +948,20 @@
         cc               => "cc",
         cflags           => "-DFILIO_H -DNO_STRINGS_H",
         thread_cflag     => "-Kthread",
         cc               => "cc",
         cflags           => "-DFILIO_H -DNO_STRINGS_H",
         thread_cflag     => "-Kthread",
-        lflags           => "-lsocket -lnsl -lresolv -lx",
+        ex_libs          => "-lsocket -lnsl -lresolv -lx",
     },
     "unixware-2.1" => {
         cc               => "cc",
         cflags           => "-O -DFILIO_H",
         thread_cflag     => "-Kthread",
     },
     "unixware-2.1" => {
         cc               => "cc",
         cflags           => "-O -DFILIO_H",
         thread_cflag     => "-Kthread",
-        lflags           => "-lsocket -lnsl -lresolv -lx",
+        ex_libs          => "-lsocket -lnsl -lresolv -lx",
     },
     "unixware-7" => {
         inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "cc",
         cflags           => "-O -DFILIO_H -Kalloca",
         thread_cflag     => "-Kthread",
     },
     "unixware-7" => {
         inherit_from     => [ asm("x86_elf_asm") ],
         cc               => "cc",
         cflags           => "-O -DFILIO_H -Kalloca",
         thread_cflag     => "-Kthread",
-        lflags           => "-lsocket -lnsl",
+        ex_libs          => "-lsocket -lnsl",
         bn_ops           => "BN_LLONG",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
         bn_ops           => "BN_LLONG",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
@@ -969,7 +974,7 @@
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall",
         thread_cflag     => "-D_REENTRANT",
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => "-lsocket -lnsl",
+        ex_libs          => "-lsocket -lnsl",
         bn_ops           => "BN_LLONG",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
         bn_ops           => "BN_LLONG",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
@@ -983,7 +988,7 @@
         cc               => "cc",
         cflags           => "-belf",
         thread_cflag     => "(unknown)",
         cc               => "cc",
         cflags           => "-belf",
         thread_cflag     => "(unknown)",
-        lflags           => "-lsocket -lnsl",
+        ex_libs          => "-lsocket -lnsl",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
         shared_target    => "svr3-shared",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
         shared_target    => "svr3-shared",
@@ -995,7 +1000,7 @@
         cc               => "gcc",
         cflags           => "-O3 -fomit-frame-pointer",
         thread_cflag     => "(unknown)",
         cc               => "gcc",
         cflags           => "-O3 -fomit-frame-pointer",
         thread_cflag     => "(unknown)",
-        lflags           => "-lsocket -lnsl",
+        ex_libs          => "-lsocket -lnsl",
         bn_ops           => "BN_LLONG",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
         bn_ops           => "BN_LLONG",
         perlasm_scheme   => "elf-1",
         dso_scheme       => "dlfcn",
@@ -1078,7 +1083,7 @@
         cc               => "c89",
         cflags           => "-O -XLLML -XLLMK -XL -DB_ENDIAN -DCHARSET_EBCDIC",
         thread_cflag     => "(unknown)",
         cc               => "c89",
         cflags           => "-O -XLLML -XLLMK -XL -DB_ENDIAN -DCHARSET_EBCDIC",
         thread_cflag     => "(unknown)",
-        lflags           => "-lsocket -lnsl",
+        ex_libs          => "-lsocket -lnsl",
         bn_ops           => "THIRTY_TWO_BIT RC4_CHAR",
     },
 
         bn_ops           => "THIRTY_TWO_BIT RC4_CHAR",
     },
 
@@ -1157,19 +1162,20 @@
     "mingw" => {
         inherit_from     => [ asm("x86_asm") ],
         cc               => "gcc",
     "mingw" => {
         inherit_from     => [ asm("x86_asm") ],
         cc               => "gcc",
-        cflags           => "-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -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",
         debug_cflags     => "-g -O0",
         release_cflags   => "-O3 -fomit-frame-pointer",
         thread_cflag     => "-D_MT",
         sys_id           => "MINGW32",
-        lflags           => "-lws2_32 -lgdi32 -lcrypt32",
+        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",
         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",
+        shared_ldflag    => "-static-libgcc",
+        shared_rcflag    => "--target=pe-i386",
+        shared_extension => ".dll",
     },
     "mingw64" => {
         # As for OPENSSL_USE_APPLINK. Applink makes it possible to use
     },
     "mingw64" => {
         # As for OPENSSL_USE_APPLINK. Applink makes it possible to use
@@ -1182,19 +1188,20 @@
         # Applink is never engaged and can as well be omitted.
         inherit_from     => [ asm("x86_64_asm") ],
         cc               => "gcc",
         # Applink is never engaged and can as well be omitted.
         inherit_from     => [ asm("x86_64_asm") ],
         cc               => "gcc",
-        cflags           => "-mno-cygwin -DL_ENDIAN -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE",
+        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",
         debug_cflags     => "-g -O0",
         release_cflags   => "-O3",
         thread_cflag     => "-D_MT",
         sys_id           => "MINGW64",
-        lflags           => "-lws2_32 -lgdi32 -lcrypt32",
+        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",
         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",
     },
 
 #### UEFI
     },
 
 #### UEFI
@@ -1227,7 +1234,7 @@
         shared_target    => "cygwin-shared",
         shared_cflag     => "-D_WINDLL",
         shared_ldflag    => "-shared",
         shared_target    => "cygwin-shared",
         shared_cflag     => "-D_WINDLL",
         shared_ldflag    => "-shared",
-        shared_extension => ".dll.a",
+        shared_extension => ".dll",
     },
     "Cygwin-x86_64" => {
         inherit_from     => [ asm("x86_64_asm") ],
     },
     "Cygwin-x86_64" => {
         inherit_from     => [ asm("x86_64_asm") ],
@@ -1242,7 +1249,7 @@
         shared_target    => "cygwin-shared",
         shared_cflag     => "-D_WINDLL",
         shared_ldflag    => "-shared",
         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" => {
     },
     # Backward compatibility for those using this target
     "Cygwin" => {
@@ -1311,7 +1318,7 @@
         cc               => "gcc",
         cflags           => "-I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall",
         sys_id           => "MSDOS",
         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",
+        ex_libs          => "-L/dev/env/WATT_ROOT/lib -lwatt",
         bn_ops           => "BN_LLONG",
         perlasm_scheme   => "a.out",
     },
         bn_ops           => "BN_LLONG",
         perlasm_scheme   => "a.out",
     },
@@ -1340,7 +1347,7 @@
         release_cflags   => "-O3",
         thread_cflag     => "-D_REENTRANT",
         sys_id           => "MACOSX",
         release_cflags   => "-O3",
         thread_cflag     => "-D_REENTRANT",
         sys_id           => "MACOSX",
-        lflags           => "-Wl,-search_paths_first%",
+        plib_lflags      => "-Wl,-search_paths_first",
         bn_ops           => "BN_LLONG RC4_CHAR",
         perlasm_scheme   => "osx32",
         dso_scheme       => "dlfcn",
         bn_ops           => "BN_LLONG RC4_CHAR",
         perlasm_scheme   => "osx32",
         dso_scheme       => "dlfcn",
@@ -1421,7 +1428,7 @@
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall",
         thread_cflag     => "-pthread",
         cc               => "gcc",
         cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall",
         thread_cflag     => "-pthread",
-        lflags           => "-ldl",
+        ex_libs          => "-ldl",
         bn_ops           => "BN_LLONG",
         dso_scheme       => "dlfcn",
         shared_target    => "linux-shared",
         bn_ops           => "BN_LLONG",
         dso_scheme       => "dlfcn",
         shared_target    => "linux-shared",
@@ -1438,13 +1445,13 @@
         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",
         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",
     },
     "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-ppc405" => {
         cc               => "ccppc",
@@ -1460,7 +1467,7 @@
     },
     "vxworks-ppc750-debug" => {
         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 -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",
     },
         sys_id           => "VXWORKS",
         lflags           => "-r",
     },
@@ -1483,7 +1490,7 @@
         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",
         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",
     },
         perlasm_scheme   => "o32",
         ranlib           => "ranlibmips",
     },
@@ -1493,7 +1500,8 @@
         cc               => "$ENV{'CC'}",
         cflags           => "\$(CFLAGS)",
         thread_cflag     => "-D_REENTRANT",
         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",
         bn_ops           => "BN_LLONG",
         dso_scheme       => "$ENV{'LIBSSL_dlfcn'}",
         shared_target    => "linux-shared",
@@ -1506,7 +1514,8 @@
         cc               => "$ENV{'CC'}",
         cflags           => "\$(CFLAGS)",
         thread_cflag     => "-D_REENTRANT",
         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",
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         dso_scheme       => "$ENV{'LIBSSL_dlfcn'}",
         shared_target    => "linux-shared",
@@ -1516,4 +1525,64 @@
         ranlib           => "$ENV{'RANLIB'}",
     },
 
         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"),
+    },
+
 );
 );
Unnamed repository; edit this file 'description' to name the repository.