Commit e600614e authored by Andy Polyakov's avatar Andy Polyakov
Browse files

aix updates from HEAD.

parent 02581dea

Configure

+4 −4
Original line number Diff line number Diff line
@@ -402,12 +402,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::aix_ppc32.o::::::::::dlfcn:",

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

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



#

# Cray T90 and similar (SDSC)

Makefile.shared

+6 −6
Original line number Diff line number Diff line
@@ -485,26 +485,26 @@ link_app.hpux: 


link_o.aix:

	@ $(CALC_VERSIONS); \

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

	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) -G -bexpall -bnolibpath -bM:SRE'; \

	$(LINK_SO_O); rm -rf lib$(LIBNAME).exp

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

	$(LINK_SO_O);

link_a.aix:

	@ $(CALC_VERSIONS); \

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

	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) -G -bexpall -bnolibpath -bM:SRE'; \

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

	$(LINK_SO_A_VIA_O)

link_app.aix:

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

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

	$(LINK_APP)



link_o.reliantunix:

TABLE

+8 −8
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ $arflags = 


*** aix-cc

$cc           = cc

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

$cflags       = -q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst

$unistd       = 

$thread_cflag = -qthreaded

$sys_id       = AIX
@@ -722,12 +722,12 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = dlfcn

$shared_target= 

$shared_target= aix-shared

$shared_cflag = 

$shared_ldflag = 

$shared_extension = 

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

$ranlib       = 

$arflags      = 

$arflags      = -X 32



*** aix3-cc

$cc           = cc
@@ -758,7 +758,7 @@ $arflags = 


*** aix64-cc

$cc           = cc

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

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

$unistd       = 

$thread_cflag = -qthreaded

$sys_id       = AIX
@@ -803,10 +803,10 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = dlfcn

$shared_target= 

$shared_target= aix-shared

$shared_cflag = 

$shared_ldflag = 

$shared_extension = 

$shared_ldflag = -maix64

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

$ranlib       = 

$arflags      = -X64