Commit 5322333b authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Fix for AIX shared build, see RT#463.

parent e98823d8

Configure

+2 −2
Original line number Diff line number Diff line
@@ -440,9 +440,9 @@ my %table=( 
# IBM's AIX.

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

"aix-gcc",  "gcc:-O3 -DB_ENDIAN::(unknown):AIX::BN_LLONG RC4_CHAR:::",

"aix43-cc",   "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384::(unknown):::BN_LLONG RC4_CHAR::::::::::dlfcn:",

"aix43-cc",   "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384::(unknown):::BN_LLONG RC4_CHAR::::::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",

"aix43-gcc",  "gcc:-O1 -DAIX -DB_ENDIAN::(unknown):::BN_LLONG RC4_CHAR::::::::::dlfcn:",

"aix64-cc",   "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384 -q64::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHAR::::::::::dlfcn::::::-X 64",

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



#

# Cray T90 and similar (SDSC)

Makefile.org

+3 −2
Original line number Diff line number Diff line
@@ -504,9 +504,10 @@ SHAREDCMD=$(CC) 
do_aix-shared:

	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	( set -x; \

	  ld -r -o $$i.o $(ALLSYMSFLAG) lib$$i.a && \

	  ld -r -o lib$$i.o $(ALLSYMSFLAG) lib$$i.a && \

	  ( nm -Pg lib$$i.o | grep ' [BD] ' | cut -f1 -d' ' > lib$$i.exp; \

	    $(SHAREDCMD) $(SHAREDFLAG) -o lib$$i.so lib$$i.o \

	    $(SHAREDCMD) $(SHAREDFLAGS) \

		-o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} lib$$i.o \

		$$libs ${EX_LIBS} ) ) \

	|| exit 1; \

	libs="$$libs -l$$i"; \

config

+4 −0
Original line number Diff line number Diff line
@@ -464,6 +464,10 @@ if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then 
  fi

fi



if [ "${SYSTEM}" = "AIX" ]; then	# favor vendor cc over gcc

    (cc) 2>&1 | grep -iv "command not found" > /dev/null && CC=cc

fi



CCVER=${CCVER:-0}



# read the output of the embedded GuessOS