Commit 492279f6 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

AIX build updates.

parent 3ad74edc

Configure

+4 −4
Original line number Diff line number Diff line
@@ -426,12 +426,12 @@ my %table=( 


#### IBM's AIX.

"aix3-cc",  "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",

"aix-gcc",  "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",

"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",

"aix-gcc",  "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X32",

"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",

# Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE

# at build time. $OBJECT_MODE is respected at ./config stage!

"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",

"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",

"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",

"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",



#

# Cray T90 and similar (SDSC)

Makefile.shared

+4 −4
Original line number Diff line number Diff line
@@ -521,23 +521,23 @@ link_app.hpux: 


link_o.aix:

	@ $(CALC_VERSIONS); \

	OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || :; \

	OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || :; \

	OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \

	SHLIB=lib$(LIBNAME).so; \

	SHLIB_SUFFIX=; \

	ALLSYMSFLAGS=''; \

	NOALLSYMSFLAGS=''; \

	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \

	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \

	$(LINK_SO_O);

link_a.aix:

	@ $(CALC_VERSIONS); \

	OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || : ; \

	OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || : ; \

	OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \

	SHLIB=lib$(LIBNAME).so; \

	SHLIB_SUFFIX=; \

	ALLSYMSFLAGS='-bnogc'; \

	NOALLSYMSFLAGS=''; \

	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \

	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \

	$(LINK_SO_A_VIA_O)

link_app.aix:

	LDFLAGS="$(CFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \

TABLE

+43 −13
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ $perlasm_scheme = aix32 
$dso_scheme   = dlfcn

$shared_target= aix-shared

$shared_cflag = 

$shared_ldflag = -q32

$shared_ldflag = -q32 -G

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = -X 32
@@ -754,7 +754,7 @@ $arflags = -X 32 
$cc           = gcc

$cflags       = -O -DB_ENDIAN

$unistd       = 

$thread_cflag = -D_THREAD_SAFE

$thread_cflag = -pthread

$sys_id       = AIX

$lflags       = 

$bn_ops       = BN_LLONG RC4_CHAR
@@ -775,7 +775,7 @@ $perlasm_scheme = aix32 
$dso_scheme   = dlfcn

$shared_target= aix-shared

$shared_cflag = 

$shared_ldflag = 

$shared_ldflag = -shared -Wl,-G

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = -X32
@@ -835,7 +835,7 @@ $perlasm_scheme = aix64 
$dso_scheme   = dlfcn

$shared_target= aix-shared

$shared_cflag = 

$shared_ldflag = -q64

$shared_ldflag = -q64 -G

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = -X 64
@@ -844,7 +844,7 @@ $arflags = -X 64 
$cc           = gcc

$cflags       = -maix64 -O -DB_ENDIAN

$unistd       = 

$thread_cflag = -D_THREAD_SAFE

$thread_cflag = -pthread

$sys_id       = AIX

$lflags       = 

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR
@@ -865,7 +865,7 @@ $perlasm_scheme = aix64 
$dso_scheme   = dlfcn

$shared_target= aix-shared

$shared_cflag = 

$shared_ldflag = -maix64

$shared_ldflag = -maix64 -shared -Wl,-G

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = -X64
@@ -1500,14 +1500,44 @@ $shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib 
$ranlib       = 

$arflags      = 



*** debug-geoff

*** debug-geoff32

$cc           = gcc

$cflags       = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -DMD32_REG_T=int -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -ldl

$bn_ops       = SIXTY_FOUR_BIT_LONG

$bn_ops       = BN_LLONG

$cpuid_obj    = 

$bn_obj       = 

$des_obj      = 

$aes_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$perlasm_scheme = void

$dso_scheme   = dlfcn

$shared_target= linux-shared

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = 



*** debug-geoff64

$cc           = gcc

$cflags       = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -DMD32_REG_T=int -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -ldl

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR

$cpuid_obj    = 

$bn_obj       = 

$des_obj      =
@@ -1952,7 +1982,7 @@ $arflags = 


*** debug-steve-opt

$cc           = gcc

$cflags       = -m64 -O3 -DL_ENDIAN -DTERMIO -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -pedantic -Wall -Werror -Wno-long-long -DMD32_REG_T=int

$cflags       = -m64 -O3 -DL_ENDIAN -DTERMIO -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -DOPENSSSL_NO_DEPRECATED -g -pedantic -Wall -Werror -Wno-long-long -DMD32_REG_T=int

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       =
@@ -1982,7 +2012,7 @@ $arflags = 


*** debug-steve32

$cc           = gcc

$cflags       = -m32 -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe

$cflags       = -m32 -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -DOPENSSSL_NO_DEPRECATED -g -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       =
@@ -2012,7 +2042,7 @@ $arflags = 


*** debug-steve64

$cc           = gcc

$cflags       = -m64 -DL_ENDIAN -DTERMIO -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -pedantic -Wall -Werror -Wno-long-long -DMD32_REG_T=int

$cflags       = -m64 -DL_ENDIAN -DTERMIO -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -DOPENSSSL_NO_DEPRECATED -g -pedantic -Wall -Werror -Wno-long-long -DMD32_REG_T=int

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       =
@@ -3505,7 +3535,7 @@ $perlasm_scheme = coff 
$dso_scheme   = win32

$shared_target= cygwin-shared

$shared_cflag = -D_WINDLL -DOPENSSL_USE_APPLINK

$shared_ldflag = -mno-cygwin -shared

$shared_ldflag = -mno-cygwin

$shared_extension = .dll.a

$ranlib       = 

$arflags      =

crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ x86_64cpuid.s: x86_64cpuid.pl 
	$(PERL) x86_64cpuid.pl $@

ia64cpuid.s: ia64cpuid.S

	$(CC) $(CFLAGS) -E ia64cpuid.S > $@

ppccpuid.s:		ppccpuid.pl;	$(PERL) $< $(PERLASM_SCHEME) $@

ppccpuid.s:		ppccpuid.pl;	$(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@



testapps:

	[ -z "$(THIS)" ] || (	if echo ${SDIRS} | fgrep ' des '; \

crypto/aes/asm/aes-ppc.pl

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ $mask80=$Tbl2; 
$mask1b=$Tbl3;



$code.=<<___;

.machine	"any"

.text



.align	7