[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  43f9e0a08cd434fc1320b0bf66798fe187ffdc6f (commit)
      from  1bcbf658a6ae99281b2b1c602b1076ea6af8d639 (commit)


- Log -----------------------------------------------------------------
commit 43f9e0a08cd434fc1320b0bf66798fe187ffdc6f
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 28 18:24:02 2017 +0100

    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: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2791)

-----------------------------------------------------------------------

Summary of changes:
 Makefile.shared | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.shared b/Makefile.shared
index 098e1ec..c86a370 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -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