Simplify some code

[openssl.git] / Configurations / 10-main.conf

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index f66e35bd5211765f6ebc2aa89b20f5ff0bf751a8..3ee071765db828b76b3625a8ba6b61f60757e331 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -146,6 +146,16 @@ sub vms_info {
                 $vms_info->{def_zlib} =~ s|/.*$||g;
             }
         }
+
+        if ($config{target} =~ /-ia64/) {
+            `PIPE ias -H 2> NL:`;
+            if ($? == 0) {
+                $vms_info->{as} = "ias";
+                $vms_info->{asflags} = '-d debug "-N" vms_upcase';
+                $vms_info->{asoutflag} = "-o";
+                $vms_info->{perlasm_scheme} = "ias";
+            }
+        }
     }
     return $vms_info;
 }
@@ -1222,7 +1232,7 @@ my %targets = (
         shared_target    => "aix-shared",
         shared_ldflag    => "-shared -static-libgcc -Wl,-G",
         shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
-        arflags          => "-X32",
+        arflags          => "-X32 r",
     },
     "aix64-gcc" => {
         inherit_from     => [ "BASE_unix", asm("ppc64_asm") ],
@@ -1241,7 +1251,7 @@ my %targets = (
         shared_target    => "aix-shared",
         shared_ldflag    => "-shared -static-libgcc -Wl,-G",
         shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
-        arflags          => "-X64",
+        arflags          => "-X64 r",
     },
     "aix-cc" => {
         inherit_from     => [ "BASE_unix", asm("ppc32_asm") ],
@@ -1260,7 +1270,7 @@ my %targets = (
         shared_target    => "aix-shared",
         shared_ldflag    => "-G",
         shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
-        arflags          => "-X 32",
+        arflags          => "-X32 r",
     },
     "aix64-cc" => {
         inherit_from     => [ "BASE_unix", asm("ppc64_asm") ],
@@ -1279,7 +1289,7 @@ my %targets = (
         shared_target    => "aix-shared",
         shared_ldflag    => "-G",
         shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
-        arflags          => "-X 64",
+        arflags          => "-X64 r",
     },
 
 # SIEMENS BS2000/OSD: an EBCDIC-based mainframe
@@ -1876,6 +1886,11 @@ my %targets = (
         dso_scheme       => "vms",
         thread_scheme    => "pthreads",
 
+        as               => sub { vms_info()->{as} },
+        asflags          => sub { vms_info()->{asflags} },
+        asoutflag        => sub { vms_info()->{asoutflag} },
+        perlasm_scheme   => sub { vms_info()->{perlasm_scheme} },
+
         apps_aux_src     => "vms_term_sock.c",
         apps_init_src    => "vms_decc_init.c",
     },
@@ -1910,9 +1925,13 @@ my %targets = (
         pointer_size     => "64",
     },
     "vms-ia64" => {
-        inherit_from     => [ "vms-generic" ],
+        inherit_from     => [ "vms-generic",
+                              sub { vms_info()->{as}
+                                        ? asm("ia64_asm")->() : () } ],
         bn_ops           => "SIXTY_FOUR_BIT RC4_INT",
         pointer_size     => "",
+
+        modes_asm_src    => "", # Because ghash-ia64.s doesn't work on VMS
     },
     "vms-ia64-p32" => {
         inherit_from     => [ "vms-ia64" ],