X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Configurations%2F10-main.conf;h=28b63be1f4ee35d1e079000f5dd8e4ceef53bb26;hp=6e7f2d1adac3d147a6d77f4ea679125bcbc3ad0a;hb=63b596e38df603c983da188c6ace3e335a116730;hpb=9300f078b6b6a83acd9aabcca89577f1a7800a6f diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 6e7f2d1ada..28b63be1f4 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -11,12 +11,13 @@ sub vc_win64a_info { asflags => "-Ox -f win64 -DNEAR", asoutflag => "-o " }; } elsif ($disabled{asm}) { + # assembler is still used to compile uplink shim $vc_win64a_info = { AS => "ml64", - ASFLAGS => "/Zi", + ASFLAGS => "/nologo /Zi", 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 => "", @@ -38,13 +39,14 @@ sub vc_win32_info { asoutflag => "-o ", perlasm_scheme => "win32n" }; } elsif ($disabled{asm}) { + # not actually used, uplink shim is inlined into C code $vc_win32_info = { AS => "ml", ASFLAGS => "/nologo /Zi", asflags => "/Cp /coff /c /Cx", 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 => "", @@ -192,7 +194,8 @@ my %targets = ( CFLAGS => picker(default => "-Wall", debug => "-O0 -g", release => "-O3"), - cppflags => "-D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN", + cppflags => "-D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES", + lib_cppflags => "-DB_ENDIAN", thread_scheme => "(unknown)", sys_id => "VOS", lflags => add("-Wl,-map"), @@ -204,12 +207,15 @@ my %targets = ( "solaris-common" => { inherit_from => [ "BASE_unix" ], template => 1, - cppflags => "-DFILIO_H", + lib_cppflags => "-DFILIO_H", ex_libs => add("-lsocket -lnsl -ldl"), dso_scheme => "dlfcn", thread_scheme => "pthreads", - shared_target => "solaris-shared", + shared_target => "self", shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", + shared_ldflag => "-Wl,-Bsymbolic", + shared_defflag => "-Wl,-M,", + shared_sonameflag=> "-Wl,-h,", }, #### Solaris x86 with GNU C setups "solaris-x86-gcc" => { @@ -222,11 +228,11 @@ my %targets = ( debug => "-O0 -g", release => "-O3 -fomit-frame-pointer")), cflags => add(threads("-pthread")), - cppflags => add("-DL_ENDIAN"), + lib_cppflags => add("-DL_ENDIAN"), ex_libs => add(threads("-pthread")), bn_ops => "BN_LLONG", shared_cflag => "-fPIC", - shared_ldflag => "-shared -static-libgcc", + shared_ldflag => add_before("-shared -static-libgcc"), }, "solaris64-x86_64-gcc" => { # -shared -static-libgcc might appear controversial, but modules @@ -243,12 +249,12 @@ my %targets = ( debug => "-O0 -g", release => "-O3")), cflags => add_before("-m64", threads("-pthread")), - cppflags => add("-DL_ENDIAN"), + lib_cppflags => add("-DL_ENDIAN"), ex_libs => add(threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "elf", shared_cflag => "-fPIC", - shared_ldflag => "-shared -static-libgcc", + shared_ldflag => add_before("-shared -static-libgcc"), multilib => "/64", }, @@ -271,14 +277,15 @@ my %targets = ( CFLAGS => add_before(picker(debug => "-g", release => "-xO5 -xdepend -xbuiltin")), cflags => add_before("-xarch=generic64 -xstrconst -Xa"), - cppflags => add("-DL_ENDIAN", threads("-D_REENTRANT")), + cppflags => add(threads("-D_REENTRANT")), + lib_cppflags => add("-DL_ENDIAN"), thread_scheme => "pthreads", lflags => add(threads("-mt")), ex_libs => add(threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "elf", shared_cflag => "-KPIC", - shared_ldflag => "-G -dy -z text", + shared_ldflag => add_before("-G -dy -z text"), multilib => "/64", }, @@ -290,11 +297,11 @@ my %targets = ( debug => "-O0 -g", release => "-O3")), cflags => add(threads("-pthread")), - cppflags => add("-DB_ENDIAN -DBN_DIV2W"), + lib_cppflags => add("-DB_ENDIAN -DBN_DIV2W"), ex_libs => add(threads("-pthread")), bn_ops => "BN_LLONG RC4_CHAR", shared_cflag => "-fPIC", - shared_ldflag => "-shared", + shared_ldflag => add_before("-shared"), }, "solaris-sparcv8-gcc" => { inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ], @@ -323,13 +330,13 @@ my %targets = ( CFLAGS => add_before(picker(debug => "-g", release => "-xO5 -xdepend")), cflags => add_before("-xstrconst -Xa"), - cppflags => add("-DB_ENDIAN -DBN_DIV2W", - threads("-D_REENTRANT")), + cppflags => add(threads("-D_REENTRANT")), + lib_cppflags => add("-DB_ENDIAN -DBN_DIV2W"), lflags => add(threads("-mt")), ex_libs => add(threads("-lpthread")), bn_ops => "BN_LLONG RC4_CHAR", shared_cflag => "-KPIC", - shared_ldflag => "-G -dy -z text", + shared_ldflag => add_before("-G -dy -z text"), }, #### "solaris-sparcv8-cc" => { @@ -349,74 +356,60 @@ my %targets = ( #### IRIX 6.x configs # Only N32 and N64 ABIs are supported. + "irix-common" => { + inherit_from => [ "BASE_unix" ], + template => 1, + cppflags => threads("-D_SGI_MP_SOURCE"), + 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 => [ "BASE_unix", asm("mips64_asm") ], + inherit_from => [ "irix-common", asm("mips64_asm") ], CC => "gcc", CFLAGS => picker(debug => "-g -O0", release => "-O3"), + LDFLAGS => "-static-libgcc", cflags => "-mabi=n32", - cppflags => combine("-DB_ENDIAN -DBN_DIV3W", - threads("-D_SGI_MP_SOURCE")), - ex_libs => add(threads("-lpthread")), bn_ops => "RC4_CHAR SIXTY_FOUR_BIT", - thread_scheme => "pthreads", perlasm_scheme => "n32", - dso_scheme => "dlfcn", - shared_target => "irix-shared", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "32", }, "irix-mips3-cc" => { - inherit_from => [ "BASE_unix", asm("mips64_asm") ], + inherit_from => [ "irix-common", asm("mips64_asm") ], CC => "cc", CFLAGS => picker(debug => "-g -O0", release => "-O2"), cflags => "-n32 -mips3 -use_readonly_const -G0 -rdata_shared", - cppflags => combine("-DB_ENDIAN -DBN_DIV3W", - threads("-D_SGI_MP_SOURCE")), - ex_libs => add(threads("-lpthread")), bn_ops => "RC4_CHAR SIXTY_FOUR_BIT", - thread_scheme => "pthreads", perlasm_scheme => "n32", - dso_scheme => "dlfcn", - shared_target => "irix-shared", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "32", }, # N64 ABI builds. "irix64-mips4-gcc" => { - inherit_from => [ "BASE_unix", asm("mips64_asm") ], + inherit_from => [ "irix-common", asm("mips64_asm") ], CC => "gcc", CFLAGS => picker(debug => "-g -O0", release => "-O3"), + LDFLAGS => "-static-libgcc", cflags => "-mabi=64 -mips4", - cppflags => combine("-DB_ENDIAN -DBN_DIV3W", - threads("-D_SGI_MP_SOURCE")), - ex_libs => add(threads("-lpthread")), bn_ops => "RC4_CHAR SIXTY_FOUR_BIT_LONG", - thread_scheme => "pthreads", perlasm_scheme => "64", - dso_scheme => "dlfcn", - shared_target => "irix-shared", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "64", }, "irix64-mips4-cc" => { - inherit_from => [ "BASE_unix", asm("mips64_asm") ], + inherit_from => [ "irix-common", asm("mips64_asm") ], CC => "cc", CFLAGS => picker(debug => "-g -O0", release => "-O2"), - cppflags => threads("-D_SGI_MP_SOURCE"), cflags => "-64 -mips4 -use_readonly_const -G0 -rdata_shared", - cppflags => combine("-DB_ENDIAN -DBN_DIV3W", - threads("-D_SGI_MP_SOURCE")), - ex_libs => threads("-lpthread"), bn_ops => "RC4_CHAR SIXTY_FOUR_BIT_LONG", - thread_scheme => "pthreads", perlasm_scheme => "64", - dso_scheme => "dlfcn", - shared_target => "irix-shared", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "64", }, @@ -447,20 +440,31 @@ my %targets = ( # targets; b) performance-critical 32-bit assembly modules implement # even PA-RISC 2.0-specific code paths, which are chosen at run-time, # thus adequate performance is provided even with PA-RISC 1.1 build. - "hpux-parisc-gcc" => { + "hpux-common" => { inherit_from => [ "BASE_unix" ], + template => 1, + defines => add("_XOPEN_SOURCE", "_XOPEN_SOURCE_EXTENDED", + "_HPUX_ALT_XOPEN_SOCKET_API"), + lib_cppflags => "-DB_ENDIAN", + thread_scheme => "pthreads", + dso_scheme => "dlfcn", # overridden in 32-bit PA-RISC builds + shared_target => "self", + bin_lflags => "-Wl,+s,+cdp,../:,+cdp,./:", + shared_ldflag => "-Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:", + shared_sonameflag=> "-Wl,+h,", + }, + "hpux-parisc-gcc" => { + inherit_from => [ "hpux-common" ], CC => "gcc", CFLAGS => picker(debug => "-O0 -g", release => "-O3"), cflags => add(threads("-pthread")), - cppflags => "-DB_ENDIAN -DBN_DIV2W", - ex_libs => add("-Wl,+s -ldld", threads("-pthread")), - bn_ops => "BN_LLONG", - thread_scheme => "pthreads", + lib_cppflags => add("-DBN_DIV2W"), + ex_libs => add("-ldld", threads("-pthread")), + bn_ops => "BN_LLONG RC4_CHAR", dso_scheme => "dl", - shared_target => "hpux-shared", shared_cflag => "-fPIC", - shared_ldflag => "-shared", + shared_ldflag => add_before("-shared"), shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", }, "hpux-parisc1_1-gcc" => { @@ -468,38 +472,33 @@ my %targets = ( multilib => "/pa1.1", }, "hpux64-parisc2-gcc" => { - inherit_from => [ "BASE_unix", asm("parisc20_64_asm") ], + inherit_from => [ "hpux-common", asm("parisc20_64_asm") ], CC => "gcc", CFLAGS => combine(picker(debug => "-O0 -g", release => "-O3")), - cppflags => combine("-DB_ENDIAN", threads("-D_REENTRANT")), - ex_libs => add("-ldl"), + cflags => add(threads("-pthread")), + ex_libs => add("-ldl", threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - shared_target => "hpux-shared", shared_cflag => "-fpic", - shared_ldflag => "-shared", + shared_ldflag => add_before("-shared"), shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", multilib => "/pa20_64", }, # More attempts at unified 10.X and 11.X targets for HP C compiler. "hpux-parisc-cc" => { - inherit_from => [ "BASE_unix" ], + inherit_from => [ "hpux-common" ], CC => "cc", CFLAGS => picker(debug => "+O0 +d -g", release => "+O3"), cflags => "+Optrs_strongly_typed -Ae +ESlit", - cppflags => combine("-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY", - threads("-D_REENTRANT")), - ex_libs => add("-Wl,+s -ldld",threads("-lpthread")), + cppflags => threads("-D_REENTRANT"), + lib_cppflags => add("-DBN_DIV2W -DMD32_XARRAY"), + ex_libs => add("-ldld", threads("-lpthread")), bn_ops => "RC4_CHAR", - thread_scheme => "pthreads", dso_scheme => "dl", - shared_target => "hpux-shared", shared_cflag => "+Z", - shared_ldflag => "-b", + shared_ldflag => add_before("-b"), shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", }, "hpux-parisc1_1-cc" => { @@ -508,91 +507,74 @@ my %targets = ( multilib => "/pa1.1", }, "hpux64-parisc2-cc" => { - inherit_from => [ "BASE_unix", asm("parisc20_64_asm") ], + inherit_from => [ "hpux-common", asm("parisc20_64_asm") ], CC => "cc", CFLAGS => picker(debug => "+O0 +d -g", release => "+O3") , cflags => "+DD64 +Optrs_strongly_typed -Ae +ESlit", - cppflags => combine("-DB_ENDIAN -DMD32_XARRAY", - threads("-D_REENTRANT")), - ex_libs => add("-ldl",threads("-lpthread")), + cppflags => threads("-D_REENTRANT") , + lib_cppflags => add("-DMD32_XARRAY"), + ex_libs => add("-ldl", threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - shared_target => "hpux-shared", shared_cflag => "+Z", - shared_ldflag => "-b", + shared_ldflag => add_before("-b"), shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", multilib => "/pa20_64", }, # HP/UX IA-64 targets "hpux-ia64-cc" => { - inherit_from => [ "BASE_unix", asm("ia64_asm") ], + inherit_from => [ "hpux-common", asm("ia64_asm") ], CC => "cc", CFLAGS => picker(debug => "+O0 +d -g", release => "+O2"), cflags => "-Ae +DD32 +Olit=all -z", - cppflags => combine("-DB_ENDIAN", threads("-D_REENTRANT")), - ex_libs => add("-ldl",threads("-lpthread")), + cppflags => add(threads("-D_REENTRANT")), + ex_libs => add("-ldl", threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - shared_target => "hpux-shared", shared_cflag => "+Z", - shared_ldflag => "-b", + shared_ldflag => add_before("-b"), shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "/hpux32", }, "hpux64-ia64-cc" => { - inherit_from => [ "BASE_unix", asm("ia64_asm") ], + inherit_from => [ "hpux-common", asm("ia64_asm") ], CC => "cc", CFLAGS => picker(debug => "+O0 +d -g", release => "+O3"), cflags => "-Ae +DD64 +Olit=all -z", - cppflags => combine("-DB_ENDIAN", threads("-D_REENTRANT")), + cppflags => threads("-D_REENTRANT"), ex_libs => add("-ldl", threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - shared_target => "hpux-shared", shared_cflag => "+Z", - shared_ldflag => "-b", + shared_ldflag => add_before("-b"), shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "/hpux64", }, # GCC builds... "hpux-ia64-gcc" => { - inherit_from => [ "BASE_unix", asm("ia64_asm") ], + inherit_from => [ "hpux-common", asm("ia64_asm") ], CC => "gcc", CFLAGS => picker(debug => "-O0 -g", release => "-O3"), cflags => add(threads("-pthread")), - cppflags => "-DB_ENDIAN", ex_libs => add("-ldl", threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - shared_target => "hpux-shared", shared_cflag => "-fpic", - shared_ldflag => "-shared", + shared_ldflag => add_before("-shared"), shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "/hpux32", }, "hpux64-ia64-gcc" => { - inherit_from => [ "BASE_unix", asm("ia64_asm") ], + inherit_from => [ "hpux-common", asm("ia64_asm") ], CC => "gcc", CFLAGS => picker(debug => "-O0 -g", release => "-O3"), cflags => combine("-mlp64", threads("-pthread")), - cppflags => "-DB_ENDIAN", ex_libs => add("-ldl", threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - shared_target => "hpux-shared", shared_cflag => "-fpic", - shared_ldflag => "-shared", + shared_ldflag => add_before("-shared"), shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "/hpux64", }, @@ -602,8 +584,9 @@ my %targets = ( inherit_from => [ "BASE_unix" ], CC => "gcc", CFLAGS => "-O3", - cppflags => "-DBN_DIV2W -D_POSIX_SOURCE -D_SOCKET_SOURCE", - includes => add("/SYSLOG/PUB"), + cppflags => "-D_POSIX_SOURCE -D_SOCKET_SOURCE", + includes => [ "/SYSLOG/PUB" ], + lib_cppflags => "-DBN_DIV2W", sys_id => "MPE", lflags => add("-L/SYSLOG/PUB"), ex_libs => add("-lsyslog -lsocket -lcurses"), @@ -661,15 +644,16 @@ my %targets = ( release => "-O3"), cflags => threads("-pthread"), cxxflags => combine("-std=c++11", threads("-pthread")), - cppflags => "-DOPENSSL_USE_NODELETE", + lib_cppflags => "-DOPENSSL_USE_NODELETE", ex_libs => add("-ldl", threads("-pthread")), bn_ops => "BN_LLONG RC4_CHAR", thread_scheme => "pthreads", dso_scheme => "dlfcn", shared_target => "linux-shared", shared_cflag => "-fPIC", - shared_ldflag => "-Wl,-znodelete", + shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" }, shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", + enable => [ "afalgeng" ], }, "linux-generic64" => { inherit_from => [ "linux-generic32" ], @@ -684,7 +668,7 @@ my %targets = ( inherit_from => [ "linux-generic64", asm("ppc64_asm") ], cflags => add("-m64"), cxxflags => add("-m64"), - cppflags => add("-DB_ENDIAN"), + lib_cppflags => add("-DB_ENDIAN"), perlasm_scheme => "linux64", multilib => "64", }, @@ -692,7 +676,7 @@ my %targets = ( inherit_from => [ "linux-generic64", asm("ppc64_asm") ], cflags => add("-m64"), cxxflags => add("-m64"), - cppflags => add("-DL_ENDIAN"), + lib_cppflags => add("-DL_ENDIAN"), perlasm_scheme => "linux64le", }, @@ -749,7 +733,6 @@ my %targets = ( inherit_from => [ "linux-generic32", asm("mips32_asm") ], cflags => add("-mabi=32"), cxxflags => add("-mabi=32"), - cppflags => add("-DBN_DIV3W"), perlasm_scheme => "o32", }, # mips32 and mips64 below refer to contemporary MIPS Architecture @@ -758,7 +741,6 @@ my %targets = ( inherit_from => [ "linux-generic32", asm("mips64_asm") ], cflags => add("-mabi=n32"), cxxflags => add("-mabi=n32"), - cppflags => add("-DBN_DIV3W"), bn_ops => "SIXTY_FOUR_BIT RC4_CHAR", perlasm_scheme => "n32", multilib => "32", @@ -767,7 +749,6 @@ my %targets = ( inherit_from => [ "linux-generic64", asm("mips64_asm") ], cflags => add("-mabi=64"), cxxflags => add("-mabi=64"), - cppflags => add("-DBN_DIV3W"), perlasm_scheme => "64", multilib => "64", }, @@ -778,7 +759,7 @@ my %targets = ( "linux-elf" => { inherit_from => [ "linux-generic32", asm("x86_elf_asm") ], CFLAGS => add(picker(release => "-fomit-frame-pointer")), - cppflags => add("-DL_ENDIAN"), + lib_cppflags => add("-DL_ENDIAN"), bn_ops => "BN_LLONG", }, "linux-aout" => { @@ -787,7 +768,7 @@ my %targets = ( CFLAGS => add(picker(default => "-Wall", debug => "-O0 -g", release => "-O3 -fomit-frame-pointer")), - cppflags => add("-DL_ENDIAN"), + lib_cppflags => add("-DL_ENDIAN"), bn_ops => "BN_LLONG", thread_scheme => "(unknown)", perlasm_scheme => "a.out", @@ -799,7 +780,7 @@ my %targets = ( CFLAGS => add(picker(release => "-fomit-frame-pointer")), cflags => add("-m32"), cxxflags => add("-m32"), - cppflags => add("-DL_ENDIAN"), + lib_cppflags => add("-DL_ENDIAN"), bn_ops => "BN_LLONG", perlasm_scheme => "elf", }, @@ -807,13 +788,12 @@ my %targets = ( inherit_from => [ "linux-x86" ], CC => "clang", CXX => "clang++", - CFLAGS => add("-Wextra"), }, "linux-x86_64" => { inherit_from => [ "linux-generic64", asm("x86_64_asm") ], cflags => add("-m64"), cxxflags => add("-m64"), - cppflags => add("-DL_ENDIAN"), + lib_cppflags => add("-DL_ENDIAN"), bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "elf", multilib => "64", @@ -822,13 +802,12 @@ my %targets = ( inherit_from => [ "linux-x86_64" ], CC => "clang", CXX => "clang++", - CFLAGS => add("-Wextra"), }, "linux-x32" => { inherit_from => [ "linux-generic32", asm("x86_64_asm") ], cflags => add("-mx32"), cxxflags => add("-mx32"), - cppflags => add("-DL_ENDIAN"), + lib_cppflags => add("-DL_ENDIAN"), bn_ops => "SIXTY_FOUR_BIT", perlasm_scheme => "elf32", multilib => "x32", @@ -843,7 +822,7 @@ my %targets = ( inherit_from => [ "linux-generic64", asm("s390x_asm") ], cflags => add("-m64"), cxxflags => add("-m64"), - cppflags => add("-DB_ENDIAN"), + lib_cppflags => add("-DB_ENDIAN"), perlasm_scheme => "64", multilib => "64", }, @@ -867,7 +846,7 @@ my %targets = ( inherit_from => [ "linux-generic32", asm("s390x_asm") ], cflags => add("-m31 -Wa,-mzarch"), cxxflags => add("-m31 -Wa,-mzarch"), - cppflags => add("-DB_ENDIAN"), + lib_cppflags => add("-DB_ENDIAN"), bn_asm_src => sub { my $r=join(" ",@_); $r=~s|asm/s390x\.S|bn_asm.c|; $r; }, perlasm_scheme => "31", multilib => "/highgprs", @@ -931,99 +910,6 @@ my %targets = ( ranlib => "true", }, -#### Android: linux-* but without pointers to headers and libs. - # - # It takes pair of prior-set environment variables to make it work: - # - # CROSS_SYSROOT=/some/where/android-ndk-/platforms/android-/arch- - # CROSS_COMPILE= - # - # As well as PATH adjusted to cover ${CROSS_COMPILE}gcc and company. - # For example to compile for ICS and ARM with NDK 10d, you'd: - # - # ANDROID_NDK=/some/where/android-ndk-10d - # CROSS_SYSROOT=$ANDROID_NDK/platforms/android-14/arch-arm - # CROSS_COMPILE=arm-linux-androideabi- - # PATH=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.8/prebuild/linux-x86_64/bin - # - "android" => { - inherit_from => [ "linux-generic32" ], - # Special note about unconditional -fPIC and -pie. The underlying - # reason is that Lollipop refuses to run non-PIE. But what about - # older systems and NDKs? -fPIC was never problem, so the only - # concern is -pie. Older toolchains, e.g. r4, appear to handle it - # and binaries turn mostly functional. "Mostly" means that oldest - # Androids, such as Froyo, fail to handle executable, but newer - # systems are perfectly capable of executing binaries targeting - # Froyo. Keep in mind that in the nutshell Android builds are - # about JNI, i.e. shared libraries, not applications. - cflags => add("-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack"), - cxxflags => add("-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack"), - bin_cflags => "-pie", - }, - "android-x86" => { - inherit_from => [ "android", asm("x86_asm") ], - CFLAGS => add(picker(release => "-fomit-frame-pointer")), - bn_ops => "BN_LLONG", - perlasm_scheme => "android", - }, - ################################################################ - # Contemporary Android applications can provide multiple JNI - # providers in .apk, targeting multiple architectures. Among - # them there is "place" for two ARM flavours: generic eabi and - # armv7-a/hard-float. However, it should be noted that OpenSSL's - # ability to engage NEON is not constrained by ABI choice, nor - # is your ability to call OpenSSL from your application code - # compiled with floating-point ABI other than default 'soft'. - # [Latter thanks to __attribute__((pcs("aapcs"))) declaration.] - # This means that choice of ARM libraries you provide in .apk - # is driven by application needs. For example if application - # itself benefits from NEON or is floating-point intensive, then - # it might be appropriate to provide both libraries. Otherwise - # just generic eabi would do. But in latter case it would be - # appropriate to - # - # ./Configure android-armeabi -D__ARM_MAX_ARCH__=8 - # - # in order to build "universal" binary and allow OpenSSL take - # advantage of NEON when it's available. - # - "android-armeabi" => { - inherit_from => [ "android", asm("armv4_asm") ], - }, - "android-mips" => { - inherit_from => [ "android", asm("mips32_asm") ], - perlasm_scheme => "o32", - }, - - "android64" => { - inherit_from => [ "linux-generic64" ], - cflags => add("-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack"), - cxxflags => add("-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack"), - bin_cflags => "-pie", - }, - "android64-aarch64" => { - inherit_from => [ "android64", asm("aarch64_asm") ], - perlasm_scheme => "linux64", - }, - "android64-x86_64" => { - inherit_from => [ "android64", asm("x86_64_asm") ], - perlasm_scheme => "elf", - }, - "android64-mips64" => { - ############################################################ - # You are more than likely have to specify target processor - # on ./Configure command line. Trouble is that toolchain's - # default is MIPS64r6 (at least in r10d), but there are no - # such processors around (or they are too rare to spot one). - # Actual problem is that MIPS64r6 is binary incompatible - # with previous MIPS ISA versions, in sense that unlike - # prior versions original MIPS binary code will fail. - # - inherit_from => [ "android64", asm("mips64_asm") ], - perlasm_scheme => "64", - }, - #### *BSD "BSD-generic32" => { # As for thread cflag. Idea is to maintain "collective" set of @@ -1057,7 +943,7 @@ my %targets = ( "BSD-x86" => { inherit_from => [ "BSD-generic32", asm("x86_asm") ], CFLAGS => add(picker(release => "-fomit-frame-pointer")), - cppflags => add("-DL_ENDIAN"), + lib_cppflags => add("-DL_ENDIAN"), bn_ops => "BN_LLONG", shared_target => "bsd-shared", perlasm_scheme => "a.out", @@ -1070,26 +956,26 @@ my %targets = ( "BSD-sparcv8" => { inherit_from => [ "BSD-generic32", asm("sparcv8_asm") ], cflags => add("-mcpu=v8"), - cppflags => add("-DB_ENDIAN"), + lib_cppflags => add("-DB_ENDIAN"), }, "BSD-sparc64" => { # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it # simply *happens* to work around a compiler bug in gcc 3.3.3, # triggered by RIPEMD160 code. inherit_from => [ "BSD-generic64", asm("sparcv9_asm") ], - cppflags => add("-DB_ENDIAN -DMD32_REG_T=int"), + lib_cppflags => add("-DB_ENDIAN -DMD32_REG_T=int"), bn_ops => "BN_LLONG", }, "BSD-ia64" => { inherit_from => [ "BSD-generic64", asm("ia64_asm") ], - cppflags => add("-DL_ENDIAN"), + lib_cppflags => add("-DL_ENDIAN"), bn_ops => "SIXTY_FOUR_BIT_LONG", }, "BSD-x86_64" => { inherit_from => [ "BSD-generic64", asm("x86_64_asm") ], - cppflags => add("-DL_ENDIAN"), + lib_cppflags => add("-DL_ENDIAN"), bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "elf", }, @@ -1098,7 +984,7 @@ my %targets = ( inherit_from => [ "BASE_unix", asm("x86_elf_asm") ], CC => "gcc", CFLAGS => "-fomit-frame-pointer -O3 -Wall", - cppflags => "-DPERL5 -DL_ENDIAN", + lib_cppflags => "-DPERL5 -DL_ENDIAN", ex_libs => add("-ldl"), bn_ops => "BN_LLONG", thread_scheme => "(unknown)", @@ -1125,35 +1011,6 @@ my %targets = ( thread_scheme => "(unknown)", }, -# QNX - "qnx4" => { - inherit_from => [ "BASE_unix" ], - CC => "cc", - CFLAGS => "", - cppflags => "-DL_ENDIAN -DTERMIO", - thread_scheme => "(unknown)", - }, - "QNX6" => { - inherit_from => [ "BASE_unix" ], - CC => "gcc", - ex_libs => add("-lsocket"), - dso_scheme => "dlfcn", - shared_target => "bsd-gcc-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", - }, - "QNX6-i386" => { - inherit_from => [ "BASE_unix", asm("x86_elf_asm") ], - CC => "gcc", - CFLAGS => "-O2 -Wall", - cppflags => "-DL_ENDIAN", - ex_libs => add("-lsocket"), - dso_scheme => "dlfcn", - shared_target => "bsd-gcc-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", - }, - #### SCO/Caldera targets. # # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. @@ -1169,7 +1026,7 @@ my %targets = ( inherit_from => [ "BASE_unix" ], CC => "cc", cflags => threads("-Kthread"), - cppflags => "-DFILIO_H -DNO_STRINGS_H", + lib_cppflags => "-DFILIO_H -DNO_STRINGS_H", ex_libs => add("-lsocket -lnsl -lresolv -lx"), thread_scheme => "uithreads", }, @@ -1178,7 +1035,7 @@ my %targets = ( CC => "cc", CFLAGS => "-O", cflags => threads("-Kthread"), - cppflags => "-DFILIO_H", + lib_cppflags => "-DFILIO_H", ex_libs => add("-lsocket -lnsl -lresolv -lx"), thread_scheme => "uithreads", }, @@ -1187,7 +1044,7 @@ my %targets = ( CC => "cc", CFLAGS => "-O", cflags => combine("-Kalloca", threads("-Kthread")), - cppflags => "-DFILIO_H", + lib_cppflags => "-DFILIO_H", ex_libs => add("-lsocket -lnsl"), thread_scheme => "uithreads", bn_ops => "BN_LLONG", @@ -1201,8 +1058,8 @@ my %targets = ( inherit_from => [ "BASE_unix", asm("x86_elf_asm") ], CC => "gcc", CFLAGS => "-O3 -fomit-frame-pointer -Wall", - cppflags => add("-DL_ENDIAN -DFILIO_H", - threads("-D_REENTRANT")), + cppflags => add(threads("-D_REENTRANT")), + lib_cppflags => add("-DL_ENDIAN -DFILIO_H"), ex_libs => add("-lsocket -lnsl"), bn_ops => "BN_LLONG", thread_scheme => "pthreads", @@ -1245,79 +1102,81 @@ my %targets = ( # variable, then you should know that in OpenSSL case it's considered # only in ./config. Once configured, build procedure remains "deaf" to # current value of $OBJECT_MODE. + "aix-common" => { + inherit_from => [ "BASE_unix" ], + template => 1, + sys_id => "AIX", + lib_cppflags => "-DB_ENDIAN", + lflags => "-Wl,-bsvr4", + thread_scheme => "pthreads", + dso_scheme => "dlfcn", + shared_target => "self", + module_ldflags => "-Wl,-G,-bsymbolic,-bexpall", + shared_ldflag => "-Wl,-G,-bsymbolic", + shared_defflag => "-Wl,-bE:", + shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", + dso_extension => ".so", + lib_extension => shared("_a.a"), + shared_extension_simple => shared(".a"), + }, "aix-gcc" => { - inherit_from => [ "BASE_unix", asm("ppc32_asm") ], + inherit_from => [ "aix-common", asm("ppc32_asm") ], CC => "gcc", CFLAGS => picker(debug => "-O0 -g", release => "-O"), cflags => add(threads("-pthread")), - cppflags => "-DB_ENDIAN", - ex_libs => add(threads("-pthread")), - sys_id => "AIX", + ex_libs => threads("-pthread"), bn_ops => "BN_LLONG RC4_CHAR", - thread_scheme => "pthreads", perlasm_scheme => "aix32", - dso_scheme => "dlfcn", - shared_target => "aix-shared", - shared_ldflag => "-shared -static-libgcc -Wl,-G", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", - arflags => "-X32 r", + shared_ldflag => add_before("-shared -static-libgcc"), + AR => add("-X32"), + RANLIB => add("-X32"), }, "aix64-gcc" => { - inherit_from => [ "BASE_unix", asm("ppc64_asm") ], + inherit_from => [ "aix-common", asm("ppc64_asm") ], CC => "gcc", CFLAGS => picker(debug => "-O0 -g", release => "-O"), cflags => combine("-maix64", threads("-pthread")), - cppflags => "-DB_ENDIAN", - ex_libs => add(threads("-pthread")), - sys_id => "AIX", + ex_libs => threads("-pthread"), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", - thread_scheme => "pthreads", perlasm_scheme => "aix64", - dso_scheme => "dlfcn", - shared_target => "aix-shared", - shared_ldflag => "-shared -static-libgcc -Wl,-G", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", - arflags => "-X64 r", + shared_ldflag => add_before("-shared -static-libgcc"), + shared_extension => "64.so.\$(SHLIB_VERSION_NUMBER)", + AR => add("-X64"), + RANLIB => add("-X64"), }, "aix-cc" => { - inherit_from => [ "BASE_unix", asm("ppc32_asm") ], + inherit_from => [ "aix-common", asm("ppc32_asm") ], CC => "cc", CFLAGS => picker(debug => "-O0 -g", release => "-O"), cflags => combine("-q32 -qmaxmem=16384 -qro -qroconst", threads("-qthreaded")), - cppflags => combine("-DB_ENDIAN", threads("-D_THREAD_SAFE")), - sys_id => "AIX", - bn_ops => "BN_LLONG RC4_CHAR", - thread_scheme => "pthreads", + cppflags => threads("-D_THREAD_SAFE"), ex_libs => threads("-lpthreads"), + bn_ops => "BN_LLONG RC4_CHAR", perlasm_scheme => "aix32", - dso_scheme => "dlfcn", - shared_target => "aix-shared", - shared_ldflag => "-G", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", - arflags => "-X32 r", + shared_cflag => "-qpic", + AR => add("-X32"), + RANLIB => add("-X32"), }, "aix64-cc" => { - inherit_from => [ "BASE_unix", asm("ppc64_asm") ], + inherit_from => [ "aix-common", asm("ppc64_asm") ], CC => "cc", CFLAGS => picker(debug => "-O0 -g", release => "-O"), cflags => combine("-q64 -qmaxmem=16384 -qro -qroconst", threads("-qthreaded")), - cppflags => combine("-DB_ENDIAN", threads("-D_THREAD_SAFE")), - sys_id => "AIX", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", - thread_scheme => "pthreads", + cppflags => threads("-D_THREAD_SAFE"), ex_libs => threads("-lpthreads"), + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", perlasm_scheme => "aix64", dso_scheme => "dlfcn", - shared_target => "aix-shared", - shared_ldflag => "-G", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", - arflags => "-X64 r", + shared_cflag => "-qpic", + shared_extension => "64.so.\$(SHLIB_VERSION_NUMBER)", + AR => add("-X64"), + RANLIB => add("-X64"), }, # SIEMENS BS2000/OSD: an EBCDIC-based mainframe @@ -1326,7 +1185,8 @@ my %targets = ( CC => "c89", CFLAGS => "-O", cflags => "-XLLML -XLLMK -XL", - cppflags => "-DB_ENDIAN -DCHARSET_EBCDIC", + cppflags => "-DCHARSET_EBCDIC", + lib_cppflags => "-DB_ENDIAN", ex_libs => add("-lsocket -lnsl"), bn_ops => "THIRTY_TWO_BIT RC4_CHAR", thread_scheme => "(unknown)", @@ -1334,52 +1194,55 @@ my %targets = ( #### Visual C targets # -# Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64 +# Win64 targets, WIN64I denotes IA-64/Itanium and WIN64A - AMD64 # -# Note about -wd4090, disable warning C4090. This warning returns false +# Note about /wd4090, disable warning C4090. This warning returns false # positives in some situations. Disabling it altogether masks both # legitimate and false cases, but as we compile on multiple platforms, # we rely on other compilers to catch legitimate cases. # # Also note that we force threads no matter what. Configuring "no-threads" # is ignored. +# +# UNICODE is defined in VC-common and applies to all targets. It used to +# be an opt-in option for VC-WIN32, but not anymore. The original reason +# was because ANSI API was *native* system interface for no longer +# supported Windows 9x. Keep in mind that UNICODE only affects how +# OpenSSL libraries interact with underlying OS, it doesn't affect API +# that OpenSSL presents to application. + "VC-common" => { inherit_from => [ "BASE_Windows" ], template => 1, CC => "cl", CPP => '$(CC) /EP /C', - CFLAGS => "-W3 -wd4090 -nologo", + CFLAGS => "/W3 /wd4090 /nologo", LDFLAGS => add("/debug"), coutflag => "/Fo", - cflags => '-Gs0 -GF -Gy', defines => add("OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN", - "L_ENDIAN", "_CRT_SECURE_NO_DEPRECATE", - "_WINSOCK_DEPRECATED_NO_WARNINGS", - sub { my @defs = (); - unless ($disabled{"zlib-dynamic"}) { - my $zlib = - $withargs{zlib_lib} // "ZLIB1"; - push @defs, - quotify("perl", - 'LIBZ="' . $zlib . '"'); - } - return [ @defs ]; - }), - lib_cflags => add("/Zi /Fdossl_static"), - dso_cflags => "/Zi /Fddso", - bin_cflags => "/Zi /Fdapp", + "UNICODE", "_UNICODE", + "_CRT_SECURE_NO_DEPRECATE", + "_WINSOCK_DEPRECATED_NO_WARNINGS"), + lib_cflags => add("/Zi /Fdossl_static.pdb"), + lib_defines => add("L_ENDIAN"), + dso_cflags => "/Zi /Fddso.pdb", + bin_cflags => "/Zi /Fdapp.pdb", 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", + # additional parameter to build_scheme denotes install-path "flavour" + build_scheme => add("VC-common", { separator => undef }), }, "VC-noCE-common" => { inherit_from => [ "VC-common" ], template => 1, CFLAGS => add(picker(debug => '/Od', release => '/O2')), - cflags => add(picker(debug => + cflags => add(picker(default => '/Gs0 /GF /Gy', + debug => sub { ($disabled{shared} ? "" : "/MDd"); }, @@ -1387,7 +1250,7 @@ my %targets = ( sub { ($disabled{shared} ? "" : "/MD"); })), - defines => add(picker(default => [ "UNICODE", "_UNICODE" ], + defines => add(picker(default => [], # works as type cast debug => [ "DEBUG", "_DEBUG" ])), lib_cflags => add(sub { $disabled{shared} ? "/MT /Zl" : () }), # Following might/should appears controversial, i.e. defining @@ -1420,15 +1283,14 @@ my %targets = ( push @ex_libs, 'bufferoverflowu.lib' if (`cl 2>&1` =~ /14\.00\.4[0-9]{4}\./); return join(" ", @_, @ex_libs); }), - bn_ops => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN", - build_scheme => add("VC-W64", { separator => undef }), + bn_ops => add("SIXTY_FOUR_BIT"), }, "VC-WIN64I" => { inherit_from => [ "VC-WIN64-common", asm("ia64_asm"), sub { $disabled{shared} ? () : "ia64_uplink" } ], AS => "ias", ASFLAGS => "-d debug", - asoutflag => "-o", + asoutflag => "-o ", sys_id => "WIN64I", bn_asm_src => sub { return undef unless @_; my $r=join(" ",@_); $r=~s|bn-ia64.s|bn_asm.c|; $r; }, @@ -1449,38 +1311,24 @@ my %targets = ( multilib => "-x64", }, "VC-WIN32" => { - # x86 Win32 target defaults to ANSI API, if you want UNICODE, - # configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE' inherit_from => [ "VC-noCE-common", asm("x86_asm"), sub { $disabled{shared} ? () : "uplink_common" } ], - CFLAGS => add("-WX"), + CFLAGS => add("/WX"), AS => sub { vc_win32_info()->{AS} }, ASFLAGS => sub { vc_win32_info()->{ASFLAGS} }, asoutflag => sub { vc_win32_info()->{asoutflag} }, asflags => sub { vc_win32_info()->{asflags} }, - ex_libs => add(sub { - my @ex_libs = (); - # WIN32 UNICODE build gets linked with unicows.lib for - # backward compatibility with Win9x. - push @ex_libs, 'unicows.lib' - if (grep { $_ eq "UNICODE" } @{$user{CPPDEFINES}}); - return join(" ", @ex_libs, @_); - }), sys_id => "WIN32", - bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", + bn_ops => add("BN_LLONG"), perlasm_scheme => sub { vc_win32_info()->{perlasm_scheme} }, - build_scheme => add("VC-W32", { separator => undef }), + # "WOW" stands for "Windows on Windows", and "VC-WOW" engages + # some installation path heuristics in windows-makefile.tmpl... + build_scheme => add("VC-WOW", { separator => undef }), }, "VC-CE" => { inherit_from => [ "VC-common" ], - AS => "ml", - ASFLAGS => "/nologo", - asoutflag => "/Fo", - asflags => "/Cp /coff /c /Cx /Zi", - CC => "cl", - CFLAGS => picker(default => '/W3 /WX /nologo', - debug => "/Od", - release => "/O1i"), + CFLAGS => add(picker(debug => "/Od", + release => "/O1i")), CPPDEFINES => picker(debug => [ "DEBUG", "_DEBUG" ]), LDFLAGS => add("/nologo /opt:ref"), cflags => @@ -1490,9 +1338,8 @@ my %targets = ( ? ($disabled{shared} ? " /MT" : " /MD") : " /MC"; }), cppflags => sub { vc_wince_info()->{cppflags}; }, - defines => [ "UNICODE", "_UNICODE", "L_ENDIAN", "DSO_WIN32", - "NO_CHMOD", "OPENSSL_SMALL_FOOTPRINT", - "WIN32_LEAN_AND_MEAN" ], + lib_defines => add("NO_CHMOD", "OPENSSL_SMALL_FOOTPRINT"), + lib_cppflags => sub { vc_wince_info()->{cppflags}; }, includes => add(combine(sub { defined(env('WCECOMPAT')) ? '$(WCECOMPAT)/include' : (); }, @@ -1503,7 +1350,7 @@ my %targets = ( sub { defined(env('PORTSDK_LIBPATH')) ? "/entry:mainCRTstartup" : (); })), sys_id => "WINCE", - bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", + bn_ops => add("BN_LLONG"), ex_libs => add(sub { my @ex_libs = (); push @ex_libs, 'ws2.lib' unless $disabled{sock}; @@ -1523,7 +1370,6 @@ my %targets = ( if (env('TARGETCPU') eq "X86"); return @ex_libs; }), - build_scheme => add("VC-WCE", { separator => undef }), }, #### MinGW @@ -1535,9 +1381,9 @@ my %targets = ( debug => "-g -O0", release => "-O3 -fomit-frame-pointer"), cflags => "-m32", - cppflags => combine("-DL_ENDIAN -DUNICODE -D_UNICODE", - "-DWIN32_LEAN_AND_MEAN", + 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", @@ -1567,9 +1413,9 @@ my %targets = ( debug => "-g -O0", release => "-O3"), cflags => "-m64", - cppflags => combine("-DL_ENDIAN -DUNICODE -D_UNICODE", - "-DWIN32_LEAN_AND_MEAN", + 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", @@ -1590,7 +1436,7 @@ my %targets = ( inherit_from => [ "BASE_unix" ], CC => "cc", CFLAGS => "-O", - cppflags => "-DL_ENDIAN", + lib_cppflags => "-DL_ENDIAN", sys_id => "UEFI", }, @@ -1612,7 +1458,7 @@ my %targets = ( CFLAGS => picker(default => "-Wall", debug => "-g -O0", release => "-O3 -fomit-frame-pointer"), - cppflags => "-DTERMIOS -DL_ENDIAN", + lib_cppflags => "-DTERMIOS -DL_ENDIAN", sys_id => "CYGWIN", bn_ops => "BN_LLONG", thread_scheme => "pthread", @@ -1628,7 +1474,7 @@ my %targets = ( CFLAGS => picker(default => "-Wall", debug => "-g -O0", release => "-O3"), - cppflags => "-DTERMIOS -DL_ENDIAN", + lib_cppflags => "-DTERMIOS -DL_ENDIAN", sys_id => "CYGWIN", bn_ops => "SIXTY_FOUR_BIT_LONG", thread_scheme => "pthread", @@ -1681,14 +1527,14 @@ my %targets = ( "darwin-ppc-cc" => { inherit_from => [ "darwin-common", asm("ppc32_asm") ], cflags => add("-arch ppc -std=gnu9x -Wa,-force_cpusubtype_ALL"), - cppflags => add("-DB_ENDIAN"), + lib_cppflags => add("-DB_ENDIAN"), shared_cflag => add("-fno-common"), perlasm_scheme => "osx32", }, "darwin64-ppc-cc" => { inherit_from => [ "darwin-common", asm("ppc64_asm") ], cflags => add("-arch ppc64 -std=gnu9x"), - cppflags => add("-DB_ENDIAN"), + lib_cppflags => add("-DB_ENDIAN"), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", perlasm_scheme => "osx64", }, @@ -1696,7 +1542,7 @@ my %targets = ( inherit_from => [ "darwin-common", asm("x86_asm") ], CFLAGS => add(picker(release => "-fomit-frame-pointer")), cflags => add("-arch i386"), - cppflags => add("-DL_ENDIAN"), + lib_cppflags => add("-DL_ENDIAN"), bn_ops => "BN_LLONG RC4_INT", perlasm_scheme => "macosx", }, @@ -1704,48 +1550,11 @@ my %targets = ( inherit_from => [ "darwin-common", asm("x86_64_asm") ], CFLAGS => add("-Wall"), cflags => add("-arch x86_64"), - cppflags => add("-DL_ENDIAN"), + lib_cppflags => add("-DL_ENDIAN"), bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "macosx", }, -#### iPhoneOS/iOS -# -# It takes three prior-set environment variables to make it work: -# -# CROSS_COMPILE=/where/toolchain/is/usr/bin/ [note ending slash] -# CROSS_TOP=/where/SDKs/are -# CROSS_SDK=iPhoneOSx.y.sdk -# -# Exact paths vary with Xcode releases, but for couple of last ones -# they would look like this: -# -# CROSS_COMPILE=`xcode-select --print-path`/Toolchains/XcodeDefault.xctoolchain/usr/bin/ -# CROSS_TOP=`xcode-select --print-path`/Platforms/iPhoneOS.platform/Developer -# CROSS_SDK=iPhoneOS.sdk -# - "iphoneos-cross" => { - inherit_from => [ "darwin-common" ], - cflags => add("-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"), - sys_id => "iOS", - }, - "ios-cross" => { - inherit_from => [ "darwin-common", asm("armv4_asm") ], - # It should be possible to go below iOS 6 and even add -arch armv6, - # thus targeting iPhone pre-3GS, but it's assumed to be irrelevant - # at this point. - cflags => add("-arch armv7 -mios-version-min=6.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"), - sys_id => "iOS", - perlasm_scheme => "ios32", - }, - "ios64-cross" => { - inherit_from => [ "darwin-common", asm("aarch64_asm") ], - cflags => add("-arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"), - sys_id => "iOS", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", - perlasm_scheme => "ios64", - }, - ##### GNU Hurd "hurd-x86" => { inherit_from => [ "BASE_unix" ], @@ -1753,7 +1562,7 @@ my %targets = ( CC => "gcc", CFLAGS => "-O3 -fomit-frame-pointer -Wall", cflags => threads("-pthread"), - cppflags => "-DL_ENDIAN", + lib_cppflags => "-DL_ENDIAN", ex_libs => add("-ldl", threads("-pthread")), bn_ops => "BN_LLONG", thread_scheme => "pthreads", @@ -1911,7 +1720,7 @@ my %targets = ( @{vms_info()->{disable_warns}}; @warnings ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); }), - defines => + lib_defines => add("OPENSSL_USE_NODELETE", sub { return vms_info()->{def_zlib} @@ -1935,6 +1744,8 @@ my %targets = ( asflags => sub { vms_info()->{asflags} }, perlasm_scheme => sub { vms_info()->{perlasm_scheme} }, + disable => add('pinshared'), + apps_aux_src => "vms_term_sock.c", apps_init_src => "vms_decc_init.c", }, @@ -1970,7 +1781,7 @@ my %targets = ( }, "vms-ia64" => { inherit_from => [ "vms-generic", - sub { vms_info()->{as} + sub { vms_info()->{AS} ? asm("ia64_asm")->() : () } ], bn_ops => "SIXTY_FOUR_BIT RC4_INT", pointer_size => "",