[PECOFF] Don't set IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE if "-fixed" is provided

Based on Ron Ofir's patch.

llvm-svn: 187221

Author: rui314

lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp

@@ -195,13 +195,14 @@ class PEHeaderChunk : public HeaderChunk {
     // be set, but regular binaries seem to have these bits, so we follow
     // them.
     uint16_t dllCharacteristics =
-        llvm::COFF::IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE |
         llvm::COFF::IMAGE_DLL_CHARACTERISTICS_NO_SEH;
     if (targetInfo.isTerminalServerAware())
       dllCharacteristics |=
           llvm::COFF::IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE;
     if (targetInfo.isNxCompat())
       dllCharacteristics |= llvm::COFF::IMAGE_DLL_CHARACTERISTICS_NX_COMPAT;
+    if (targetInfo.getBaseRelocationEnabled())
+      dllCharacteristics |= llvm::COFF::IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE;
     _peHeader.DLLCharacteristics = dllCharacteristics;
 
     _peHeader.SizeOfStackReserve = targetInfo.getStackReserve();

lld/test/pecoff/base-reloc.test

@@ -1,18 +1,30 @@
 # RUN: yaml2obj %p/Inputs/hello.obj.yaml > %t.obj
 #
 # RUN: lld -flavor link /out:%t1 /subsystem:console /force -- %t.obj \
-# RUN:   && llvm-objdump -s %t1 | FileCheck %s --check-prefix=BASEREL
+# RUN:   && llvm-objdump -s %t1 | FileCheck %s --check-prefix=BASEREL-SECTION
 #
 # RUN: lld -flavor link /out:%t1 /subsystem:console /force /fixed -- %t.obj \
-# RUN:   && llvm-objdump -s %t1 | FileCheck %s --check-prefix=NOBASEREL
+# RUN:   && llvm-objdump -s %t1 | FileCheck %s --check-prefix=NOBASEREL-SECTION
 
 # Because llvm-objdump cannot pretty-print the contents of .reloc section, we
 # have no choice other than comparing the result with this binary blob.
 #
 # TODO: Improve llvm-objdump to pretty print .reloc section as GNU binutil
 # objdump does.
 
-BASEREL: Contents of section .reloc:
-BASEREL-NEXT:  3000 00100000 0c000000 07300c30 00000000  .........0.0....
+BASEREL-SECTION: Contents of section .reloc:
+BASEREL-SECTION-NEXT:  3000 00100000 0c000000 07300c30 00000000  .........0.0....
 
-NOBASEREL-NOT: Contents of section .reloc:
+NOBASEREL-SECTION-NOT: Contents of section .reloc:
+
+# RUN: lld -flavor link /out:%t1 /subsystem:console /force -- %t.obj \
+# RUN:   && llvm-readobj -file-headers %t1 \
+# RUN:   | FileCheck %s --check-prefix=BASEREL-HEADER
+#
+# RUN: lld -flavor link /out:%t1 /subsystem:console /force /fixed -- %t.obj \
+# RUN:   && llvm-readobj -file-headers %t1 \
+# RUN:   | FileCheck %s --check-prefix=NOBASEREL-HEADER
+
+BASEREL-HEADER: IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE
+
+NOBASEREL-HEADER-NOT: IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE