Tru64 fixes.
[openssl.git] / Configurations / 10-main.conf
index 5bf8a0df709baf2a5a61e79e604551fde72b1013..4c58f05751207b506904c509a8693d2d22e8c5c1 100644 (file)
@@ -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) {
@@ -571,23 +595,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",
@@ -595,8 +614,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",
@@ -872,17 +892,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") ],
@@ -921,11 +938,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") ],
@@ -1298,20 +1312,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 }),
     },
@@ -1344,22 +1358,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" => {
@@ -1387,7 +1399,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';
@@ -1405,7 +1417,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 }),
     },
 
@@ -1741,18 +1753,50 @@ sub vms_info {
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         ranlib           => "$ENV{'RANLIB'}",
     },
+    "haiku-common" => {
+        template         => 1,
+        cc               => "cc",
+        cflags           => add_before(picker(default => "-DL_ENDIAN -Wall",
+                                              debug   => "-g -O0",
+                                              release => "-O2"),
+                                       threads("-D_REENTRANT")),
+        sys_id           => "HAIKU",
+        lflags           => "-lnetwork",
+        perlasm_scheme   => "elf",
+        thread_scheme    => "pthreads",
+        dso_scheme       => "dlfcn",
+        shared_target    => "haiku-shared",
+        shared_cflag     => "-fPIC",
+        shared_ldflag    => "-shared",
+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+    },
+    "haiku-x86" => {
+        inherit_from     => [ "haiku-common", asm("x86_elf_asm") ],
+        cflags           => add(picker(default => "",
+                                       release => "-fomit-frame-pointer")),
+        bn_ops           => "BN_LLONG",
+    },
+    # Haiku builds with no-asm
+    "haiku-x86_64" => {
+        inherit_from     => [ "haiku-common", asm("x86_64_asm") ],
+        cflags           => add("-m64"),
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
+    },
+
 
     ##### VMS
     "vms-generic" => {
         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",