X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Configurations%2F10-main.conf;h=e28fb12b594c0a46befeee81ebc0f061f18efa39;hp=52953a723077362265fba9d21a71c70c04399f9c;hb=27c40a93175d4dcb559325db9354910b3d16cd4e;hpb=62890f47288687e4f0b7b2c1ce2da7c93ef21063 diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 52953a7230..e28fb12b59 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -9,15 +9,39 @@ sub vc_win64a_info { $vc_win64a_info = { as => "nasm", asflags => "-f win64 -DNEAR -Ox -g", asoutflag => "-o" }; - } else { + } elsif ($disabled{asm}) { $vc_win64a_info = { as => "ml64", asflags => "/c /Cp /Cx /Zi", asoutflag => "/Fo" }; + } else { + die "NASM not found - please read INSTALL and NOTES.WIN for further details\n"; } } return $vc_win64a_info; } +my $vc_win32_info = {}; +sub vc_win32_info { + unless (%$vc_win32_info) { + my $ver=`nasm -v 2>NUL`; + my $vew=`nasmw -v 2>NUL`; + if ($ver ne "" || $vew ne "") { + $vc_win32_info = { as => $ver ge $vew ? "nasm" : "nasmw", + asflags => "-f win32", + asoutflag => "-o", + perlasm_scheme => "win32n" }; + } elsif ($disabled{asm}) { + $vc_win32_info = { as => "ml", + asflags => "/nologo /Cp /coff /c /Cx /Zi", + asoutflag => "/Fo", + perlasm_scheme => "win32" }; + } else { + die "NASM not found - please read INSTALL and NOTES.WIN for further details\n"; + } + } + return $vc_win32_info; +} + my $vc_wince_info = {}; sub vc_wince_info { unless (%$vc_wince_info) { @@ -78,23 +102,26 @@ sub vc_wince_info { my $vms_info = {}; sub vms_info { unless (%$vms_info) { - $vms_info->{disable_warns} = [ ]; - $vms_info->{disable_warns_p32} = [ ]; - $vms_info->{disable_warns_p64} = [ ]; - `PIPE CC /NOCROSS_REFERENCE /NOLIST /NOOBJECT /WARNINGS = DISABLE = ( MAYLOSEDATA3, EMPTYFILE ) NL: 2> NL:`; - if ($? == 0) { - push @{$vms_info->{disable_warns_p64}}, "MAYLOSEDATA3"; - } + my $pointer_size = shift; + my $pointer_size_str = $pointer_size == 0 ? "" : "$pointer_size"; + + $vms_info->{disable_warns} = [ ]; + if ($pointer_size == 64) { + `PIPE CC /NOCROSS_REFERENCE /NOLIST /NOOBJECT /WARNINGS = DISABLE = ( MAYLOSEDATA3, EMPTYFILE ) NL: 2> NL:`; + if ($? == 0) { + push @{$vms_info->{disable_warns}}, "MAYLOSEDATA3"; + } + } unless ($disabled{zlib}) { + my $default_zlib = 'GNV$LIBZSHR' . $pointer_size_str; if (defined($disabled{"zlib-dynamic"})) { - $vms_info->{zlib} = $withargs{zlib_lib} || 'GNV$LIBZSHR/SHARE'; - $vms_info->{zlib_p32} = $withargs{zlib_lib} || 'GNV$LIBZSHR32/SHARE'; - $vms_info->{zlib_p64} = $withargs{zlib_lib} || 'GNV$LIBZSHR64/SHARE'; + $vms_info->{zlib} = $withargs{zlib_lib} || "$default_zlib/SHARE"; } else { - $vms_info->{def_zlib} = $withargs{zlib_lib} || 'GNV$LIBZSHR'; - $vms_info->{def_zlib_p32} = $withargs{zlib_lib} || 'GNV$LIBZSHR32'; - $vms_info->{def_zlib_p64} = $withargs{zlib_lib} || 'GNV$LIBZSHR64'; + $vms_info->{def_zlib} = $withargs{zlib_lib} || $default_zlib; + # In case the --with-zlib-lib value contains something like + # /SHARE or /LIB or so at the end, remove it. + $vms_info->{def_zlib} =~ s|/.*$||g; } } } @@ -276,44 +303,16 @@ sub vms_info { multilib => "/64", }, -#### IRIX 5.x configs -# -mips2 flag is added by ./config when appropriate. - "irix-gcc" => { - inherit_from => [ "BASE_unix", asm("mips32_asm") ], - cc => "gcc", - cflags => picker(default => "-DB_ENDIAN", - debug => "-g -O0", - release => "-O3"), - bn_ops => "BN_LLONG RC4_CHAR", - thread_scheme => "(unknown)", - perlasm_scheme => "o32", - dso_scheme => "dlfcn", - shared_target => "irix-shared", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "irix-cc" => { - inherit_from => [ "BASE_unix", asm("mips32_asm") ], - cc => "cc", - cflags => picker(default => "-use_readonly_const -DB_ENDIAN", - debug => "-g -O0", - release => "-O2"), - bn_ops => "BN_LLONG RC4_CHAR", - thread_scheme => "(unknown)", - perlasm_scheme => "o32", - dso_scheme => "dlfcn", - shared_target => "irix-shared", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, #### IRIX 6.x configs -# Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke -# './Configure irix-cc -o32' manually. +# Only N32 and N64 ABIs are supported. "irix-mips3-gcc" => { inherit_from => [ "BASE_unix", asm("mips64_asm") ], cc => "gcc", cflags => combine(picker(default => "-mabi=n32 -DB_ENDIAN -DBN_DIV3W", debug => "-g -O0", release => "-O3"), - threads("-D_SGI_MP_SOURCE -pthread")), + threads("-D_SGI_MP_SOURCE")), + ex_libs => add(threads("-lpthread")), bn_ops => "RC4_CHAR SIXTY_FOUR_BIT", thread_scheme => "pthreads", perlasm_scheme => "n32", @@ -348,6 +347,7 @@ sub vms_info { debug => "-g -O0", release => "-O3"), threads("-D_SGI_MP_SOURCE")), + ex_libs => add(threads("-lpthread")), bn_ops => "RC4_CHAR SIXTY_FOUR_BIT_LONG", thread_scheme => "pthreads", perlasm_scheme => "64", @@ -399,9 +399,9 @@ sub vms_info { # crypto/sha/sha_lcl.h. # - originally there were 32-bit hpux-parisc2-* targets. They were # 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. +# 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" => { inherit_from => [ "BASE_unix" ], @@ -568,23 +568,18 @@ sub vms_info { bn_ops => "BN_LLONG", }, -#### DEC Alpha OSF/1/Tru64 targets. - "osf1-alpha-gcc" => { +#### DEC Alpha Tru64 targets. Tru64 is marketing name for OSF/1 version 4 +#### and forward. In reality 'uname -s' still returns "OSF1". Originally +#### there were even osf1-* configs targeting prior versions provided, +#### but not anymore... + "tru64-alpha-gcc" => { inherit_from => [ "BASE_unix", asm("alpha_asm") ], cc => "gcc", - cflags => "-O3", - bn_ops => "SIXTY_FOUR_BIT_LONG", - thread_scheme => "(unknown)", - dso_scheme => "dlfcn", - shared_target => "alpha-osf1-shared", - shared_extension => ".so", - }, - "osf1-alpha-cc" => { - inherit_from => [ "BASE_unix", asm("alpha_asm") ], - cc => "cc", - cflags => "-std1 -tune host -O4 -readonly_strings", + cflags => combine("-std=c9x -D_XOPEN_SOURCE=500 -D_OSF_SOURCE -O3", + threads("-pthread")), + ex_libs => "-lrt", # for mlock(2) bn_ops => "SIXTY_FOUR_BIT_LONG", - thread_scheme => "(unknown)", + thread_scheme => "pthreads", dso_scheme => "dlfcn", shared_target => "alpha-osf1-shared", shared_extension => ".so", @@ -592,8 +587,9 @@ sub vms_info { "tru64-alpha-cc" => { inherit_from => [ "BASE_unix", asm("alpha_asm") ], cc => "cc", - cflags => combine("-std1 -tune host -fast -readonly_strings", + cflags => combine("-std1 -D_XOPEN_SOURCE=500 -D_OSF_SOURCE -tune host -fast -readonly_strings", threads("-pthread")), + ex_libs => "-lrt", # for mlock(2) bn_ops => "SIXTY_FOUR_BIT_LONG", thread_scheme => "pthreads", dso_scheme => "dlfcn", @@ -869,17 +865,14 @@ sub vms_info { # Special note about unconditional -fPIC and -pie. The underlying # reason is that Lollipop refuses to run non-PIE. But what about # older systems and NDKs? -fPIC was never problem, so the only - # concern if -pie. Older toolchains, e.g. r4, appear to handle it + # 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 => picker(default => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall", - debug => "-O0 -g", - release => "-O3"), - lflags => "-pie", - shared_cflag => "", + cflags => add(picker(default => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack")), + bin_cflags => "-pie", }, "android-x86" => { inherit_from => [ "android", asm("x86_asm") ], @@ -918,11 +911,8 @@ sub vms_info { "android64" => { inherit_from => [ "linux-generic64" ], - cflags => picker(default => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall", - debug => "-O0 -g", - release => "-O3"), - lflags => "-pie", - shared_cflag => "", + cflags => add(picker(default => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack")), + bin_cflags => "-pie", }, "android64-aarch64" => { inherit_from => [ "android64", asm("aarch64_asm") ], @@ -1246,11 +1236,19 @@ sub vms_info { 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", + defines => add(sub { my @defs = (); + unless ($disabled{"zlib-dynamic"}) { + push @defs, + quotify("perl", + 'LIBZ="' . $withargs{zlib_lib} . '"'); + } + return [ @defs ]; + }), coutflag => "/Fo", rc => "rc", rcoutflag => "/fo", - lib_cflags => add("/Zi /Fdlib"), - dso_cflags => "/Zi", + lib_cflags => add("/Zi /Fdossl_static"), + dso_cflags => "/Zi /Fddso", bin_cflags => "/Zi /Fdapp", lflags => add("/debug"), shared_ldflag => "/dll", @@ -1269,7 +1267,7 @@ sub vms_info { release => sub { ($disabled{shared} ? "" : "/MD") - ." /Ox /O2 /Ob2"; + ." /O2"; })), lib_cflags => add(sub { $disabled{shared} ? "/MT /Zl" : () }), # Following might/should appears controversial, i.e. defining @@ -1287,20 +1285,20 @@ sub vms_info { release => sub { $disabled{shared} ? "/MT" : () }, )), bin_lflags => add("/subsystem:console /opt:ref"), - ex_libs => sub { + ex_libs => add(sub { my @ex_libs = (); push @ex_libs, 'ws2_32.lib' unless $disabled{sock}; push @ex_libs, 'gdi32.lib advapi32.lib crypt32.lib user32.lib'; return join(" ", @ex_libs); - }, + }), }, "VC-WIN64-common" => { inherit_from => [ "VC-noCE-common" ], - ex_libs => sub { + ex_libs => add(sub { my @ex_libs = (); 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 }), }, @@ -1333,22 +1331,20 @@ sub vms_info { # configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE' inherit_from => [ "VC-noCE-common", asm("x86_asm"), sub { $disabled{shared} ? () : "uplink_common" } ], - as => sub { my $ver=`nasm -v 2>NUL`; - my $vew=`nasmw -v 2>NUL`; - return $ver ge $vew ? "nasm" : "nasmw" }, - asflags => "-f win32", - asoutflag => "-o", - ex_libs => sub { + as => sub { vc_win32_info()->{as} }, + asflags => sub { vc_win32_info()->{asflags} }, + asoutflag => sub { vc_win32_info()->{asoutflag} }, + 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_defines); return join(" ", @ex_libs, @_); - }, + }), sys_id => "WIN32", bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", - perlasm_scheme => "win32n", + perlasm_scheme => sub { vc_win32_info()->{perlasm_scheme} }, build_scheme => add("VC-W32", { separator => undef }), }, "VC-CE" => { @@ -1376,7 +1372,7 @@ sub vms_info { ? "/entry:mainCRTstartup" : (); }), sys_id => "WINCE", bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", - ex_libs => sub { + ex_libs => add(sub { my @ex_libs = (); push @ex_libs, 'ws2.lib' unless $disabled{sock}; push @ex_libs, 'crypt32.lib'; @@ -1394,7 +1390,7 @@ sub vms_info { push @ex_libs, ' /nodefaultlib coredll.lib corelibc.lib' if ($ENV{'TARGETCPU'} eq "X86"); return @ex_libs; - }, + }), build_scheme => add("VC-WCE", { separator => undef }), }, @@ -1518,17 +1514,6 @@ sub vms_info { inherit_from => [ "Cygwin-x86" ] }, -#### DJGPP - "DJGPP" => { - inherit_from => [ asm("x86_asm") ], - cc => "gcc", - cflags => "-I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall", - sys_id => "MSDOS", - ex_libs => add("-L/dev/env/WATT_ROOT/lib -lwatt"), - bn_ops => "BN_LLONG", - perlasm_scheme => "a.out", - }, - ##### MacOS X (a.k.a. Darwin) setup "darwin-common" => { inherit_from => [ "BASE_unix" ], @@ -1736,12 +1721,14 @@ sub vms_info { inherit_from => [ "BASE_VMS" ], template => 1, cc => "CC/DECC", - cflags => picker(default => "/STANDARD=RELAXED/NOLIST/PREFIX=ALL/NAMES=(AS_IS,SHORTENED)", + cflags => picker(default => "/STANDARD=RELAXED/NOLIST/PREFIX=ALL", debug => "/NOOPTIMIZE/DEBUG", release => "/OPTIMIZE/NODEBUG"), lflags => picker(default => "/MAP", debug => "/DEBUG/TRACEBACK", release => "/NODEBUG/NOTRACEBACK"), + lib_cflags => add("/NAMES=(AS_IS,SHORTENED)"), + dso_cflags => add("/NAMES=(AS_IS,SHORTENED)"), shared_target => "vms-shared", dso_scheme => "vms", thread_scheme => "pthreads", @@ -1749,115 +1736,103 @@ sub vms_info { apps_aux_src => "vms_decc_init.c", }, - # 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" ], cflags => add(sub { my @warnings = - @{vms_info()->{disable_warns}}; + @{vms_info(0)->{disable_warns}}; @warnings ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); }), defines => add(sub { - return vms_info()->{def_zlib} - ? "LIBZ=\"\"\"".vms_info()->{def_zlib}."\"\"\"" : (); + return vms_info(0)->{def_zlib} + ? "LIBZ=\"\"\"".vms_info(0)->{def_zlib}."\"\"\"" : (); }), - ex_libs => add(sub { return vms_info()->{zlib} || (); }), + ex_libs => add(sub { return vms_info(0)->{zlib} || (); }), #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" ], + inherit_from => [ "vms-generic" ], cflags => add("/POINTER_SIZE=32", sub { my @warnings = - @{vms_info()->{disable_warns_p32}}; + @{vms_info(32)->{disable_warns}}; @warnings ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); } ), defines => add(sub { - return vms_info()->{def_zlib_p32} - ? "LIBZ=\"\"\"".vms_info()->{def_zlib_p32}."\"\"\"" : (); + return vms_info(32)->{def_zlib} + ? "LIBZ=\"\"\"".vms_info(32)->{def_zlib}."\"\"\"" : (); }), - ex_libs => add(sub { return vms_info()->{zlib_p32} || (); }), + ex_libs => add(sub { return vms_info(32)->{zlib} || (); }), }, "vms-alpha-p64" => { - inherit_from => [ "vms-alpha" ], + inherit_from => [ "vms-generic" ], cflags => add("/POINTER_SIZE=64=ARGV", sub { my @warnings = - @{vms_info()->{disable_warns_p64}}; + @{vms_info(64)->{disable_warns}}; @warnings ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); } ), defines => add(sub { - return vms_info()->{def_zlib_p64} - ? "LIBZ=\"\"\"".vms_info()->{def_zlib_p64}."\"\"\"" : (); + return vms_info(64)->{def_zlib} + ? "LIBZ=\"\"\"".vms_info(64)->{def_zlib}."\"\"\"" : (); }), - ex_libs => add(sub { return vms_info()->{zlib_p64} || (); }), + ex_libs => add(sub { return vms_info(64)->{zlib} || (); }), }, "vms-ia64" => { inherit_from => [ "vms-generic" ], cflags => add(sub { my @warnings = - @{vms_info()->{disable_warns}}; + @{vms_info(0)->{disable_warns}}; @warnings ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); }), defines => add(sub { - return vms_info()->{def_zlib} - ? "LIBZ=\"\"\"".vms_info()->{def_zlib}."\"\"\"" : (); + return vms_info(0)->{def_zlib} + ? "LIBZ=\"\"\"".vms_info(0)->{def_zlib}."\"\"\"" : (); }), - ex_libs => add(sub { return vms_info()->{zlib} || (); }), + ex_libs => add(sub { return vms_info(0)->{zlib} || (); }), #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" ], + inherit_from => [ "vms-generic" ], cflags => add("/POINTER_SIZE=32", sub { my @warnings = - @{vms_info()->{disable_warns_p32}}; + @{vms_info(32)->{disable_warns}}; @warnings ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); } ), defines => add(sub { - return vms_info()->{def_zlib_p32} - ? "LIBZ=\"\"\"".vms_info()->{def_zlib_p32}."\"\"\"" : (); + return vms_info(32)->{def_zlib} + ? "LIBZ=\"\"\"".vms_info(32)->{def_zlib}."\"\"\"" : (); }), - ex_libs => add(sub { return vms_info()->{zlib_p32} || (); }), + ex_libs => add(sub { return vms_info(32)->{zlib} || (); }), }, "vms-ia64-p64" => { - inherit_from => [ "vms-ia64" ], + inherit_from => [ "vms-generic" ], cflags => add("/POINTER_SIZE=64=ARGV", sub { my @warnings = - @{vms_info()->{disable_warns_p64}}; + @{vms_info(64)->{disable_warns}}; @warnings ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); } ), defines => add(sub { - return vms_info()->{def_zlib_p64} - ? "LIBZ=\"\"\"".vms_info()->{def_zlib_p64}."\"\"\"" : (); + return vms_info(64)->{def_zlib} + ? "LIBZ=\"\"\"".vms_info(64)->{def_zlib}."\"\"\"" : (); }), - ex_libs => add(sub { return vms_info()->{zlib_p64} || (); }), + ex_libs => add(sub { return vms_info(64)->{zlib} || (); }), }, );