Revision: 25503
http://sourceforge.net/p/gar/code/25503
Author: janholzh
Date: 2015-12-22 16:06:55 +0000 (Tue, 22 Dec 2015)
Log Message:
-----------
openssl1/trunk: update targets
Modified Paths:
--------------
csw/mgar/pkg/openssl1/trunk/Makefile
csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch
Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile 2015-12-22 14:48:59 UTC (rev
25502)
+++ csw/mgar/pkg/openssl1/trunk/Makefile 2015-12-22 16:06:55 UTC (rev
25503)
@@ -175,7 +175,9 @@
sparcv8_SUN_CONFIGURE_TARGET = solaris-sparcv8-cc-sunw
sparcv8plus_SUN_CONFIGURE_TARGET = solaris-sparcv9-cc-sunw
sparcv8plus+vis_SUN_CONFIGURE_TARGET = solaris-sparcv9+vis-cc-sunw
-sparcv9_SUN_CONFIGURE_TARGET = solaris64-sparcv9-cc-sunw
+sparcv9_SUN_CONFIGURE_TARGET_5.11 = solaris64-sparcv9-cc-sunw
+sparcv9_SUN_CONFIGURE_TARGET_5.10 = solaris64-sparcv9-cc-sunw10
+sparcv9_SUN_CONFIGURE_TARGET =
$(sparcv9_SUN_CONFIGURE_TARGET_$(GAROSREL))
sparcv8_GNU_CONFIGURE_TARGET = solaris-sparcv8-gcc
sparcv8plus_GNU_CONFIGURE_TARGET = solaris-sparcv9-gcc
Modified: csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch
2015-12-22 14:48:59 UTC (rev 25502)
+++ csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch
2015-12-22 16:06:55 UTC (rev 25503)
@@ -1,10 +1,17 @@
-#
-# This was developed in house to support Solaris-specific options.
-# Not suitable for upstream.
-#
---- openssl-1.0.0d/Configure Thu Feb 10 20:02:41 2011
-+++ /tmp/Configure Thu Feb 10 20:01:51 2011
-@@ -153,6 +153,7 @@
+From 322bf7280b0b5f6305a90a6441436f0b88e1aab3 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <j...@opencsw.org>
+Date: Tue, 22 Dec 2015 16:28:49 +0100
+Subject: [PATCH] optimised
+
+---
+ Configure | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/Configure b/Configure
+index 418d5c7..ebd4d60 100755
+--- a/Configure
++++ b/Configure
+@@ -153,6 +153,7 @@ my $x86_elf_asm="$x86_asm:elf";
my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o
x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o:ecp_nistz256.o
ecp_nistz256-x86_64.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o
aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o
aesni-mb-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
sha1-mb-x86_64.o sha256-mb-x86_64.o::rc4-x86_64.o
rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o
aesni-gcm-x86_64.o:";
my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o:::aes_core.o aes_cbc.o
aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o
rc4_skey.o:::::ghash-ia64.o::void";
my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o
sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o::des_enc-sparc.o
fcrypt_b.o dest4-sparcv9.o:aes_core.o aes_cbc.o aes-sparcv9.o
aest4-sparcv9.o::md5-sparcv9.o:sha1-sparcv9.o sha256-sparcv9.o
sha512-sparcv9.o::::::camellia.o cmll_misc.o cmll_cbc.o
cmllt4-sparcv9.o:ghash-sparcv9.o::void";
@@ -12,7 +19,7 @@
my $sparcv8_asm=":sparcv8.o::des_enc-sparc.o fcrypt_b.o:::::::::::::void";
my $alpha_asm="alphacpuid.o:bn_asm.o
alpha-mont.o::::::sha1-alpha.o:::::::ghash-alpha.o::void";
my $mips64_asm=":bn-mips.o mips-mont.o:::aes_cbc.o aes-mips.o:::sha1-mips.o
sha256-mips.o sha512-mips.o::::::::";
-@@ -277,6 +278,21 @@
+@@ -277,6 +278,22 @@ my %table=(
#"sunos-cc", "cc:-O4 -DNOPROTO
-DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::",
"sunos-gcc","gcc:-O3 -mcpu=v8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG
RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::",
@@ -24,6 +31,7 @@
+"solaris-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -Qoption cg -xregs=no%appl
-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN
-DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL
DES_PTR DES_RISC1 DES_UNROLL
BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs
-Bdirect -zignore
-M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+#
+"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg
-xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa
-DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK
DES_INT DES_PTR DES_RISC1 DES_UNROLL
BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs
-Bdirect -zignore
-M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar
rs::/64",
++"solaris64-sparcv9-cc-sunw10","cc:-xtarget=ultra -m64 -Qoption cg
-xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa
-DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK
DES_INT DES_PTR DES_RISC1 DES_UNROLL
BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs
-Bdirect -zignore
-M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar
rs::/64",
+"solaris-fips-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -Qoption cg
-xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN
-DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc -lsoftcrypto -R
/lib/openssl/fips-140:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL
BF_PTR:${fips_sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text
-zdefs -Bdirect -zignore
-M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris64-fips-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg
-xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa
-DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK
DES_INT DES_PTR DES_RISC1 DES_UNROLL
BF_PTR:${fips_sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text
-zdefs -Bdirect -zignore
-M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar
rs::/64",
+# Option -xF=%all instructs the compiler to place functions and data
@@ -34,3 +42,6 @@
#### IRIX 5.x configs
# -mips2 flag is added by ./config when appropriate.
"irix-gcc","gcc:-O3 -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX
RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR
BF_PTR:${mips32_asm}:o32:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
