Allow shared builds for aix[64]-gcc targets. (b506821d) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

Configure

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -411,8 +411,8 @@ my %table=(

	#### IBM's AIX.		#### IBM's AIX.
	"aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",		"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 aix_ppc32-mont.o:::::sha1-ppc_aix32.o sha256-ppc_aix32.o::::::dlfcn:",		"aix-gcc", "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o aix_ppc32-mont.o:::::sha1-ppc_aix32.o sha256-ppc_aix32.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 aix_ppc64-mont.o:::::sha1-ppc_aix64.o sha256-ppc_aix64.o sha512-ppc_aix64.o::::::dlfcn::::::-X64",		"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o aix_ppc64-mont.o:::::sha1-ppc_aix64.o sha256-ppc_aix64.o sha512-ppc_aix64.o::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
	# Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE		# Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
	# at build time. $OBJECT_MODE is respected at ./config stage!		# 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::aix_ppc32.o aix_ppc32-mont.o:::::sha1-ppc_aix32.o sha256-ppc_aix32.o::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",		"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o aix_ppc32-mont.o:::::sha1-ppc_aix32.o sha256-ppc_aix32.o::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",

Makefile.shared

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -510,26 +510,26 @@ link_app.hpux:

	link_o.aix:		link_o.aix:
	@ $(CALC_VERSIONS); \		@ $(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; \		OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
	SHLIB=lib$(LIBNAME).so; \		SHLIB=lib$(LIBNAME).so; \
	SHLIB_SUFFIX=; \		SHLIB_SUFFIX=; \
	ALLSYMSFLAGS=''; \		ALLSYMSFLAGS=''; \
	NOALLSYMSFLAGS=''; \		NOALLSYMSFLAGS=''; \
	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -G -bexpall -bnolibpath -bM:SRE'; \		SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \
	$(LINK_SO_O);		$(LINK_SO_O);
	link_a.aix:		link_a.aix:
	@ $(CALC_VERSIONS); \		@ $(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; \		OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
	SHLIB=lib$(LIBNAME).so; \		SHLIB=lib$(LIBNAME).so; \
	SHLIB_SUFFIX=; \		SHLIB_SUFFIX=; \
	ALLSYMSFLAGS='-bnogc'; \		ALLSYMSFLAGS='-bnogc'; \
	NOALLSYMSFLAGS=''; \		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_SO_A_VIA_O)
	link_app.aix:		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_APP)

	link_o.reliantunix:		link_o.reliantunix:

TABLE

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -749,12 +749,12 @@ $rmd160_obj =
	$rc5_obj =		$rc5_obj =
	$wp_obj =		$wp_obj =
	$dso_scheme = dlfcn		$dso_scheme = dlfcn
	$shared_target=		$shared_target= aix-shared
	$shared_cflag =		$shared_cflag =
	$shared_ldflag =		$shared_ldflag =
	$shared_extension =		$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
	$ranlib =		$ranlib =
	$arflags =		$arflags = -X 32

	*** aix3-cc		*** aix3-cc
	$cc = cc		$cc = cc
	@@ -833,10 +833,10 @@ $rmd160_obj =
	$rc5_obj =		$rc5_obj =
	$wp_obj =		$wp_obj =
	$dso_scheme = dlfcn		$dso_scheme = dlfcn
	$shared_target=		$shared_target= aix-shared
	$shared_cflag =		$shared_cflag =
	$shared_ldflag =		$shared_ldflag = -maix64
	$shared_extension =		$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
	$ranlib =		$ranlib =
	$arflags = -X64		$arflags = -X64