Commit 43f9e0a0 authored by Richard Levitte's avatar Richard Levitte
Browse files

Code health: Remove base address setting for mingw 



Base address setting was done for the sake of FIPS.  Since FIPS references
have been removed, we clean away this one as well.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2791)
parent 1bcbf658

Makefile.shared

+1 −2
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ link_shlib.mingw: 
	SHLIB_SOVER=-$$sover$$arch; \

	SHLIB_SUFFIX=.dll; \

	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \

	base=; [ $(LIBNAME) = "crypto" -a -n "$(FIPSCANLIB)" ] && base=-Wl,--image-base,0x63000000; \

	$(PERL) $(SRCDIR)/util/mkdef.pl 32 $(LIBNAME) \

		| sed -e 's|^\(LIBRARY  *\)$(LIBNAME)32|\1'"$$dll_name"'|' \

		> $(LIBNAME).def; \
@@ -312,7 +311,7 @@ link_shlib.mingw: 
		$(RC) $(SHARED_RCFLAGS) -o rc.o; \

	ALLSYMSFLAGS='-Wl,--whole-archive'; \

	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \

	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $(LIBNAME).def rc.o"; \

	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $(LIBNAME).def rc.o"; \

	$(LINK_SO_SHLIB) || exit 1; \

	rm $(LIBNAME).def rc.o