Commit 7d608f9e authored by Andy Polyakov's avatar Andy Polyakov
Browse files

PowerPC config updates from HEAD.

parent 295de18c

Configure

+3 −4
Changes for Configure: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -321,8 +321,7 @@ my %table=( 
"linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",

####

"linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

# -bpowerpc64-linux is transient option, -m64 should be the one to use...

"linux-ppc64",	"gcc:-bpowerpc64-linux -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-bpowerpc64-linux:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-ppc64",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-ia64",	"gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"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)",
@@ -404,11 +403,11 @@ 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::aix_ppc32.o::::::::::dlfcn:",

"aix64-gcc","gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn::::::-X64",

"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn::::::-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::-qthreaded:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",

"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-q64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",

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



#

# Cray T90 and similar (SDSC)

TABLE

+4 −4
Changes for TABLE: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ $arflags = 
$cc           = cc

$cflags       = -q64 -O -DB_ENDIAN -qmaxmem=16384

$unistd       = 

$thread_cflag = (unknown)

$thread_cflag = -qthreaded

$sys_id       = AIX

$lflags       = 

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR
@@ -785,7 +785,7 @@ $arflags = -X 64 


*** aix64-gcc

$cc           = gcc

$cflags       = -O -DB_ENDIAN

$cflags       = -maix64 -O -DB_ENDIAN

$unistd       = 

$thread_cflag = -D_THREAD_SAFE

$sys_id       = AIX
@@ -2810,7 +2810,7 @@ $arflags = 


*** linux-ppc64

$cc           = gcc

$cflags       = -bpowerpc64-linux -DB_ENDIAN -DTERMIO -O3 -Wall

$cflags       = -m64 -DB_ENDIAN -DTERMIO -O3 -Wall

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       =
@@ -2830,7 +2830,7 @@ $rc5_obj = 
$dso_scheme   = dlfcn

$shared_target= linux-shared

$shared_cflag = -fPIC

$shared_ldflag = -bpowerpc64-linux

$shared_ldflag = -m64

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

$ranlib       = 

$arflags      =

config

+1 −1
Changes for config: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ case "$GUESSOS" in 
		fi

	    fi

	fi

	if (lsattr -E -O -l proc0 | grep -i powerpc) >/dev/null 2>&1; then

	if (lsattr -E -O -l `lsdev -c processor|awk '{print$1;exit}'` | grep -i powerpc) >/dev/null 2>&1; then

	    :	# this applies even to Power3 and later, as they return PowerPC_POWER[345]

	else

	    options="$options no-asm"