X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Configurations%2F10-main.conf;h=ecfbc9a91b697683216987b67035b03fb917ad8a;hp=32e4e15988d23862b66c3d8b866be4a9064f1dd9;hb=e9abfc3a00f5e6f51fc8150e53c65cec125b3082;hpb=a01dab94622715fe2dd92a6f87a826cef6724e54 diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 32e4e15988..ecfbc9a91b 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1,9 +1,5 @@ ## -*- mode: perl; -*- ## Standard openssl configuration targets. -## -## If you edit this file, run this command before committing -## make -f Makefile.in TABLE -## This file is interpolated by the Configure script. %targets = ( @@ -26,7 +22,7 @@ "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", @@ -35,11 +31,11 @@ shared_extension => ".so", }, -#### Solaros configirations +#### Solaris configurations "solaris-common" => { template => 1, cflags => "-DFILIO_H", - lflags => "-lsocket -lnsl -ldl", + ex_libs => "-lresolv -lsocket -lnsl -ldl", dso_scheme => "dlfcn", shared_target => "solaris-shared", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -53,7 +49,7 @@ # 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("-Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM"), debug_cflags => "-O0 -g", release_cflags => "-O3 -fomit-frame-pointer", thread_cflag => "-pthread", @@ -72,7 +68,7 @@ # 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", @@ -87,11 +83,12 @@ "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", - 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", @@ -99,11 +96,12 @@ "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", - lflags => sub { join(" ",@_,"-mt -lpthread") }, + lflags => add("-mt"), + ex_libs => add("-lpthread"), bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "elf", shared_cflag => "-KPIC", @@ -115,7 +113,7 @@ "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", @@ -125,14 +123,14 @@ }, "solaris-sparcv8-gcc" => { inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ], - cflags => add_before(" ", "-mcpu=v8"), + cflags => add_before("-mcpu=v8"), }, "solaris-sparcv9-gcc" => { # -m32 should be safe to add as long as driver recognizes # -mcpu=ultrasparc inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv9_asm") ], - cflags => add_before(" ", "-m32 -mcpu=ultrasparc"), - debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__", + 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 => [ "solaris-sparcv9-gcc" ], @@ -149,11 +147,12 @@ "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", - 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", @@ -161,15 +160,15 @@ #### "solaris-sparcv8-cc" => { inherit_from => [ "solaris-sparcv7-cc", asm("sparcv8_asm") ], - cflags => add_before(" ", "-xarch=v8"), + cflags => add_before("-xarch=v8"), }, "solaris-sparcv9-cc" => { inherit_from => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ], - cflags => add_before(" ", "-xarch=v8plus -xtarget=ultra"), + cflags => add_before("-xarch=v8plus -xtarget=ultra"), }, "solaris64-sparcv9-cc" => { inherit_from => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ], - cflags => add_before(" ", "-xarch=v9 -xtarget=ultra"), + cflags => add_before("-xarch=v9 -xtarget=ultra"), bn_ops => "BN_LLONG RC4_CHAR", shared_ldflag => "-xarch=v9 -G -dy -z text", multilib => "/64", @@ -228,7 +227,7 @@ 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", @@ -260,7 +259,7 @@ 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", @@ -285,7 +284,7 @@ # more sense? # - Keep in mind that the HP compiler by default generates code # suitable for execution on the host you're currently compiling at. -# If the toolkit is ment to be used on various PA-RISC processors +# If the toolkit is meant to be used on various PA-RISC processors # consider './Configure hpux-parisc-[g]cc +DAportable'. # - -DMD32_XARRAY triggers workaround for compiler bug we ran into in # 32-bit message digests. (For the moment of this writing) HP C @@ -293,7 +292,7 @@ # chew forever:-). For more details look-up MD32_XARRAY comment in # crypto/sha/sha_lcl.h. # - originally there were 32-bit hpux-parisc2-* targets. They were -# scrapped, because a) they were not interchangable with other 32-bit +# scrapped, because a) they were not interchangeable with other 32-bit # targets; a) when critical 32-bit assembly modules detect if they # are executed on PA-RISC 2.0 and thus adequate performance is # provided. @@ -304,7 +303,7 @@ 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", @@ -323,7 +322,7 @@ 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", @@ -343,7 +342,7 @@ 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", @@ -353,7 +352,7 @@ }, "hpux-parisc1_1-cc" => { inherit_from => [ "hpux-parisc-cc", asm("parisc11_asm") ], - cflags => add_before(" ", "+DA1.1"), + cflags => add_before("+DA1.1"), multilib => "/pa1.1", }, "hpux64-parisc2-cc" => { @@ -363,7 +362,7 @@ 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", @@ -381,7 +380,7 @@ 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", @@ -399,7 +398,7 @@ 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", @@ -416,7 +415,7 @@ 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", @@ -432,7 +431,7 @@ 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", @@ -448,7 +447,7 @@ 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", }, @@ -493,10 +492,10 @@ "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", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG RC4_CHAR", dso_scheme => "dlfcn", shared_target => "linux-shared", @@ -603,16 +602,16 @@ "linux-elf" => { inherit_from => [ "linux-generic32", asm("x86_elf_asm") ], cc => "gcc", - cflags => "-march=i486 -DL_ENDIAN -Wall", - debug_cflags => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG", + cflags => "-DL_ENDIAN -Wall", + debug_cflags => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG", release_cflags => "-O3 -fomit-frame-pointer", - debug_lflags => "-lefence", + debug_ex_libs => "-lefence", bn_ops => "BN_LLONG", }, "linux-aout" => { inherit_from => [ asm("x86_asm") ], cc => "gcc", - cflags => "-DL_ENDIAN -march=i486 -Wall", + cflags => "-DL_ENDIAN -Wall", debug_cflags => "-O0 -g", release_cflags => "-O3 -fomit-frame-pointer", thread_cflag => "(unknown)", @@ -713,12 +712,14 @@ cflags => "--linux -ea=.s -eo=.o -mv6400+ -o2 -ox -ms -pden -DOPENSSL_SMALL_FOOTPRINT", thread_cflag => "-D_REENTRANT", bn_ops => "BN_LLONG", - cpuid_obj => "c64xpluscpuid.o", - bn_obj => "bn-c64xplus.o c64xplus-gf2m.o", - aes_obj => "aes-c64xplus.o aes_cbc.o aes_ctr.o", - sha1_obj => "sha1-c64xplus.o sha256-c64xplus.o sha512-c64xplus.o", - rc4_obj => "rc4-c64xplus.o", - modes_obj => "ghash-c64xplus.o", + cpuid_asm_src => "c64xpluscpuid.s", + bn_asm_src => "asm/bn-c64xplus.asm c64xplus-gf2m.s", + aes_asm_src => "aes-c64xplus.s aes_cbc.c aes-ctr.fake", + sha1_asm_src => "sha1-c64xplus.s sha256-c64xplus.s sha512-c64xplus.s", + rc4_asm_src => "rc4-c64xplus.s", + modes_asm_src => "ghash-c64xplus.s", + chacha_asm_src => "chacha-c64xplus.s", + poly1305_asm_src => "poly1305-c64xplus.s", perlasm_scheme => "void", dso_scheme => "dlfcn", shared_target => "linux-shared", @@ -756,7 +757,8 @@ # 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" => { @@ -789,10 +791,6 @@ "android-armeabi" => { inherit_from => [ "android", asm("armv4_asm") ], }, - "android-armv7" => { - inherit_from => [ "android-armeabi" ], - cflags => add_before(" ", "-march=armv7-a"), - }, "android-mips" => { inherit_from => [ "android", asm("mips32_asm") ], perlasm_scheme => "o32", @@ -802,7 +800,8 @@ 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" => { @@ -877,9 +876,9 @@ "bsdi-elf-gcc" => { inherit_from => [ asm("x86_elf_asm") ], cc => "gcc", - cflags => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall", + cflags => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -Wall", thread_cflag => "(unknown)", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "bsd-gcc-shared", @@ -910,7 +909,7 @@ }, "QNX6" => { cc => "gcc", - lflags => "-lsocket", + ex_libs => "-lsocket", dso_scheme => "dlfcn", shared_target => "bsd-gcc-shared", shared_cflag => "-fPIC", @@ -920,7 +919,7 @@ 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", @@ -943,20 +942,20 @@ 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", - 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", - lflags => "-lsocket -lnsl", + ex_libs => "-lsocket -lnsl", bn_ops => "BN_LLONG", perlasm_scheme => "elf-1", dso_scheme => "dlfcn", @@ -967,9 +966,9 @@ "unixware-7-gcc" => { inherit_from => [ asm("x86_elf_asm") ], cc => "gcc", - cflags => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall", + cflags => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -Wall", thread_cflag => "-D_REENTRANT", - lflags => "-lsocket -lnsl", + ex_libs => "-lsocket -lnsl", bn_ops => "BN_LLONG", perlasm_scheme => "elf-1", dso_scheme => "dlfcn", @@ -983,7 +982,7 @@ 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", @@ -995,7 +994,7 @@ 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", @@ -1078,7 +1077,7 @@ 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", }, @@ -1105,12 +1104,13 @@ template => 1, cc => "cl", cflags => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE", + shared_target => "win-shared", # meaningless except it gives Configure a hint dso_scheme => "win32", build_scheme => "mk1mf", }, "VC-WIN64I" => { inherit_from => [ "VC-common", asm("ia64_asm") ], - cflags => add(" ", "-DUNICODE -D_UNICODE"), + cflags => add("-DUNICODE -D_UNICODE"), sys_id => "WIN64I", bn_ops => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN", bn_obj => sub { my $r=join(" ",@_); $r=~s/bn\-//; $r; }, @@ -1120,7 +1120,7 @@ }, "VC-WIN64A" => { inherit_from => [ "VC-common", asm("x86_64_asm") ], - cflags => add(" ", "-DUNICODE -D_UNICODE"), + cflags => add("-DUNICODE -D_UNICODE"), sys_id => "WIN64A", bn_ops => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN", bn_obj => sub { my $r=join(" ",@_); $r=~s/x86_64\-gcc/bn_asm/; $r; }, @@ -1155,21 +1155,24 @@ #### MinGW "mingw" => { - inherit_from => [ asm("x86_asm") ], + inherit_from => [ asm("x86_asm"), + sub { $disabled{shared} ? () : "x86_uplink" } ], 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", - 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", - shared_ldflag => "-mno-cygwin", - shared_extension => ".dll.a", + shared_target => "mingw-shared", + shared_cflag => add("-D_WINDLL"), + shared_ldflag => "-static-libgcc", + shared_rcflag => "--target=pe-i386", + shared_extension => ".dll", + multilib => "", }, "mingw64" => { # As for OPENSSL_USE_APPLINK. Applink makes it possible to use @@ -1182,19 +1185,21 @@ # 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", - 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", - shared_ldflag => "-mno-cygwin", - shared_extension => ".dll.a", + shared_target => "mingw-shared", + shared_cflag => add("-D_WINDLL"), + shared_ldflag => "-static-libgcc", + shared_rcflag => "--target=pe-x86-64", + shared_extension => ".dll", + multilib => "64", }, #### UEFI @@ -1227,7 +1232,7 @@ 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") ], @@ -1242,7 +1247,7 @@ 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" => { @@ -1311,7 +1316,7 @@ 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", }, @@ -1340,7 +1345,7 @@ 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", @@ -1419,9 +1424,9 @@ "hurd-x86" => { inherit_from => [ asm("x86_elf_asm") ], cc => "gcc", - cflags => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall", + cflags => "-DL_ENDIAN -O3 -fomit-frame-pointer -Wall", thread_cflag => "-pthread", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "linux-shared", @@ -1438,13 +1443,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", - 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", @@ -1460,7 +1465,7 @@ }, "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", }, @@ -1483,7 +1488,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", - 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", }, @@ -1493,7 +1498,8 @@ 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", @@ -1506,7 +1512,8 @@ 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", @@ -1516,4 +1523,64 @@ 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_aux_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"), + }, + );