Commit 87339c62 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

s390x assembler pack.

parent 0a22e744

Configure

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o:dx86-out.o yx86-out.o:ax86 


my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o::";

my $ia64_asm=":bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o:::sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o::";

my $s390x_asm=":bn-s390x.o::aes_cbc.o aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::::";



my $no_asm="::::::::::";
@@ -328,6 +329,7 @@ my %table=( 
"linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${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:${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.

TABLE

+27 −0
Original line number Diff line number Diff line
@@ -2835,6 +2835,33 @@ $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) 
$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       = bn-s390x.o

$des_obj      = 

$aes_obj      = 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      = 

$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

config

+1 −1
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ case "$GUESSOS" in 
  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" ;;

  s390x-*-linux2) OUT="linux-generic64"; 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

crypto/aes/asm/aes-s390x.pl

0 → 100644
+1071 −0

File added.

Preview size limit exceeded, changes collapsed.

crypto/bn/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ x86_64-gcc.o: asm/x86_64-gcc.c 
bn-ia64.s:	asm/ia64.S

	$(CC) $(CFLAGS) -E asm/ia64.S > $@



bn-s390x.s:	asm/s390x.S

	$(CC) $(CFLAGS) -E asm/s390x.S > $@



# GNU assembler fails to compile PA-RISC2 modules, insist on calling

# vendor assembler...

pa-risc2W.o: asm/pa-risc2W.s