Simplify shared rules, link run-path into applications only. (f210eb7b) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

Configure

+4 −12

Original line number	Diff line number	Diff line
		@@ -304,19 +304,11 @@ my %table=(
		#
		# - William Shakespeare, "Romeo & Juliet", Act II, scene II.
		#
		# There's also an alternate target available (which `config' will never
		# select) called alpha-cc-rpath. This target builds an RPATH into the
		# shared libraries, which is very convenient on Tru64 since binaries
		# linked against that shared library will automatically inherit that RPATH,
		# and hence know where to look for the openssl libraries, even if they're in
		# an odd place.
		#
		# For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version
		#
		"osf1-alpha-gcc", "gcc:-O3::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${no_asm}:dlfcn:alpha-osf1-shared:::.so",
		"ofs1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared:::.so",
		"tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:tru64-shared:::.so",
		"alpha-cc-rpath", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:tru64-shared-rpath:::.so",
		"tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-msym:.so",

		####
		#### Variety of LINUX:-)
		@@ -513,9 +505,9 @@ my %table=(

		##### MacOS X (a.k.a. Rhapsody or Darwin) setup
		"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
		"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o:::::::::::darwin-shared:-fPIC -fno-common::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
		"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -fno-common -DB_ENDIAN::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
		"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
		"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o:::::::::::darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
		"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -fno-common -DB_ENDIAN::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::darwin-shared:-fPIC:-dunamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
		"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o:::::::::::darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

		##### A/UX
		"aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",

Makefile.shared

+41 −250

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@

		# CC contains the current compiler. This one MUST be defined
		CC=cc
		CFLAGS=$(CFLAG)
		# LDFLAGS contains flags to be used when temporary object files (when building
		# shared libraries) are created, or when an application is linked.
		# SHARED_LDFLAGS contains flags to be used when the shared library is created.
		@@ -66,8 +67,8 @@ LIBDEPS=
		#------------------------------------------------------------------------------
		# The rest is private to this makefile.

		SET_X=:
		#SET_X=set -x
		#SET_X=:
		SET_X=set -x

		top:
		echo "Trying to use this makefile interactively? Don't."
		@@ -88,20 +89,26 @@ CALC_VERSIONS= \

		LINK_APP= \
		( $(SET_X); \
		LIBDEPS=$${LIBDEPS:-$(LIBDEPS)}; \
		LIBPATH=`for x in $$LIBDEPS; do if echo $$x \| grep '^ -L' > /dev/null 2>&1; then echo $$x \| sed -e 's/^ -L//'; fi; done \| uniq`; \
		LIBPATH=`echo $$LIBPATH \| sed -e 's/ /:/g'`; \
		LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
		$$LDCMD $$LDFLAGS -o $$APPNAME $(OBJECTS) $$LIBDEPS )
		$${LDCMD:-$(CC)} $${LDFLAGS:-$(CFLAGS)} \
		-o $${APPNAME:-$(APPNAME)} $(OBJECTS) $$LIBDEPS )

		LINK_SO= \
		( $(SET_X); \
		LIBDEPS=$${LIBDEPS:-$(LIBDEPS)}; \
		nm -Pg $$SHOBJECTS \| grep ' [BDT] ' \| cut -f1 -d' ' > lib$(LIBNAME).exp; \
		LIBPATH=`for x in $$LIBDEPS; do if echo $$x \| grep '^ -L' > /dev/null 2>&1; then echo $$x \| sed -e 's/^ -L//'; fi; done \| uniq`; \
		LIBPATH=`echo $$LIBPATH \| sed -e 's/ /:/g'`; \
		LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
		$$SHAREDCMD $$SHAREDFLAGS -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
		$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \
		$(SYMLINK_SO); ( $(SET_X); rm -f lib$(LIBNAME).exp )
		$${SHAREDCMD:-$(CC)} $${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)} \
		-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
		$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
		) && $(SYMLINK_SO); \
		( $(SET_X); rm -f lib$(LIBNAME).exp )

		SYMLINK_SO= \
		if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \
		prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
		@@ -120,12 +127,14 @@ SYMLINK_SO= \

		LINK_SO_A= SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO)
		LINK_SO_O= SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO)

		LINK_SO_A_VIA_O= \
		SHOBJECTS=lib$(LIBNAME).o; \
		ALL=$$ALLSYMSFLAGS; ALLSYMSFLAGS=; NOALLSYMSFLAGS=; \
		( $(SET_X); \
		ld $(LDFLAGS) -r -o lib$(LIBNAME).o $$ALL lib$(LIBNAME).a $(LIBEXTRAS) ); \
		$(LINK_SO) && rm -f $(LIBNAME).o

		LINK_SO_A_UNPACKED= \
		UNPACKDIR=link_tmp.$$$$; rm -rf $$UNPACKDIR; mkdir $$UNPACKDIR; \
		(cd $$UNPACKDIR; ar x ../lib$(LIBNAME).a) && \
		@@ -138,15 +147,11 @@ DETECT_GNU_LD=(${CC} -Wl,-V /dev/null 2>&1 \| grep '^GNU ld' )>/dev/null
		DO_GNU_SO=$(CALC_VERSIONS); \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS='-Wl,--whole-archive'; \
		NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \
		SHAREDCMD='$(CC)'
		DO_GNU_APP=LDCMD=$(CC);\
		LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME=$(APPNAME)
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"

		DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"

		#This is rather special. It's a special target with which one can link
		#applications without bothering with any features that have anything to
		@@ -154,10 +159,6 @@ DO_GNU_APP=LDCMD=$(CC);\
		#libraries. It's mostly here to avoid a lot of conditionals everywhere
		#else...
		link_app.:
		LDCMD=$(CC); \
		LDFLAGS="$(CFLAGS)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"; \
		$(LINK_APP)

		link_o.gnu:
		@@ -172,29 +173,24 @@ link_o.bsd:
		$(CALC_VERSIONS); \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS=; \
		LIBDEPS=" "; \
		ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
		NOALLSYMSFLAGS=; \
		SHAREDFLAGS="$(CFLAGS) -shared -nostdlib"; \
		SHAREDCMD=$(CC); \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
		fi; $(LINK_SO_O)
		link_a.bsd:
		@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
		$(CALC_VERSIONS); \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS=; \
		LIBDEPS=" "; \
		ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
		NOALLSYMSFLAGS=; \
		SHAREDFLAGS="$(CFLAGS) -shared -nostdlib"; \
		SHAREDCMD=$(CC); \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
		fi; $(LINK_SO_A)
		link_app.bsd:
		@if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \
		LDCMD=$(CC); \
		LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBPATH)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"; \
		fi; $(LINK_APP)

		# For Darwin AKA Mac OS/X (dyld)
		@@ -202,11 +198,8 @@ link_o.darwin:
		@ $(CALC_VERSIONS); \
		SHLIB=lib$(LIBNAME); \
		SHLIB_SUFFIX=.dylib; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS='-all_load'; \
		NOALLSYMSFLAGS=''; \
		SHAREDFLAGS="$(CFLAGS) -dynamiclib"; \
		SHAREDCMD='$(CC)'; \
		if [ -n "$(LIBVERSION)" ]; then \
		SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
		fi; \
		@@ -218,11 +211,8 @@ link_a.darwin:
		@ $(CALC_VERSIONS); \
		SHLIB=lib$(LIBNAME); \
		SHLIB_SUFFIX=.dylib; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS='-all_load'; \
		NOALLSYMSFLAGS=''; \
		SHAREDFLAGS="$(CFLAGS) -dynamiclib"; \
		SHAREDCMD='$(CC)'; \
		if [ -n "$(LIBVERSION)" ]; then \
		SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
		fi; \
		@@ -230,11 +220,7 @@ link_a.darwin:
		SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
		fi; \
		$(LINK_SO_A)
		link_app.darwin:
		LDCMD=$(CC);\
		LDFLAGS="$(CFLAGS)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"; \
		link_app.darwin: # is there run-path on darwin?
		$(LINK_APP)

		link_o.cygwin:
		@@ -243,12 +229,10 @@ link_o.cygwin:
		SHLIB=cyg$(LIBNAME); \
		expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \
		SHLIB_SUFFIX=.dll; \
		LIBDEPS="$(LIBDEPS)"; \
		SHLIB_SOVER=-$(LIBVERSION); \
		ALLSYMSFLAGS='-Wl,--whole-archive'; \
		NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
		SHAREDFLAGS="$(CFLAGS) -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
		SHAREDCMD='${CC}'; \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
		$(LINK_SO_O)
		link_a.cygwin:
		@ $(CALC_VERSIONS); \
		@@ -256,23 +240,17 @@ link_a.cygwin:
		SHLIB=cyg$(LIBNAME); \
		expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \
		SHLIB_SUFFIX=.dll; \
		LIBDEPS="$(LIBDEPS)"; \
		SHLIB_SOVER=; \
		ALLSYMSFLAGS='-Wl,--whole-archive'; \
		NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
		base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x61200000; \
		SHAREDFLAGS="$(CFLAGS) $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
		SHAREDCMD='${CC}'; \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
		[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
		[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
		$(LINK_SO_A) \|\| exit 1; \
		cp -p $$SHLIB$$SHLIB_SUFFIX apps/; \
		cp -p $$SHLIB$$SHLIB_SUFFIX test/
		link_app.cygwin:
		LDCMD=$(CC);\
		LDFLAGS="$(CFLAGS)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"; \
		$(LINK_APP)

		link_o.alpha-osf1:
		@@ -281,7 +259,6 @@ link_o.alpha-osf1:
		else \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" \| cut -d';' -f2 \| sed -e 's/ */:/'`; \
		if [ -n "$$SHLIB_HIST" ]; then \
		SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
		@@ -291,8 +268,7 @@ link_o.alpha-osf1:
		SHLIB_SOVER=; \
		ALLSYMSFLAGS='-all'; \
		NOALLSYMSFLAGS='-none'; \
		SHAREDFLAGS="$(CFLAGS) -shared"; \
		SHAREDCMD='$(CC)'; \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared"; \
		if [ -n "$$SHLIB_HIST" ]; then \
		SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
		fi; \
		@@ -304,7 +280,6 @@ link_a.alpha-osf1:
		else \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" \| cut -d';' -f2 \| sed -e 's/ */:/'`; \
		if [ -n "$$SHLIB_HIST" ]; then \
		SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
		@@ -314,8 +289,7 @@ link_a.alpha-osf1:
		SHLIB_SOVER=; \
		ALLSYMSFLAGS='-all'; \
		NOALLSYMSFLAGS='-none'; \
		SHAREDFLAGS="$(CFLAGS) -shared"; \
		SHAREDCMD='$(CC)'; \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared"; \
		if [ -n "$$SHLIB_HIST" ]; then \
		SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
		fi; \
		@@ -325,128 +299,7 @@ link_app.alpha-osf1:
		@if ${DETECT_GNU_LD}; then \
		$(DO_GNU_APP); \
		else \
		LDCMD=$(CC);\
		LDFLAGS="$(CFLAGS)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"
		fi; \
		$(LINK_APP)

		# The difference between alpha-osf1-shared and tru64-shared is the `-msym'
		# option passed to the linker.
		link_o.tru64:
		@ if ${DETECT_GNU_LD}; then \
		$(DO_GNU_SO); \
		else \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" \| cut -d';' -f2 \| sed -e 's/ */:/'`; \
		if [ -n "$$SHLIB_HIST" ]; then \
		SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
		else \
		SHLIB_HIST="$(LIBVERSION)"; \
		fi; \
		SHLIB_SOVER=; \
		ALLSYMSFLAGS='-all'; \
		NOALLSYMSFLAGS='-none'; \
		SHAREDFLAGS="$(CFLAGS) -shared -msym -rpath $(LIBRPATH)"; \
		SHAREDCMD='$(CC)'; \
		if [ -n "$$SHLIB_HIST" ]; then \
		SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
		fi; \
		fi; \
		$(LINK_SO_O)
		link_a.tru64:
		@ if ${DETECT_GNU_LD}; then \
		$(DO_GNU_SO); \
		else \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" \| cut -d';' -f2 \| sed -e 's/ */:/'`; \
		if [ -n "$$SHLIB_HIST" ]; then \
		SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
		else \
		SHLIB_HIST="$(LIBVERSION)"; \
		fi; \
		SHLIB_SOVER=; \
		ALLSYMSFLAGS='-all'; \
		NOALLSYMSFLAGS='-none'; \
		SHAREDFLAGS="$(CFLAGS) -shared -msym -rpath $(LIBRPATH)"; \
		SHAREDCMD='$(CC)'; \
		if [ -n "$$SHLIB_HIST" ]; then \
		SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
		fi; \
		fi; \
		$(LINK_SO_A)
		link_app.tru64:
		@ if ${DETECT_GNU_LD}; then \
		$(DO_GNU_APP); \
		else \
		LDCMD=$(CC);\
		LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"; \
		fi; \
		$(LINK_APP)

		# The difference between tru64-shared and tru64-shared-rpath is the
		# -rpath ${LIBRPATH} passed to the linker.
		link_o.tru64-rpath:
		@ if ${DETECT_GNU_LD}; then \
		$(DO_GNU_SO); \
		else \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" \| cut -d';' -f2 \| sed -e 's/ */:/'`; \
		if [ -n "$$SHLIB_HIST" ]; then \
		SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
		else \
		SHLIB_HIST="$(LIBVERSION)"; \
		fi; \
		SHLIB_SOVER=; \
		ALLSYMSFLAGS='-all'; \
		NOALLSYMSFLAGS='-none'; \
		SHAREDFLAGS="$(CFLAGS) -shared -msym -rpath $(LIBRPATH)"; \
		SHAREDCMD='$(CC)'; \
		if [ -n "$$SHLIB_HIST" ]; then \
		SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
		fi; \
		fi; \
		$(LINK_SO_O)
		link_a.tru64-rpath:
		@ if ${DETECT_GNU_LD}; then \
		$(DO_GNU_SO); \
		else \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" \| cut -d';' -f2 \| sed -e 's/ */:/'`; \
		if [ -n "$$SHLIB_HIST" ]; then \
		SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
		else \
		SHLIB_HIST="$(LIBVERSION)"; \
		fi; \
		SHLIB_SOVER=; \
		ALLSYMSFLAGS='-all'; \
		NOALLSYMSFLAGS='-none'; \
		SHAREDFLAGS="$(CFLAGS) -shared -msym -rpath $(LIBRPATH)"; \
		SHAREDCMD='$(CC)'; \
		if [ -n "$$SHLIB_HIST" ]; then \
		SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
		fi; \
		fi; \
		$(LINK_SO_A)
		link_app.tru64-rpath:
		@ if ${DETECT_GNU_LD}; then \
		$(DO_GNU_APP); \
		else \
		LDCMD=$(CC);\
		LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"; \
		fi; \
		$(LINK_APP)

		@@ -456,14 +309,12 @@ link_o.solaris:
		else \
		$(CALC_VERSIONS); \
		MINUSZ='-z '; \
		(${CC} -v 2>&1 \| grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
		($(CC) -v 2>&1 \| grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \
		SHAREDCMD='$(CC)'; \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
		fi; \
		$(LINK_SO_O)
		link_a.solaris:
		@@ -475,21 +326,16 @@ link_a.solaris:
		(${CC} -v 2>&1 \| grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=;\
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \
		SHAREDCMD='$(CC)'; \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
		fi; \
		$(LINK_SO_A)
		link_app.solaris:
		@ if ${DETECT_GNU_LD}; then \
		$(DO_GNU_APP); \
		else \
		LDCMD=$(CC);\
		LDFLAGS="$(CFLAGS) -R $(LIBRPATH)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"; \
		fi; \
		$(LINK_APP)

		@@ -501,11 +347,9 @@ link_o.svr3:
		$(CALC_VERSIONS); \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS=''; \
		NOALLSYMSFLAGS=''; \
		SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
		SHAREDCMD='$(CC)'; \
		fi; \
		$(LINK_SO_O)
		link_a.svr3:
		@@ -515,22 +359,13 @@ link_a.svr3:
		$(CALC_VERSIONS); \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS=''; \
		NOALLSYMSFLAGS=''; \
		SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
		SHAREDCMD='$(CC)'; \
		fi; \
		$(LINK_SO_A_UNPACKED)
		link_app.svr3:
		@ if ${DETECT_GNU_LD}; then \
		$(DO_GNU_APP); \
		else \
		LDCMD=$(CC);\
		LDFLAGS="$(CFLAGS)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"; \
		fi; \
		@${DETECT_GNU_LD} && $(DO_GNU_APP); \
		$(LINK_APP)

		# UnixWare 7 and OpenUNIX 8 native compilers used
		@@ -540,14 +375,12 @@ link_o.svr5:
		else \
		$(CALC_VERSIONS); \
		SHARE_FLAG='-G'; \
		(${CC} -v 2>&1 \| grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
		($(CC) -v 2>&1 \| grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS=''; \
		NOALLSYMSFLAGS=''; \
		SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
		SHAREDCMD='$(CC)'; \
		fi; \
		$(LINK_SO_O)
		link_a.svr5:
		@@ -559,22 +392,13 @@ link_a.svr5:
		(${CC} -v 2>&1 \| grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS=''; \
		NOALLSYMSFLAGS=''; \
		SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
		SHAREDCMD='$(CC)'; \
		fi; \
		$(LINK_SO_A_UNPACKED)
		link_app.svr5:
		@ if ${DETECT_GNU_LD}; then \
		$(DO_GNU_APP); \
		else \
		LDCMD=$(CC);\
		LDFLAGS="$(CFLAGS)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"; \
		fi; \
		@${DETECT_GNU_LD} && $(DO_GNU_APP); \
		$(LINK_APP)

		link_o.irix:
		@@ -584,13 +408,11 @@ link_o.irix:
		$(CALC_VERSIONS); \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		MINUSWL=""; \
		($(CC) -v 2>&1 \| grep gcc) > /dev/null && MINUSWL="-Wl,"; \
		ALLSYMSFLAGS="$${MINUSWL}-all"; \
		NOALLSYMSFLAGS="$${MINUSWL}-none"; \
		SHAREDFLAGS="$(CFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \
		SHAREDCMD='$(CC)'; \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
		fi; \
		$(LINK_SO_O)
		link_a.irix:
		@@ -600,24 +422,15 @@ link_a.irix:
		$(CALC_VERSIONS); \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		MINUSWL=""; \
		($(CC) -v 2>&1 \| grep gcc) > /dev/null && MINUSWL="-Wl,"; \
		ALLSYMSFLAGS="$${MINUSWL}-all"; \
		NOALLSYMSFLAGS="$${MINUSWL}-none"; \
		SHAREDFLAGS="$(CFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \
		SHAREDCMD='$(CC)'; \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
		fi; \
		$(LINK_SO_A)
		link_app.irix:
		@ if ${DETECT_GNU_LD}; then \
		$(DO_GNU_APP); \
		else \
		LDCMD=$(CC);\
		LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"; \
		fi; \
		@LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \
		$(LINK_APP)

		# 32-bit PA-RISC HP-UX embeds the -L pathname of libs we link with, so
		@@ -634,12 +447,10 @@ link_o.hpux:
		SHLIB=lib$(LIBNAME).sl; \
		expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS='-Wl,-Fl'; \
		NOALLSYMSFLAGS=''; \
		expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
		SHAREDFLAGS="$(CFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \
		SHAREDCMD=$(CC); \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
		fi; \
		$(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
		link_a.hpux:
		@@ -648,20 +459,15 @@ link_a.hpux:
		SHLIB=lib$(LIBNAME).sl; \
		expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS='-Wl,-Fl'; \
		NOALLSYMSFLAGS=''; \
		expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
		SHAREDFLAGS="$(CFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \
		SHAREDCMD='$(CC)'; \
		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
		fi; \
		$(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
		link_app.hpux:
		@if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \
		LDCMD=$(CC);\
		LDFLAGS="$(CFLAGS) -Wl,+s,+cdp,../:,+cdp,./:,+b,$(LIBRPATH)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"; \
		fi; \
		$(LINK_APP)

		@@ -671,11 +477,9 @@ link_o.aix:
		OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS='-bnogc'; \
		NOALLSYMSFLAGS=''; \
		SHAREDFLAGS='$(CFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \
		SHAREDCMD='$(CC)'; \
		SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE'; \
		$(LINK_SO_O); rm -rf lib$(LIBNAME).exp
		link_a.aix:
		@ $(CALC_VERSIONS); \
		@@ -683,44 +487,31 @@ link_a.aix:
		OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS='-bnogc'; \
		NOALLSYMSFLAGS=''; \
		SHAREDFLAGS='$(CFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \
		SHAREDCMD='$(CC)'; \
		SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE'; \
		$(LINK_SO_A_VIA_O)
		link_app.aix:
		LDCMD=$(CC);\
		LDFLAGS="$(CFLAGS) -blibpath:$(LIBRPATH)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"
		$(LINK_APP)

		link_o.reliantunix:
		@ $(CALC_VERSIONS); \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS=; \
		NOALLSYMSFLAGS=''; \
		SHAREDFLAGS='$(CFLAGS) -G'; \
		SHAREDCMD='$(CC)'; \
		$(LINK_SO_O)
		link_a.reliantunix:
		@ $(CALC_VERSIONS); \
		SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS=; \
		NOALLSYMSFLAGS=''; \
		SHAREDFLAGS='$(CFLAGS) -G'; \
		SHAREDCMD='$(CC)'; \
		$(LINK_SO_A_UNPACKED)
		link_app.reliantunix:
		LDCMD=$(CC);\
		LDFLAGS="$(CFLAGS)"; \
		LIBDEPS="$(LIBDEPS)"; \
		APPNAME="$(APPNAME)"
		$(LINK_APP)

		# Targets to build symbolic links when needed

TABLE

+5 −32

Original line number	Diff line number	Diff line
		@@ -972,33 +972,6 @@ $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
		$ranlib =
		$arflags = -X 64

		*** alpha-cc-rpath
		$cc = cc
		$cflags = -std1 -tune host -fast -readonly_strings
		$unistd =
		$thread_cflag = -pthread
		$sys_id =
		$lflags =
		$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK
		$cpuid_obj =
		$bn_obj =
		$des_obj =
		$aes_obj =
		$bf_obj =
		$md5_obj =
		$sha1_obj =
		$cast_obj =
		$rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$dso_scheme = dlfcn
		$shared_target= tru64-shared-rpath
		$shared_cflag =
		$shared_ldflag =
		$shared_extension = .so
		$ranlib =
		$arflags =

		*** aux3-gcc
		$cc = gcc
		$cflags = -O2 -DTERMIO
		@@ -1156,7 +1129,7 @@ $rc5_obj =
		$dso_scheme =
		$shared_target= darwin-shared
		$shared_cflag = -fPIC
		$shared_ldflag =
		$shared_ldflag = -dunamiclib
		$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
		$ranlib =
		$arflags =
		@@ -1183,7 +1156,7 @@ $rc5_obj =
		$dso_scheme =
		$shared_target= darwin-shared
		$shared_cflag = -fPIC -fno-common
		$shared_ldflag =
		$shared_ldflag = -dynamiclib
		$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
		$ranlib =
		$arflags =
		@@ -1453,7 +1426,7 @@ $rc5_obj =
		$dso_scheme =
		$shared_target= darwin-shared
		$shared_cflag = -fPIC
		$shared_ldflag =
		$shared_ldflag = -dynamiclib
		$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
		$ranlib =
		$arflags =
		@@ -3989,9 +3962,9 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$dso_scheme = dlfcn
		$shared_target= tru64-shared
		$shared_target= alpha-osf1-shared
		$shared_cflag =
		$shared_ldflag =
		$shared_ldflag = -msym
		$shared_extension = .so
		$ranlib =
		$arflags =