[prev in list] [next in list] [prev in thread] [next in thread]
List: openssl-cvs
Subject: [CVS] OpenSSL: openssl/ Configure TABLE config openssl/crypto/aes/ Mak...
From: "Andy Polyakov" <appro () openssl ! org>
Date: 2007-04-30 9:22:28
Message-ID: 20070430092228.763AD1AC6096 () master ! openssl ! org
[Download RAW message or body]
OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________________________
Server: cvs.openssl.org Name: Andy Polyakov
Root: /v/openssl/cvs Email: appro@openssl.org
Module: openssl Date: 30-Apr-2007 11:22:28
Branch: HEAD Handle: 2007043010222205
Modified files:
openssl Configure TABLE config
openssl/crypto/aes Makefile
openssl/crypto/bn Makefile
openssl/crypto/sha Makefile
Log:
Engage s390x assembler modules.
Summary:
Revision Changes Path
1.555 +2 -0 openssl/Configure
1.221 +28 -0 openssl/TABLE
1.158 +2 -1 openssl/config
1.11 +3 -0 openssl/crypto/aes/Makefile
1.20 +3 -0 openssl/crypto/bn/Makefile
1.11 +12 -7 openssl/crypto/sha/Makefile
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openssl/Configure
============================================================================
$ cvs diff -u -r1.554 -r1.555 Configure
--- openssl/Configure 2 Apr 2007 09:50:12 -0000 1.554
+++ openssl/Configure 30 Apr 2007 09:22:22 -0000 1.555
@@ -124,6 +124,7 @@
my $ia64_asm="ia64cpuid.o:bn-ia64.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:::"; my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o \
sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o \
aes-sparcv9.o::::::::"; my $alpha_asm=":bn_asm.o alpha-mont.o::::::::::";
+my $s390x_asm=":s390x-mont.o::aes_core.o aes_cbc.o aes-s390x.o:::sha1-s390x.o \
sha256-s390x.o sha512-s390x.o:::::"; my $no_asm=":::::::::::";
# As for $BSDthreads. Idea is to maintain "collective" set of flags,
@@ -331,6 +332,7 @@
"linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall \
-no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK \
DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", \
"linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall \
-no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 \
DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", \
"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall \
-DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT \
DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-s390x", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 \
-Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT \
DES_UNROLL:${s390x_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### SPARC Linux setups
# Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently
# assisted with debugging of following two configs.
@@ .
patch -p0 <<'@@ .'
Index: openssl/TABLE
============================================================================
$ cvs diff -u -r1.220 -r1.221 TABLE
--- openssl/TABLE 2 Apr 2007 09:50:12 -0000 1.220
+++ openssl/TABLE 30 Apr 2007 09:22:23 -0000 1.221
@@ -3080,6 +3080,34 @@
$ranlib =
$arflags =
+*** linux-s390x
+$cc = gcc
+$cflags = -m64 -DB_ENDIAN -DTERMIO -O3 -Wall
+$unistd =
+$thread_cflag = -D_REENTRANT
+$sys_id =
+$lflags = -ldl
+$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL
+$cpuid_obj =
+$bn_obj = s390x-mont.o
+$des_obj =
+$aes_obj = aes_core.o aes_cbc.o aes-s390x.o
+$bf_obj =
+$md5_obj =
+$sha1_obj = sha1-s390x.o sha256-s390x.o sha512-s390x.o
+$cast_obj =
+$rc4_obj =
+$rmd160_obj =
+$rc5_obj =
+$wp_obj =
+$dso_scheme = dlfcn
+$shared_target= linux-shared
+$shared_cflag = -fPIC
+$shared_ldflag = -m64
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$ranlib =
+$arflags =
+
*** linux-sparcv8
$cc = gcc
$cflags = -mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W
@@ .
patch -p0 <<'@@ .'
Index: openssl/config
============================================================================
$ cvs diff -u -r1.157 -r1.158 config
--- openssl/config 23 Apr 2007 23:48:13 -0000 1.157
+++ openssl/config 30 Apr 2007 09:22:22 -0000 1.158
@@ -596,7 +596,8 @@
sh*b-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;
sh*-*-linux2) OUT="linux-generic32"; options="$options -DL_ENDIAN" ;;
m68k*-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;
- s390*-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN -DNO_ASM" ;;
+ s390-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;
+ s390x-*-linux2) OUT="linux-s390x" ;;
x86_64-*-linux?) OUT="linux-x86_64" ;;
*86-*-linux2) OUT="linux-elf"
if [ "$GCCVER" -gt 28 ]; then
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/aes/Makefile
============================================================================
$ cvs diff -u -r1.10 -r1.11 Makefile
--- openssl/crypto/aes/Makefile 30 Nov 2006 13:41:45 -0000 1.10
+++ openssl/crypto/aes/Makefile 30 Apr 2007 09:22:26 -0000 1.11
@@ -63,6 +63,9 @@
aes-sparcv9.s: asm/aes-sparcv9.pl
$(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@
+# GNU make "catch all"
+aes-%.s: asm/aes-%.pl; $(PERL) $< $(CFLAGS) > $@
+
files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/bn/Makefile
============================================================================
$ cvs diff -u -r1.19 -r1.20 Makefile
--- openssl/crypto/bn/Makefile 8 Dec 2006 14:18:57 -0000 1.19
+++ openssl/crypto/bn/Makefile 30 Apr 2007 09:22:25 -0000 1.20
@@ -132,6 +132,9 @@
alpha-mont.s: asm/alpha-mont.pl
$(PERL) $< | $(CC) -E - > $@
+# GNU make "catch all"
+%-mont.s: asm/%-mont.pl; $(PERL) $< $(CFLAGS) > $@
+
files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/sha/Makefile
============================================================================
$ cvs diff -u -r1.10 -r1.11 Makefile
--- openssl/crypto/sha/Makefile 5 Jun 2006 09:37:54 -0000 1.10
+++ openssl/crypto/sha/Makefile 30 Apr 2007 09:22:27 -0000 1.11
@@ -64,23 +64,28 @@
(cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS))
sha512-ia64.s: asm/sha512-ia64.pl
(cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS))
-sha1-x86_64.s: asm/sha1-x86_64.pl
- $(PERL) asm/sha1-x86_64.pl $@
-sha256-x86_64.s: asm/sha512-x86_64.pl
- $(PERL) asm/sha512-x86_64.pl $@
-sha512-x86_64.s: asm/sha512-x86_64.pl
- $(PERL) asm/sha512-x86_64.pl $@
+# Solaris make has to be explicitly told
+sha1-x86_64.s: asm/sha1-x86_64.pl; $(PERL) asm/sha1-x86_64.pl $@
+sha256-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $@
+sha512-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $@
+
+# AIX make has to be explicitly told
sha1-ppc_aix32.s: asm/sha1-ppc.pl; $(PERL) asm/sha1-ppc.pl $@
sha1-ppc_aix64.s: asm/sha1-ppc.pl; $(PERL) asm/sha1-ppc.pl $@
sha256-ppc_aix32.s: asm/sha512-ppc.pl; $(PERL) asm/sha512-ppc.pl $@
sha256-ppc_aix64.s: asm/sha512-ppc.pl; $(PERL) asm/sha512-ppc.pl $@
sha512-ppc_aix32.s: asm/sha512-ppc.pl; $(PERL) asm/sha512-ppc.pl $@
sha512-ppc_aix64.s: asm/sha512-ppc.pl; $(PERL) asm/sha512-ppc.pl $@
-# non-AIX targets are believed to be armed with GNU make
+
+# non-AIX ppc targets are believed to be armed with GNU make
sha1-ppc_%.s: asm/sha1-ppc.pl; $(PERL) $< $@
sha256-ppc_%.s: asm/sha512-ppc.pl; $(PERL) $< $@
sha512-ppc_%.s: asm/sha512-ppc.pl; $(PERL) $< $@
+# GNU make "catch all"
+sha1-%.s: asm/sha1-%.pl; $(PERL) $< $@
+sha256-%.s: asm/sha512-%.pl; $(PERL) $< $@
+sha512-%.s: asm/sha512-%.pl; $(PERL) $< $@
files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ .
______________________________________________________________________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List openssl-cvs@openssl.org
Automated List Manager majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic