X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Configurations%2F10-main.conf;h=7b5da5c4693956220ea0c82da3804d6dad9cc2b2;hp=0086ceec0e5c5192efa596fc00c211ef76345531;hb=76899264cbff822929f29f3d56c640368461d7f6;hpb=cff89b179c91c7c1f6f08b2c1f1697005c1804d2 diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 0086ceec0e..7b5da5c469 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -17,7 +17,7 @@ sub vc_win64a_info { asflags => "/c /Cp /Cx", asoutflag => "/Fo" }; } else { - $die->("NASM not found - please read INSTALL and NOTES.WIN for further details\n"); + $die->("NASM not found - make sure it's installed and available on %PATH%\n"); $vc_win64a_info = { AS => "{unknown}", ASFLAGS => "", asflags => "", @@ -46,7 +46,7 @@ sub vc_win32_info { asoutflag => "/Fo", perlasm_scheme => "win32" }; } else { - $die->("NASM not found - please read INSTALL and NOTES.WIN for further details\n"); + $die->("NASM not found - make sure it's installed and available on %PATH%\n"); $vc_win32_info = { AS => "{unknown}", ASFLAGS => "", asflags => "", @@ -211,18 +211,28 @@ my %targets = ( ex_libs => add("-lsocket -lnsl -ldl"), dso_scheme => "dlfcn", thread_scheme => "pthreads", - shared_target => "self", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", + }, +#### Solaris common with Sun C setups + "solaris-common-cc" => { + inherit_from => [ "solaris-common" ], + template => 1, + shared_target => "solaris", shared_ldflag => "-Wl,-Bsymbolic", shared_defflag => "-Wl,-M,", shared_sonameflag=> "-Wl,-h,", }, +#### Solaris common with GNU C setups + "solaris-common-gcc" => { + inherit_from => [ "solaris-common" ], + template => 1, + shared_target => "solaris-gcc", # The rest is on shared_info.pl + }, #### Solaris x86 with GNU C setups "solaris-x86-gcc" => { # NB. GNU C has to be configured to use GNU assembler, and not # /usr/ccs/bin/as. Failure to comply will result in compile # failures [at least] in 32-bit build. - inherit_from => [ "solaris-common", asm("x86_elf_asm") ], + inherit_from => [ "solaris-common-gcc" ], CC => "gcc", CFLAGS => add_before(picker(default => "-Wall", debug => "-O0 -g", @@ -233,6 +243,8 @@ my %targets = ( bn_ops => "BN_LLONG", shared_cflag => "-fPIC", shared_ldflag => add_before("-shared -static-libgcc"), + asm_arch => 'x86', + perlasm_scheme => 'elf', }, "solaris64-x86_64-gcc" => { # -shared -static-libgcc might appear controversial, but modules @@ -243,7 +255,7 @@ my %targets = ( # code [thanks to inline assembler], I would actually recommend # to consider using gcc shared build even with vendor compiler:-) # -- - inherit_from => [ "solaris-common", asm("x86_64_asm") ], + inherit_from => [ "solaris-common-gcc" ], CC => "gcc", CFLAGS => add_before(picker(default => "-Wall", debug => "-O0 -g", @@ -252,6 +264,7 @@ my %targets = ( lib_cppflags => add("-DL_ENDIAN"), ex_libs => add(threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'x86_64', perlasm_scheme => "elf", shared_cflag => "-fPIC", shared_ldflag => add_before("-shared -static-libgcc"), @@ -263,7 +276,7 @@ my %targets = ( # primarily because vendor assembler can't assemble our modules # with -KPIC flag. As result it, assembly support, was not even # available as option. But its lack means lack of side-channel - # resistant code, which is incompatible with security by todays + # resistant code, which is incompatible with security by today's # standards. Fortunately gcc is readily available prepackaged # option, which we can firmly point at... # @@ -272,7 +285,7 @@ my %targets = ( # Consider switching to solaris64-x86_64-gcc even here... # "solaris64-x86_64-cc" => { - inherit_from => [ "solaris-common", asm("x86_64_asm") ], + inherit_from => [ "solaris-common-cc" ], CC => "cc", CFLAGS => add_before(picker(debug => "-g", release => "-xO5 -xdepend -xbuiltin")), @@ -283,6 +296,7 @@ my %targets = ( lflags => add(threads("-mt")), ex_libs => add(threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'x86_64', perlasm_scheme => "elf", shared_cflag => "-KPIC", shared_ldflag => add_before("-G -dy -z text"), @@ -291,7 +305,7 @@ my %targets = ( #### SPARC Solaris with GNU C setups "solaris-sparcv7-gcc" => { - inherit_from => [ "solaris-common" ], + inherit_from => [ "solaris-common-gcc" ], CC => "gcc", CFLAGS => add_before(picker(default => "-Wall", debug => "-O0 -g", @@ -304,14 +318,18 @@ my %targets = ( shared_ldflag => add_before("-shared"), }, "solaris-sparcv8-gcc" => { - inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ], + inherit_from => [ "solaris-sparcv7-gcc" ], cflags => add_before("-mcpu=v8"), + asm_arch => 'sparcv8', + perlasm_scheme => 'void', }, "solaris-sparcv9-gcc" => { # -m32 should be safe to add as long as driver recognizes # -mcpu=ultrasparc - inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv9_asm") ], + inherit_from => [ "solaris-sparcv7-gcc" ], cflags => add_before("-m32 -mcpu=ultrasparc"), + asm_arch => 'sparcv9', + perlasm_scheme => 'void', }, "solaris64-sparcv9-gcc" => { inherit_from => [ "solaris-sparcv9-gcc" ], @@ -325,7 +343,7 @@ my %targets = ( # 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 => [ "solaris-common" ], + inherit_from => [ "solaris-common-cc" ], CC => "cc", CFLAGS => add_before(picker(debug => "-g", release => "-xO5 -xdepend")), @@ -340,17 +358,23 @@ my %targets = ( }, #### "solaris-sparcv8-cc" => { - inherit_from => [ "solaris-sparcv7-cc", asm("sparcv8_asm") ], + inherit_from => [ "solaris-sparcv7-cc" ], cflags => add_before("-xarch=v8"), + asm_arch => 'sparcv8', + perlasm_scheme => 'void', }, "solaris-sparcv9-cc" => { - inherit_from => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ], + inherit_from => [ "solaris-sparcv7-cc" ], cflags => add_before("-xarch=v8plus"), + asm_arch => 'sparcv9', + perlasm_scheme => 'void', }, "solaris64-sparcv9-cc" => { - inherit_from => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ], + inherit_from => [ "solaris-sparcv7-cc" ], cflags => add_before("-xarch=v9"), bn_ops => "BN_LLONG RC4_CHAR", + asm_arch => 'sparcv9', + perlasm_scheme => 'void', multilib => "/64", }, @@ -360,55 +384,58 @@ my %targets = ( inherit_from => [ "BASE_unix" ], template => 1, cppflags => threads("-D_SGI_MP_SOURCE"), - lib_cppflags => "-DB_ENDIAN -DBN_DIV3W", + lib_cppflags => "-DB_ENDIAN", ex_libs => add(threads("-lpthread")), thread_scheme => "pthreads", dso_scheme => "dlfcn", shared_target => "self", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", shared_ldflag => "-shared -Wl,-Bsymbolic", shared_sonameflag=> "-Wl,-soname,", }, "irix-mips3-gcc" => { - inherit_from => [ "irix-common", asm("mips64_asm") ], + inherit_from => [ "irix-common" ], CC => "gcc", CFLAGS => picker(debug => "-g -O0", release => "-O3"), LDFLAGS => "-static-libgcc", cflags => "-mabi=n32", bn_ops => "RC4_CHAR SIXTY_FOUR_BIT", + asm_arch => 'mips64', perlasm_scheme => "n32", multilib => "32", }, "irix-mips3-cc" => { - inherit_from => [ "irix-common", asm("mips64_asm") ], + inherit_from => [ "irix-common" ], CC => "cc", CFLAGS => picker(debug => "-g -O0", release => "-O2"), cflags => "-n32 -mips3 -use_readonly_const -G0 -rdata_shared", bn_ops => "RC4_CHAR SIXTY_FOUR_BIT", + asm_arch => 'mips64', perlasm_scheme => "n32", multilib => "32", }, # N64 ABI builds. "irix64-mips4-gcc" => { - inherit_from => [ "irix-common", asm("mips64_asm") ], + inherit_from => [ "irix-common" ], CC => "gcc", CFLAGS => picker(debug => "-g -O0", release => "-O3"), LDFLAGS => "-static-libgcc", cflags => "-mabi=64 -mips4", bn_ops => "RC4_CHAR SIXTY_FOUR_BIT_LONG", + asm_arch => 'mips64', perlasm_scheme => "64", multilib => "64", }, "irix64-mips4-cc" => { - inherit_from => [ "irix-common", asm("mips64_asm") ], + inherit_from => [ "irix-common" ], CC => "cc", CFLAGS => picker(debug => "-g -O0", release => "-O2"), cflags => "-64 -mips4 -use_readonly_const -G0 -rdata_shared", bn_ops => "RC4_CHAR SIXTY_FOUR_BIT_LONG", + asm_arch => 'mips64', perlasm_scheme => "64", multilib => "64", }, @@ -434,7 +461,7 @@ my %targets = ( # 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. +# crypto/sha/sha_local.h. # - originally there were 32-bit hpux-parisc2-* targets. They were # scrapped, because a) they were not interchangeable with other 32-bit # targets; b) performance-critical 32-bit assembly modules implement @@ -468,17 +495,21 @@ my %targets = ( shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", }, "hpux-parisc1_1-gcc" => { - inherit_from => [ "hpux-parisc-gcc", asm("parisc11_asm") ], + inherit_from => [ "hpux-parisc-gcc" ], + asm_arch => 'parisc11', + perlasm_scheme => "32", multilib => "/pa1.1", }, "hpux64-parisc2-gcc" => { - inherit_from => [ "hpux-common", asm("parisc20_64_asm") ], + inherit_from => [ "hpux-common" ], CC => "gcc", CFLAGS => combine(picker(debug => "-O0 -g", release => "-O3")), cflags => add(threads("-pthread")), ex_libs => add("-ldl", threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", + asm_arch => 'parisc20_64', + perlasm_scheme => "64", shared_cflag => "-fpic", shared_ldflag => add_before("-shared"), shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", @@ -502,12 +533,14 @@ my %targets = ( shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", }, "hpux-parisc1_1-cc" => { - inherit_from => [ "hpux-parisc-cc", asm("parisc11_asm") ], + inherit_from => [ "hpux-parisc-cc" ], cflags => add_before("+DA1.1"), + asm_arch => 'parisc11', + perlasm_scheme => "32", multilib => "/pa1.1", }, "hpux64-parisc2-cc" => { - inherit_from => [ "hpux-common", asm("parisc20_64_asm") ], + inherit_from => [ "hpux-common" ], CC => "cc", CFLAGS => picker(debug => "+O0 +d -g", release => "+O3") , @@ -516,6 +549,8 @@ my %targets = ( lib_cppflags => add("-DMD32_XARRAY"), ex_libs => add("-ldl", threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", + asm_arch => 'parisc20_64', + perlasm_scheme => "64", shared_cflag => "+Z", shared_ldflag => add_before("-b"), shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", @@ -524,7 +559,7 @@ my %targets = ( # HP/UX IA-64 targets "hpux-ia64-cc" => { - inherit_from => [ "hpux-common", asm("ia64_asm") ], + inherit_from => [ "hpux-common" ], CC => "cc", CFLAGS => picker(debug => "+O0 +d -g", release => "+O2"), @@ -532,13 +567,14 @@ my %targets = ( cppflags => add(threads("-D_REENTRANT")), ex_libs => add("-ldl", threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT", + asm_arch => 'ia64', + perlasm_scheme => 'void', shared_cflag => "+Z", shared_ldflag => add_before("-b"), - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "/hpux32", }, "hpux64-ia64-cc" => { - inherit_from => [ "hpux-common", asm("ia64_asm") ], + inherit_from => [ "hpux-common" ], CC => "cc", CFLAGS => picker(debug => "+O0 +d -g", release => "+O3"), @@ -546,36 +582,39 @@ my %targets = ( cppflags => threads("-D_REENTRANT"), ex_libs => add("-ldl", threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'ia64', + perlasm_scheme => 'void', shared_cflag => "+Z", shared_ldflag => add_before("-b"), - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "/hpux64", }, # GCC builds... "hpux-ia64-gcc" => { - inherit_from => [ "hpux-common", asm("ia64_asm") ], + inherit_from => [ "hpux-common" ], CC => "gcc", CFLAGS => picker(debug => "-O0 -g", release => "-O3"), cflags => add(threads("-pthread")), ex_libs => add("-ldl", threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT", + asm_arch => 'ia64', + perlasm_scheme => 'void', shared_cflag => "-fpic", shared_ldflag => add_before("-shared"), - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "/hpux32", }, "hpux64-ia64-gcc" => { - inherit_from => [ "hpux-common", asm("ia64_asm") ], + inherit_from => [ "hpux-common" ], CC => "gcc", CFLAGS => picker(debug => "-O0 -g", release => "-O3"), cflags => combine("-mlp64", threads("-pthread")), ex_libs => add("-ldl", threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'ia64', + perlasm_scheme => 'void', shared_cflag => "-fpic", shared_ldflag => add_before("-shared"), - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "/hpux64", }, @@ -599,20 +638,22 @@ my %targets = ( #### there were even osf1-* configs targeting prior versions provided, #### but not anymore... "tru64-alpha-gcc" => { - inherit_from => [ "BASE_unix", asm("alpha_asm") ], + inherit_from => [ "BASE_unix" ], CC => "gcc", CFLAGS => "-O3", cflags => add("-std=c9x", threads("-pthread")), cppflags => "-D_XOPEN_SOURCE=500 -D_OSF_SOURCE", ex_libs => add("-lrt", threads("-pthread")), # for mlock(2) bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'alpha', + perlasm_scheme => "void", thread_scheme => "pthreads", dso_scheme => "dlfcn", shared_target => "alpha-osf1-shared", shared_extension => ".so", }, "tru64-alpha-cc" => { - inherit_from => [ "BASE_unix", asm("alpha_asm") ], + inherit_from => [ "BASE_unix" ], CC => "cc", CFLAGS => "-tune host -fast", cflags => add("-std1 -readonly_strings", @@ -620,6 +661,8 @@ my %targets = ( cppflags => "-D_XOPEN_SOURCE=500 -D_OSF_SOURCE", ex_libs => add("-lrt", threads("-pthread")), # for mlock(2) bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'alpha', + perlasm_scheme => "void", thread_scheme => "pthreads", dso_scheme => "dlfcn", shared_target => "alpha-osf1-shared", @@ -651,8 +694,7 @@ my %targets = ( dso_scheme => "dlfcn", shared_target => "linux-shared", shared_cflag => "-fPIC", - shared_ldflag => "-Wl,-znodelete", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", + shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" }, enable => [ "afalgeng" ], }, "linux-generic64" => { @@ -661,22 +703,25 @@ my %targets = ( }, "linux-ppc" => { - inherit_from => [ "linux-generic32", asm("ppc32_asm") ], + inherit_from => [ "linux-generic32" ], + asm_arch => 'ppc32', perlasm_scheme => "linux32", }, "linux-ppc64" => { - inherit_from => [ "linux-generic64", asm("ppc64_asm") ], + inherit_from => [ "linux-generic64" ], cflags => add("-m64"), cxxflags => add("-m64"), lib_cppflags => add("-DB_ENDIAN"), + asm_arch => 'ppc64', perlasm_scheme => "linux64", multilib => "64", }, "linux-ppc64le" => { - inherit_from => [ "linux-generic64", asm("ppc64_asm") ], + inherit_from => [ "linux-generic64" ], cflags => add("-m64"), cxxflags => add("-m64"), lib_cppflags => add("-DL_ENDIAN"), + asm_arch => 'ppc64', perlasm_scheme => "linux64le", }, @@ -712,46 +757,49 @@ my %targets = ( # # ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8 # - inherit_from => [ "linux-generic32", asm("armv4_asm") ], + inherit_from => [ "linux-generic32" ], + asm_arch => 'armv4', perlasm_scheme => "linux32", }, "linux-aarch64" => { - inherit_from => [ "linux-generic64", asm("aarch64_asm") ], + inherit_from => [ "linux-generic64" ], + asm_arch => 'aarch64', perlasm_scheme => "linux64", }, "linux-arm64ilp32" => { # https://wiki.linaro.org/Platform/arm64-ilp32 - inherit_from => [ "linux-generic32", asm("aarch64_asm") ], + inherit_from => [ "linux-generic32" ], cflags => add("-mabi=ilp32"), cxxflags => add("-mabi=ilp32"), bn_ops => "SIXTY_FOUR_BIT RC4_CHAR", + asm_arch => 'aarch64', perlasm_scheme => "linux64", }, "linux-mips32" => { # Configure script adds minimally required -march for assembly # support, if no -march was specified at command line. - inherit_from => [ "linux-generic32", asm("mips32_asm") ], + inherit_from => [ "linux-generic32" ], cflags => add("-mabi=32"), cxxflags => add("-mabi=32"), - lib_cppflags => add("-DBN_DIV3W"), + asm_arch => 'mips32', perlasm_scheme => "o32", }, # mips32 and mips64 below refer to contemporary MIPS Architecture # specifications, MIPS32 and MIPS64, rather than to kernel bitness. "linux-mips64" => { - inherit_from => [ "linux-generic32", asm("mips64_asm") ], + inherit_from => [ "linux-generic32" ], cflags => add("-mabi=n32"), cxxflags => add("-mabi=n32"), - lib_cppflags => add("-DBN_DIV3W"), - bn_ops => "SIXTY_FOUR_BIT RC4_CHAR", + bn_ops => "RC4_CHAR", + asm_arch => 'mips64', perlasm_scheme => "n32", multilib => "32", }, "linux64-mips64" => { - inherit_from => [ "linux-generic64", asm("mips64_asm") ], + inherit_from => [ "linux-generic64" ], cflags => add("-mabi=64"), cxxflags => add("-mabi=64"), - lib_cppflags => add("-DBN_DIV3W"), + asm_arch => 'mips64', perlasm_scheme => "64", multilib => "64", }, @@ -760,13 +808,15 @@ my %targets = ( #### These two targets are a bit aged and are to be used on older Linux #### machines where gcc doesn't understand -m32 and -m64 "linux-elf" => { - inherit_from => [ "linux-generic32", asm("x86_elf_asm") ], + inherit_from => [ "linux-generic32" ], CFLAGS => add(picker(release => "-fomit-frame-pointer")), lib_cppflags => add("-DL_ENDIAN"), bn_ops => "BN_LLONG", + asm_arch => 'x86', + perlasm_scheme => "elf", }, "linux-aout" => { - inherit_from => [ "BASE_unix", asm("x86_asm") ], + inherit_from => [ "BASE_unix" ], CC => "gcc", CFLAGS => add(picker(default => "-Wall", debug => "-O0 -g", @@ -774,17 +824,19 @@ my %targets = ( lib_cppflags => add("-DL_ENDIAN"), bn_ops => "BN_LLONG", thread_scheme => "(unknown)", + asm_arch => 'x86', perlasm_scheme => "a.out", }, #### X86 / X86_64 targets "linux-x86" => { - inherit_from => [ "linux-generic32", asm("x86_asm") ], + inherit_from => [ "linux-generic32" ], CFLAGS => add(picker(release => "-fomit-frame-pointer")), cflags => add("-m32"), cxxflags => add("-m32"), lib_cppflags => add("-DL_ENDIAN"), bn_ops => "BN_LLONG", + asm_arch => 'x86', perlasm_scheme => "elf", }, "linux-x86-clang" => { @@ -793,11 +845,12 @@ my %targets = ( CXX => "clang++", }, "linux-x86_64" => { - inherit_from => [ "linux-generic64", asm("x86_64_asm") ], + inherit_from => [ "linux-generic64" ], cflags => add("-m64"), cxxflags => add("-m64"), lib_cppflags => add("-DL_ENDIAN"), bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'x86_64', perlasm_scheme => "elf", multilib => "64", }, @@ -807,25 +860,29 @@ my %targets = ( CXX => "clang++", }, "linux-x32" => { - inherit_from => [ "linux-generic32", asm("x86_64_asm") ], + inherit_from => [ "linux-generic32" ], cflags => add("-mx32"), cxxflags => add("-mx32"), lib_cppflags => add("-DL_ENDIAN"), bn_ops => "SIXTY_FOUR_BIT", + asm_arch => 'x86_64', perlasm_scheme => "elf32", multilib => "x32", }, "linux-ia64" => { - inherit_from => [ "linux-generic64", asm("ia64_asm") ], + inherit_from => [ "linux-generic64" ], bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'ia64', + perlasm_scheme => 'void', }, "linux64-s390x" => { - inherit_from => [ "linux-generic64", asm("s390x_asm") ], + inherit_from => [ "linux-generic64" ], cflags => add("-m64"), cxxflags => add("-m64"), lib_cppflags => add("-DB_ENDIAN"), + asm_arch => 's390x', perlasm_scheme => "64", multilib => "64", }, @@ -846,44 +903,52 @@ my %targets = ( # 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") ], + inherit_from => [ "linux-generic32" ], cflags => add("-m31 -Wa,-mzarch"), cxxflags => add("-m31 -Wa,-mzarch"), lib_cppflags => add("-DB_ENDIAN"), - bn_asm_src => sub { my $r=join(" ",@_); $r=~s|asm/s390x\.S|bn_asm.c|; $r; }, + asm_arch => 's390x', perlasm_scheme => "31", multilib => "/highgprs", }, #### SPARC Linux setups "linux-sparcv8" => { - inherit_from => [ "linux-generic32", asm("sparcv8_asm") ], + inherit_from => [ "linux-generic32" ], cflags => add("-mcpu=v8"), cxxflags => add("-mcpu=v8"), lib_cppflags => add("-DB_ENDIAN -DBN_DIV2W"), + asm_arch => 'sparcv8', + perlasm_scheme => 'void', }, "linux-sparcv9" => { # it's a real mess with -mcpu=ultrasparc option under Linux, # but -Wa,-Av8plus should do the trick no matter what. - inherit_from => [ "linux-generic32", asm("sparcv9_asm") ], + inherit_from => [ "linux-generic32" ], cflags => add("-m32 -mcpu=ultrasparc -Wa,-Av8plus"), cxxflags => add("-m32 -mcpu=ultrasparc -Wa,-Av8plus"), lib_cppflags => add("-DB_ENDIAN -DBN_DIV2W"), + asm_arch => 'sparcv9', + perlasm_scheme => 'void', }, "linux64-sparcv9" => { # GCC 3.1 is a requirement - inherit_from => [ "linux-generic64", asm("sparcv9_asm") ], + inherit_from => [ "linux-generic64" ], cflags => add("-m64 -mcpu=ultrasparc"), cxxflags => add("-m64 -mcpu=ultrasparc"), lib_cppflags => add("-DB_ENDIAN"), bn_ops => "BN_LLONG RC4_CHAR", + asm_arch => 'sparcv9', + perlasm_scheme => 'void', multilib => "64", }, "linux-alpha-gcc" => { - inherit_from => [ "linux-generic64", asm("alpha_asm") ], + inherit_from => [ "linux-generic64" ], lib_cppflags => add("-DL_ENDIAN"), bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'alpha', + perlasm_scheme => "void", }, "linux-c64xplus" => { inherit_from => [ "BASE_unix" ], @@ -895,21 +960,13 @@ my %targets = ( cppflags => combine("-DOPENSSL_SMALL_FOOTPRINT", threads("-D_REENTRANT")), bn_ops => "BN_LLONG", - cpuid_asm_src => "c64xpluscpuid.s", - bn_asm_src => "asm/bn-c64xplus.asm c64xplus-gf2m.s", - 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", thread_scheme => "pthreads", + asm_arch => 'c64xplus', perlasm_scheme => "void", dso_scheme => "dlfcn", shared_target => "linux-shared", shared_cflag => "--pic", shared_ldflag => add("-z --sysv --shared"), - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", ranlib => "true", }, @@ -936,7 +993,6 @@ my %targets = ( dso_scheme => "dlfcn", shared_target => "bsd-gcc-shared", shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", }, "BSD-generic64" => { inherit_from => [ "BSD-generic32" ], @@ -944,11 +1000,12 @@ my %targets = ( }, "BSD-x86" => { - inherit_from => [ "BSD-generic32", asm("x86_asm") ], + inherit_from => [ "BSD-generic32" ], CFLAGS => add(picker(release => "-fomit-frame-pointer")), lib_cppflags => add("-DL_ENDIAN"), bn_ops => "BN_LLONG", shared_target => "bsd-shared", + asm_arch => 'x86', perlasm_scheme => "a.out", }, "BSD-x86-elf" => { @@ -957,61 +1014,52 @@ my %targets = ( }, "BSD-sparcv8" => { - inherit_from => [ "BSD-generic32", asm("sparcv8_asm") ], + inherit_from => [ "BSD-generic32" ], cflags => add("-mcpu=v8"), lib_cppflags => add("-DB_ENDIAN"), + asm_arch => 'sparcv8', + perlasm_scheme => 'void', }, "BSD-sparc64" => { # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it # simply *happens* to work around a compiler bug in gcc 3.3.3, # triggered by RIPEMD160 code. - inherit_from => [ "BSD-generic64", asm("sparcv9_asm") ], + inherit_from => [ "BSD-generic64" ], lib_cppflags => add("-DB_ENDIAN -DMD32_REG_T=int"), bn_ops => "BN_LLONG", + asm_arch => 'sparcv9', + perlasm_scheme => 'void', }, "BSD-ia64" => { - inherit_from => [ "BSD-generic64", asm("ia64_asm") ], + inherit_from => [ "BSD-generic64" ], lib_cppflags => add("-DL_ENDIAN"), bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'ia64', + perlasm_scheme => 'void', }, "BSD-x86_64" => { - inherit_from => [ "BSD-generic64", asm("x86_64_asm") ], + inherit_from => [ "BSD-generic64" ], lib_cppflags => add("-DL_ENDIAN"), bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'x86_64', perlasm_scheme => "elf", }, "bsdi-elf-gcc" => { - inherit_from => [ "BASE_unix", asm("x86_elf_asm") ], + inherit_from => [ "BASE_unix" ], CC => "gcc", CFLAGS => "-fomit-frame-pointer -O3 -Wall", lib_cppflags => "-DPERL5 -DL_ENDIAN", ex_libs => add("-ldl"), bn_ops => "BN_LLONG", + asm_arch => 'x86', + perlasm_scheme => "elf", thread_scheme => "(unknown)", dso_scheme => "dlfcn", shared_target => "bsd-gcc-shared", shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", - }, - - "nextstep" => { - inherit_from => [ "BASE_unix" ], - CC => "cc", - CFLAGS => "-O -Wall", - unistd => "", - bn_ops => "BN_LLONG", - thread_scheme => "(unknown)", - }, - "nextstep3.3" => { - inherit_from => [ "BASE_unix" ], - CC => "cc", - CFLAGS => "-O3 -Wall", - unistd => "", - bn_ops => "BN_LLONG", - thread_scheme => "(unknown)", }, #### SCO/Caldera targets. @@ -1043,7 +1091,7 @@ my %targets = ( thread_scheme => "uithreads", }, "unixware-7" => { - inherit_from => [ "BASE_unix", asm("x86_elf_asm") ], + inherit_from => [ "BASE_unix" ], CC => "cc", CFLAGS => "-O", cflags => combine("-Kalloca", threads("-Kthread")), @@ -1051,14 +1099,14 @@ my %targets = ( ex_libs => add("-lsocket -lnsl"), thread_scheme => "uithreads", bn_ops => "BN_LLONG", + asm_arch => 'x86', perlasm_scheme => "elf-1", dso_scheme => "dlfcn", shared_target => "svr5-shared", shared_cflag => "-Kpic", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", }, "unixware-7-gcc" => { - inherit_from => [ "BASE_unix", asm("x86_elf_asm") ], + inherit_from => [ "BASE_unix" ], CC => "gcc", CFLAGS => "-O3 -fomit-frame-pointer -Wall", cppflags => add(threads("-D_REENTRANT")), @@ -1066,37 +1114,37 @@ my %targets = ( ex_libs => add("-lsocket -lnsl"), bn_ops => "BN_LLONG", thread_scheme => "pthreads", + asm_arch => 'x86', perlasm_scheme => "elf-1", dso_scheme => "dlfcn", shared_target => "gnu-shared", shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", }, # SCO 5 - Ben Laurie says the -O breaks the SCO cc. "sco5-cc" => { - inherit_from => [ "BASE_unix", asm("x86_elf_asm") ], + inherit_from => [ "BASE_unix" ], cc => "cc", cflags => "-belf", ex_libs => add("-lsocket -lnsl"), thread_scheme => "(unknown)", + asm_arch => 'x86', perlasm_scheme => "elf-1", dso_scheme => "dlfcn", shared_target => "svr3-shared", shared_cflag => "-Kpic", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", }, "sco5-gcc" => { - inherit_from => [ "BASE_unix", asm("x86_elf_asm") ], + inherit_from => [ "BASE_unix" ], cc => "gcc", cflags => "-O3 -fomit-frame-pointer", ex_libs => add("-lsocket -lnsl"), bn_ops => "BN_LLONG", thread_scheme => "(unknown)", + asm_arch => 'x86', perlasm_scheme => "elf-1", dso_scheme => "dlfcn", shared_target => "svr3-shared", shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", }, #### IBM's AIX. @@ -1110,39 +1158,38 @@ my %targets = ( template => 1, sys_id => "AIX", lib_cppflags => "-DB_ENDIAN", + lflags => "-Wl,-bsvr4", thread_scheme => "pthreads", dso_scheme => "dlfcn", - shared_target => "self", - bin_lflags => shared("-Wl,-bsvr4"), - module_ldflags => "-Wl,-G,-bsymbolic,-bexpall,-bnolibpath", - shared_ldflag => "-Wl,-G,-bsymbolic,-bnolibpath", + shared_target => "aix", + module_ldflags => "-Wl,-G,-bsymbolic,-bnoentry", + shared_ldflag => "-Wl,-G,-bsymbolic,-bnoentry", shared_defflag => "-Wl,-bE:", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", - dso_extension => ".so", - lib_extension => shared("_a.a"), - shared_extension_simple => shared(".a"), + perl_platform => 'AIX', }, "aix-gcc" => { - inherit_from => [ "aix-common", asm("ppc32_asm") ], + inherit_from => [ "aix-common" ], CC => "gcc", CFLAGS => picker(debug => "-O0 -g", release => "-O"), cflags => add(threads("-pthread")), ex_libs => threads("-pthread"), bn_ops => "BN_LLONG RC4_CHAR", + asm_arch => 'ppc32', perlasm_scheme => "aix32", shared_ldflag => add_before("-shared -static-libgcc"), AR => add("-X32"), RANLIB => add("-X32"), }, "aix64-gcc" => { - inherit_from => [ "aix-common", asm("ppc64_asm") ], + inherit_from => [ "aix-common" ], CC => "gcc", CFLAGS => picker(debug => "-O0 -g", release => "-O"), cflags => combine("-maix64", threads("-pthread")), ex_libs => threads("-pthread"), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", + asm_arch => 'ppc64', perlasm_scheme => "aix64", shared_ldflag => add_before("-shared -static-libgcc"), shared_extension => "64.so.\$(SHLIB_VERSION_NUMBER)", @@ -1150,7 +1197,7 @@ my %targets = ( RANLIB => add("-X64"), }, "aix-cc" => { - inherit_from => [ "aix-common", asm("ppc32_asm") ], + inherit_from => [ "aix-common" ], CC => "cc", CFLAGS => picker(debug => "-O0 -g", release => "-O"), @@ -1159,13 +1206,14 @@ my %targets = ( cppflags => threads("-D_THREAD_SAFE"), ex_libs => threads("-lpthreads"), bn_ops => "BN_LLONG RC4_CHAR", + asm_arch => 'ppc32', perlasm_scheme => "aix32", shared_cflag => "-qpic", AR => add("-X32"), RANLIB => add("-X32"), }, "aix64-cc" => { - inherit_from => [ "aix-common", asm("ppc64_asm") ], + inherit_from => [ "aix-common" ], CC => "cc", CFLAGS => picker(debug => "-O0 -g", release => "-O"), @@ -1174,6 +1222,7 @@ my %targets = ( cppflags => threads("-D_THREAD_SAFE"), ex_libs => threads("-lpthreads"), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", + asm_arch => 'ppc64', perlasm_scheme => "aix64", dso_scheme => "dlfcn", shared_cflag => "-qpic", @@ -1230,12 +1279,13 @@ my %targets = ( lib_defines => add("L_ENDIAN"), dso_cflags => "/Zi /Fddso.pdb", bin_cflags => "/Zi /Fdapp.pdb", + # def_flag made to empty string so a .def file gets generated + shared_defflag => '', shared_ldflag => "/dll", shared_target => "win-shared", # meaningless except it gives Configure a hint thread_scheme => "winthreads", dso_scheme => "win32", - apps_aux_src => add("win32_init.c"), - bn_ops => "EXPORT_VAR_AS_FN", + perl_platform => 'Windows::MSVC', # additional parameter to build_scheme denotes install-path "flavour" build_scheme => add("VC-common", { separator => undef }), }, @@ -1289,40 +1339,38 @@ my %targets = ( bn_ops => add("SIXTY_FOUR_BIT"), }, "VC-WIN64I" => { - inherit_from => [ "VC-WIN64-common", asm("ia64_asm"), - sub { $disabled{shared} ? () : "ia64_uplink" } ], + inherit_from => [ "VC-WIN64-common" ], AS => "ias", ASFLAGS => "-d debug", asoutflag => "-o ", sys_id => "WIN64I", - bn_asm_src => sub { return undef unless @_; - my $r=join(" ",@_); $r=~s|bn-ia64.s|bn_asm.c|; $r; }, + uplink_arch => 'ia64', + asm_arch => 'ia64', perlasm_scheme => "ias", multilib => "-ia64", }, "VC-WIN64A" => { - inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"), - sub { $disabled{shared} ? () : "x86_64_uplink" } ], + inherit_from => [ "VC-WIN64-common" ], AS => sub { vc_win64a_info()->{AS} }, ASFLAGS => sub { vc_win64a_info()->{ASFLAGS} }, asoutflag => sub { vc_win64a_info()->{asoutflag} }, asflags => sub { vc_win64a_info()->{asflags} }, sys_id => "WIN64A", - bn_asm_src => sub { return undef unless @_; - my $r=join(" ",@_); $r=~s|asm/x86_64-gcc|bn_asm|; $r; }, + uplink_arch => 'x86_64', + asm_arch => 'x86_64', perlasm_scheme => "auto", multilib => "-x64", }, "VC-WIN32" => { - inherit_from => [ "VC-noCE-common", asm("x86_asm"), - sub { $disabled{shared} ? () : "uplink_common" } ], - CFLAGS => add("/WX"), + inherit_from => [ "VC-noCE-common" ], AS => sub { vc_win32_info()->{AS} }, ASFLAGS => sub { vc_win32_info()->{ASFLAGS} }, asoutflag => sub { vc_win32_info()->{asoutflag} }, asflags => sub { vc_win32_info()->{asflags} }, sys_id => "WIN32", bn_ops => add("BN_LLONG"), + uplink_arch => 'common', + asm_arch => 'x86', perlasm_scheme => sub { vc_win32_info()->{perlasm_scheme} }, # "WOW" stands for "Windows on Windows", and "VC-WOW" engages # some installation path heuristics in windows-makefile.tmpl... @@ -1376,62 +1424,55 @@ my %targets = ( }, #### MinGW - "mingw" => { - inherit_from => [ "BASE_unix", asm("x86_asm"), - sub { $disabled{shared} ? () : "x86_uplink" } ], + "mingw-common" => { + inherit_from => [ 'BASE_unix' ], + template => 1, CC => "gcc", CFLAGS => picker(default => "-Wall", debug => "-g -O0", - release => "-O3 -fomit-frame-pointer"), - cflags => "-m32", + release => "-O3"), cppflags => combine("-DUNICODE -D_UNICODE -DWIN32_LEAN_AND_MEAN", threads("-D_MT")), lib_cppflags => "-DL_ENDIAN", - sys_id => "MINGW32", ex_libs => add("-lws2_32 -lgdi32 -lcrypt32"), - bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", thread_scheme => "winthreads", - perlasm_scheme => "coff", dso_scheme => "win32", shared_target => "mingw-shared", shared_cppflags => add("_WINDLL"), shared_ldflag => "-static-libgcc", + + perl_platform => 'mingw', + }, + "mingw" => { + inherit_from => [ "mingw-common" ], + CFLAGS => add(picker(release => "-fomit-frame-pointer")), + cflags => "-m32", + sys_id => "MINGW32", + bn_ops => add("BN_LLONG"), + asm_arch => 'x86', + uplink_arch => 'x86', + perlasm_scheme => "coff", shared_rcflag => "--target=pe-i386", - shared_extension => ".dll", multilib => "", - apps_aux_src => add("win32_init.c"), }, "mingw64" => { - # As for OPENSSL_USE_APPLINK. Applink makes it possible to use + # As for uplink_arch. 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 + # mingw64 build, but it's not done, because until 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 => [ "BASE_unix", asm("x86_64_asm") ], - CC => "gcc", - CFLAGS => picker(default => "-Wall", - debug => "-g -O0", - release => "-O3"), + inherit_from => [ "mingw-common" ], cflags => "-m64", - cppflags => combine("-DUNICODE -D_UNICODE -DWIN32_LEAN_AND_MEAN", - threads("-D_MT")), - lib_cppflags => "-DL_ENDIAN", sys_id => "MINGW64", - ex_libs => add("-lws2_32 -lgdi32 -lcrypt32"), - bn_ops => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN", - thread_scheme => "winthreads", + bn_ops => add("SIXTY_FOUR_BIT"), + asm_arch => 'x86_64', + uplink_arch => undef, perlasm_scheme => "mingw64", - dso_scheme => "win32", - shared_target => "mingw-shared", - shared_cppflags => add("_WINDLL"), - shared_ldflag => "-static-libgcc", shared_rcflag => "--target=pe-x86-64", - shared_extension => ".dll", multilib => "64", - apps_aux_src => add("win32_init.c"), }, #### UEFI @@ -1442,6 +1483,16 @@ my %targets = ( lib_cppflags => "-DL_ENDIAN", sys_id => "UEFI", }, + "UEFI-x86" => { + inherit_from => [ "UEFI" ], + asm_arch => 'x86', + perlasm_scheme => "win32n", + }, + "UEFI-x86_64" => { + inherit_from => [ "UEFI" ], + asm_arch => 'x86_64', + perlasm_scheme => "nasm", + }, #### UWIN "UWIN" => { @@ -1455,37 +1506,36 @@ my %targets = ( }, #### Cygwin - "Cygwin-x86" => { - inherit_from => [ "BASE_unix", asm("x86_asm") ], + "Cygwin-common" => { + inherit_from => [ "BASE_unix" ], + template => 1, + CC => "gcc", CFLAGS => picker(default => "-Wall", debug => "-g -O0", - release => "-O3 -fomit-frame-pointer"), + release => "-O3"), lib_cppflags => "-DTERMIOS -DL_ENDIAN", sys_id => "CYGWIN", - bn_ops => "BN_LLONG", thread_scheme => "pthread", - perlasm_scheme => "coff", dso_scheme => "dlfcn", shared_target => "cygwin-shared", shared_cppflags => "-D_WINDLL", - shared_extension => ".dll", + + perl_platform => 'Cygwin', + }, + "Cygwin-x86" => { + inherit_from => [ "Cygwin-common" ], + CFLAGS => add(picker(release => "-O3 -fomit-frame-pointer")), + bn_ops => "BN_LLONG", + asm_arch => 'x86', + perlasm_scheme => "coff", }, "Cygwin-x86_64" => { - inherit_from => [ "BASE_unix", asm("x86_64_asm") ], + inherit_from => [ "Cygwin-common" ], CC => "gcc", - CFLAGS => picker(default => "-Wall", - debug => "-g -O0", - release => "-O3"), - lib_cppflags => "-DTERMIOS -DL_ENDIAN", - sys_id => "CYGWIN", bn_ops => "SIXTY_FOUR_BIT_LONG", - thread_scheme => "pthread", + asm_arch => 'x86_64', perlasm_scheme => "mingw64", - dso_scheme => "dlfcn", - shared_target => "cygwin-shared", - shared_cppflags => "-D_WINDLL", - shared_extension => ".dll", }, # Backward compatibility for those using this target "Cygwin" => { @@ -1528,51 +1578,55 @@ my %targets = ( # with future defaults for below two targets, because MacOS X # for PPC has no future, it was discontinued by vendor in 2009. "darwin-ppc-cc" => { - inherit_from => [ "darwin-common", asm("ppc32_asm") ], + inherit_from => [ "darwin-common" ], cflags => add("-arch ppc -std=gnu9x -Wa,-force_cpusubtype_ALL"), lib_cppflags => add("-DB_ENDIAN"), shared_cflag => add("-fno-common"), + asm_arch => 'ppc32', perlasm_scheme => "osx32", }, "darwin64-ppc-cc" => { - inherit_from => [ "darwin-common", asm("ppc64_asm") ], + inherit_from => [ "darwin-common" ], cflags => add("-arch ppc64 -std=gnu9x"), lib_cppflags => add("-DB_ENDIAN"), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", + asm_arch => 'ppc64', perlasm_scheme => "osx64", }, "darwin-i386-cc" => { - inherit_from => [ "darwin-common", asm("x86_asm") ], + inherit_from => [ "darwin-common" ], CFLAGS => add(picker(release => "-fomit-frame-pointer")), cflags => add("-arch i386"), lib_cppflags => add("-DL_ENDIAN"), bn_ops => "BN_LLONG RC4_INT", + asm_arch => 'x86', perlasm_scheme => "macosx", }, "darwin64-x86_64-cc" => { - inherit_from => [ "darwin-common", asm("x86_64_asm") ], + inherit_from => [ "darwin-common" ], CFLAGS => add("-Wall"), cflags => add("-arch x86_64"), lib_cppflags => add("-DL_ENDIAN"), bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'x86_64', perlasm_scheme => "macosx", }, ##### GNU Hurd "hurd-x86" => { inherit_from => [ "BASE_unix" ], - inherit_from => [ asm("x86_elf_asm") ], CC => "gcc", CFLAGS => "-O3 -fomit-frame-pointer -Wall", cflags => threads("-pthread"), lib_cppflags => "-DL_ENDIAN", ex_libs => add("-ldl", threads("-pthread")), bn_ops => "BN_LLONG", + asm_arch => 'x86', + perlasm_scheme => 'elf', thread_scheme => "pthreads", dso_scheme => "dlfcn", shared_target => "linux-shared", shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", }, ##### VxWorks for various targets @@ -1658,7 +1712,7 @@ my %targets = ( ranlib => "ranlibpentium", }, "vxworks-mips" => { - inherit_from => [ "BASE_unix", asm("mips32_asm") ], + inherit_from => [ "BASE_unix" ], CC => "ccmips", CFLAGS => "-O -G 0", cflags => "-mrtp -mips2 -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -msoft-float -mno-branch-likely -fno-builtin -fno-defer-pop", @@ -1673,6 +1727,7 @@ my %targets = ( lflags => add("-L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon"), ex_libs => add("-Wl,--defsym,__wrs_rtp_base=0xe0000000"), thread_scheme => "pthreads", + asm_arch => 'mips32', perlasm_scheme => "o32", ranlib => "ranlibmips", }, @@ -1688,7 +1743,6 @@ my %targets = ( dso_scheme => sub { env('LIBSSL_dlfcn') }, shared_target => "linux-shared", shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", ranlib => sub { env('RANLIB') }, }, "uClinux-dist64" => { @@ -1701,7 +1755,6 @@ my %targets = ( dso_scheme => sub { env('LIBSSL_dlfcn') }, shared_target => "linux-shared", shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", ranlib => sub { env('RANLIB') }, }, @@ -1732,12 +1785,19 @@ my %targets = ( lflags => picker(default => "/MAP='F\$PARSE(\".MAP\",\"\$\@\")'", debug => "/DEBUG/TRACEBACK", release => "/NODEBUG/NOTRACEBACK"), + # Because of dso_cflags below, we can't set the generic |cflags| here, + # as it can't be overridden, so we set separate C flags for libraries + # and binaries instead. + bin_cflags => add("/NAMES=(AS_IS,SHORTENED)/EXTERN_MODEL=STRICT_REFDEF"), lib_cflags => add("/NAMES=(AS_IS,SHORTENED)/EXTERN_MODEL=STRICT_REFDEF"), - # no_inst_lib_cflags is used instead of lib_cflags by descrip.mms.tmpl - # for object files belonging to selected internal libraries - no_inst_lib_cflags => "", + # For modules specifically, we assume that they only use public + # OpenSSL symbols, and therefore don't need to mangle names on + # their own. + dso_cflags => "", ex_libs => add(sub { return vms_info()->{zlib} || (); }), shared_target => "vms-shared", + # def_flag made to empty string so a .opt file gets generated + shared_defflag => '', dso_scheme => "vms", thread_scheme => "pthreads", @@ -1747,8 +1807,8 @@ my %targets = ( asflags => sub { vms_info()->{asflags} }, perlasm_scheme => sub { vms_info()->{perlasm_scheme} }, - apps_aux_src => "vms_term_sock.c", - apps_init_src => "vms_decc_init.c", + disable => add('pinshared'), + }, # From HELP CC/POINTER_SIZE: @@ -1781,13 +1841,12 @@ my %targets = ( pointer_size => "64", }, "vms-ia64" => { - inherit_from => [ "vms-generic", - sub { vms_info()->{as} - ? asm("ia64_asm")->() : () } ], + inherit_from => [ "vms-generic" ], bn_ops => "SIXTY_FOUR_BIT RC4_INT", + asm_arch => sub { vms_info()->{AS} ? 'ia64' : undef }, + perlasm_scheme => 'ias', pointer_size => "", - modes_asm_src => "", # Because ghash-ia64.s doesn't work on VMS }, "vms-ia64-p32" => { inherit_from => [ "vms-ia64" ],