Commit 8196257f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Cross compilation updates.

parent ac923d33

Makefile.org

+8 −6
Original line number Diff line number Diff line
@@ -519,12 +519,14 @@ dclean: 
	@set -e; target=dclean; $(RECURSIVE_BUILD_CMD)



rehash: rehash.time

rehash.time: certs

	@(OPENSSL="`pwd`/util/opensslwrap.sh"; \

rehash.time: certs apps

	@if [ -z "$(CROSS_COMPILE)" ]; then \

		(OPENSSL="`pwd`/util/opensslwrap.sh"; \

		OPENSSL_DEBUG_MEMORY=on; \

		export OPENSSL OPENSSL_DEBUG_MEMORY; \

	  $(PERL) tools/c_rehash certs)

	touch rehash.time

		$(PERL) tools/c_rehash certs) && \

		touch rehash.time; \

	fi



test:   tests

apps/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -161,9 +161,11 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) 
		CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \

		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \

		link_app.$${shlib_target}

	-(cd ..; \

	@if [ -z "$(CROSS_COMPILE)" ]; then \

		(cd ..; \

	  	OPENSSL="`pwd`/util/opensslwrap.sh"; export OPENSSL; \

	  $(PERL) tools/c_rehash certs)

	  	$(PERL) tools/c_rehash certs) \

	fi



progs.h: progs.pl

	$(PERL) progs.pl $(E_EXE) >progs.h

fips/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -123,7 +123,11 @@ fips_premain_dso$(EXE_EXT): fips_premain.c 
		$(FIPSLIBDIR)fipscanister.o ../libcrypto.a $(EX_LIBS)

# this is executed only when linking with external fipscanister.o

fips_standalone_sha1$(EXE_EXT):	sha/fips_standalone_sha1.c

	$(CC) $(CFLAGS) -DFIPSCANISTER_O -o $@ sha/fips_standalone_sha1.c $(FIPSLIBDIR)fipscanister.o $(EX_LIBS)

	if [ -z $(HOSTCC) ] ; then \

		$(CC) $(CFLAGS) -DFIPSCANISTER_O -o $@ sha/fips_standalone_sha1.c $(FIPSLIBDIR)fipscanister.o $(EX_LIBS) ; \

	else \

		$(HOSTCC) $(HOSTCFLAGS) -o $ $@ -I../include -I../crypto sha/fips_standalone_sha1.c ../crypto/sha/sha1dgst.c ; \

	fi



subdirs:

	@target=all; $(RECURSIVE_MAKE)

fips/fipsld

+10 −2
Original line number Diff line number Diff line
@@ -117,7 +117,11 @@ lib*|*.dll) # must be linking a shared lib... 
		${_WL_PREMAIN} "$@"



	# generate signature...

	if [ -z "${FIPS_SIG}" ]; then

		SIG=`"${THERE}/fips/fips_premain_dso" "${TARGET}"`

	else

		SIG=`"${FIPS_SIG}" -dso "${TARGET}"`

	fi

	/bin/rm -f "${TARGET}"

	if [ -z "${SIG}" ]; then

	   echo "unable to collect signature"; exit 1
@@ -156,7 +160,11 @@ lib*|*.dll) # must be linking a shared lib... 
		${_WL_PREMAIN} "$@"



	# generate signature...

	if [ -z "${FIPS_SIG}" ]; then

		SIG=`"${TARGET}"`

	else

		SIG=`"${FIPS_SIG}" -exe "${TARGET}"`

	fi

	/bin/rm -f "${TARGET}"

	if [ -z "${SIG}" ]; then

	   echo "unable to collect signature"; exit 1

fips/sha/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -46,8 +46,12 @@ lib: $(LIBOBJ) 
	@echo $(LIBOBJ) > lib



../fips_standalone_sha1$(EXE_EXT): fips_standalone_sha1.o

	if [ -z "$(HOSTCC)" ] ; then \

	FIPS_SHA_ASM=""; for i in $(SHA1_ASM_OBJ) sha1dgst.o ; do FIPS_SHA_ASM="$$FIPS_SHA_ASM ../../crypto/sha/$$i" ; done; \

	$(CC) -o $@ $(CFLAGS) fips_standalone_sha1.o $$FIPS_SHA_ASM

	$(CC) -o $@ $(CFLAGS) fips_standalone_sha1.o $$FIPS_SHA_ASM ; \

	else \

		$(HOSTCC) $(HOSTCFLAGS) -o $ $@ -I../../include -I../../crypto fips_standalone_sha1.c ../../crypto/sha/sha1dgst.c ; \

	fi



files:

	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO