Configure: mark unixware target as elf-1.
authorAndy Polyakov <appro@openssl.org>
Thu, 27 Feb 2014 13:27:15 +0000 (14:27 +0100)
committerAndy Polyakov <appro@openssl.org>
Thu, 27 Feb 2014 13:27:15 +0000 (14:27 +0100)
Configure
TABLE

index a95e08195c7cb776d687c5d9eba84eb1dd597008..42e545b92e40354bf843310f0a330d32e471e122 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -468,11 +468,11 @@ my %table=(
 # UnixWare 2.0x fails destest with -O.
 "unixware-2.0","cc:-DFILIO_H -DNO_STRINGS_H::-Kthread::-lsocket -lnsl -lresolv -lx:${x86_gcc_des} ${x86_gcc_opts}:::",
 "unixware-2.1","cc:-O -DFILIO_H::-Kthread::-lsocket -lnsl -lresolv -lx:${x86_gcc_des} ${x86_gcc_opts}:::",
-"unixware-7","cc:-O -DFILIO_H -Kalloca::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_elf_asm}:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall::-D_REENTRANT::-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:gnu-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"unixware-7","cc:-O -DFILIO_H -Kalloca::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_elf_asm}-1:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall::-D_REENTRANT::-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}-1:dlfcn:gnu-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # SCO 5 - Ben Laurie <ben@algroup.co.uk> says the -O breaks the SCO cc.
-"sco5-cc",  "cc:-belf::(unknown)::-lsocket -lnsl:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:svr3-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"sco5-gcc",  "gcc:-O3 -fomit-frame-pointer::(unknown)::-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:svr3-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"sco5-cc",  "cc:-belf::(unknown)::-lsocket -lnsl:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}-1:dlfcn:svr3-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"sco5-gcc",  "gcc:-O3 -fomit-frame-pointer::(unknown)::-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}-1:dlfcn:svr3-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 #### IBM's AIX.
 "aix3-cc",  "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
diff --git a/TABLE b/TABLE
index 9b7f0574dede9930b83ec269a1d4edfa11f1aa29..8a46fb77c5752a043d3da61274daa0f4ef23aa1a 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -5501,7 +5501,7 @@ $wp_obj       = wp_block.o wp-mmx.o
 $cmll_obj     = cmll-x86.o
 $modes_obj    = ghash-x86.o
 $engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
+$perlasm_scheme = elf-1
 $dso_scheme   = dlfcn
 $shared_target= svr3-shared
 $shared_cflag = -Kpic
@@ -5534,7 +5534,7 @@ $wp_obj       = wp_block.o wp-mmx.o
 $cmll_obj     = cmll-x86.o
 $modes_obj    = ghash-x86.o
 $engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
+$perlasm_scheme = elf-1
 $dso_scheme   = dlfcn
 $shared_target= svr3-shared
 $shared_cflag = -fPIC
@@ -6260,7 +6260,7 @@ $wp_obj       = wp_block.o wp-mmx.o
 $cmll_obj     = cmll-x86.o
 $modes_obj    = ghash-x86.o
 $engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
+$perlasm_scheme = elf-1
 $dso_scheme   = dlfcn
 $shared_target= svr5-shared
 $shared_cflag = -Kpic
@@ -6293,7 +6293,7 @@ $wp_obj       = wp_block.o wp-mmx.o
 $cmll_obj     = cmll-x86.o
 $modes_obj    = ghash-x86.o
 $engines_obj  = e_padlock-x86.o
-$perlasm_scheme = elf
+$perlasm_scheme = elf-1
 $dso_scheme   = dlfcn
 $shared_target= gnu-shared
 $shared_cflag = -fPIC