Commit df7cae35 authored by Richard Levitte's avatar Richard Levitte
Browse files

Apply the following changes from the main trunk: 

2001-10-10 16:46  levitte

	* Configure (1.294), Makefile.org (1.142): For systems where gcc is
	used and where we don't know if GNU ld is used or not, let's ask
	collect2 which ld it uses and choose to use the target
	do-gnu_shared if GNU ld is used.

	This solves the reported problems on Solaris systems where GNU cc
	is used but GNU ld isn't, and probably on other systems with
	similar setups.
parent eda75c31

Configure

+7 −7
Original line number Diff line number Diff line
@@ -132,21 +132,21 @@ my %table=( 
# surrounds it with #APP #NO_APP comment pair which (at least Solaris

# 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic"

# error message.

"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DNO_INLINE_ASM::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DNO_INLINE_ASM::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",



#### Solaris x86 with Sun C setups

"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",



#### SPARC Solaris with GNU C setups

"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

# gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8

# but keep the assembler modules.

"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

####

"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",



#### SPARC Solaris with Sun C setups

# DO NOT use /xO[34] on sparc with SC3.0.  It is broken, and will not pass the tests

Makefile.org

+75 −44
Original line number Diff line number Diff line
@@ -262,51 +262,77 @@ do_gnu-shared: 
	libs="$$libs -l$$i"; \

	done



DETECT_GNU_LD=${CC} -v 2>&1 | grep '^gcc' >/dev/null 2>&1 && \

	collect2=`gcc -print-prog-name=collect2 2>&1` && \

	[ -n "$$collect2" ] && \

	my_ld=`$$collect2 --help 2>&1 | grep Usage: | sed 's/^Usage: *\([^ ][^ ]*\).*/\1/'` && \

	[ -n "$$my_ld" ] && \

	$$my_ld -v 2>&1 | grep 'GNU ld' >/dev/null 2>&1



# This assumes that GNU utilities are *not* used

do_alpha-osf1-shared:

	if ${DETECT_GNU_LD}; then \

		$(MAKE) do_gnu-shared; \

	else \

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

	( set -x; ${CC}  -shared -no_archive -o lib$$i.so \

		( set -x; ${CC}  -shared -o lib$$i.so \

			-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \

			-all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \

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

	done

		done; \

	fi



# This assumes that GNU utilities are *not* used

# The difference between alpha-osf1-shared and tru64-shared is the `-msym'

# option passed to the linker.

do_tru64-shared:

	if ${DETECT_GNU_LD}; then \

		$(MAKE) do_gnu-shared; \

	else \

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

		( set -x; ${CC}  -shared -msym -o lib$$i.so \

			-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \

			-all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \

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

	done

		done; \

	fi



# This assumes that GNU utilities are *not* used

# The difference between tru64-shared and tru64-shared-rpath is the

# -rpath ${INSTALLTOP}/lib passed to the linker.

do_tru64-shared-rpath:

	if ${DETECT_GNU_LD}; then \

		$(MAKE) do_gnu-shared; \

	else \

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

		( set -x; ${CC}  -shared -msym -o lib$$i.so \

			-rpath  ${INSTALLTOP}/lib \

			-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \

			-all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \

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

	done

		done; \

	fi





# This assumes that GNU utilities are *not* used

do_solaris-shared:

	if ${DETECT_GNU_LD}; then \

		$(MAKE) do_gnu-shared; \

	else \

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

		( PATH=/usr/ccs/bin:$$PATH ; export PATH; \

		  set -x; ${CC}  -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

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

			-z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \

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

	done

		done; \

	fi



# UnixWare 7 and OpenUNIX 8 native compilers used

do_svr5-shared:

	if ${DETECT_GNU_LD}; then \

		$(MAKE) do_gnu-shared; \

	else \

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

		( PATH=/usr/ccs/bin:$$PATH ; export PATH; \

		  find . -name "*.o" -print > allobjs ; \
@@ -318,16 +344,21 @@ do_svr5-shared: 
			-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			$${OBJS} $$libs ${EX_LIBS} ) || exit 1; \

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

	done

		done; \

	fi



# This assumes that GNU utilities are *not* used

do_irix-shared:

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

	if ${DETECT_GNU_LD}; then \

		$(MAKE) do_gnu-shared; \

	else \

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

		( set -x; ${CC} -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

		-Wl,-soname,lib$$i.so.${SHLIB_MAJOR} \

			-Wl,-soname,lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			-all lib$$i.a $$libs ${EX_LIBS} -lc) || exit 1; \

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

	done

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

		done; \

	fi



# This assumes that GNU utilities are *not* used

do_hpux-shared: