diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-02-28 18:24:02 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-02-28 21:31:32 +0100 |
| commit | 43f9e0a08cd434fc1320b0bf66798fe187ffdc6f (patch) | |
| tree | 4416df294609a37cdbe23f3abc49f9b43f95385f /Makefile.shared | |
| parent | Fix handling of EVP_PKEY_CTRL_PKCS7_ENCRYPT/DECRYPT with OPENSSL_NO_CMS. (diff) | |
| download | openssl-43f9e0a08cd434fc1320b0bf66798fe187ffdc6f.tar.xz openssl-43f9e0a08cd434fc1320b0bf66798fe187ffdc6f.zip | |
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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2791)
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.shared b/Makefile.shared index 098e1ec6f2..c86a370c59 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 |