diff options
| author | Rui Ueyama <ruiu@google.com> | 2015-06-15 03:03:23 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2015-06-15 03:03:23 +0000 |
| commit | f3770d3edb8d8e914f18542d52e41ebad9c80450 (patch) | |
| tree | 50814a951b8adff6f17f464b387573d35d4f71da | |
| parent | 55144e24237646da66d5aa77851b3af134759b9a (diff) | |
| download | bcm5719-llvm-f3770d3edb8d8e914f18542d52e41ebad9c80450.tar.gz bcm5719-llvm-f3770d3edb8d8e914f18542d52e41ebad9c80450.zip | |
COFF: Use ulittle32_t::operator|=. NFC.
llvm-svn: 239717
| -rw-r--r-- | lld/COFF/Writer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lld/COFF/Writer.cpp b/lld/COFF/Writer.cpp index b734469ce3e..811e3b760e1 100644 --- a/lld/COFF/Writer.cpp +++ b/lld/COFF/Writer.cpp @@ -84,7 +84,7 @@ void OutputSection::addChunk(Chunk *C) { } void OutputSection::addPermissions(uint32_t C) { - Header.Characteristics = Header.Characteristics | (C & PermMask); + Header.Characteristics |= C & PermMask; } // Write the section header to a given buffer. @@ -241,10 +241,10 @@ void Writer::writeHeader() { Buf += sizeof(*COFF); COFF->Machine = MachineType; COFF->NumberOfSections = OutputSections.size(); - COFF->Characteristics = - (IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_LARGE_ADDRESS_AWARE); + COFF->Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE; + COFF->Characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE; if (!Config->Relocatable) - COFF->Characteristics = COFF->Characteristics | IMAGE_FILE_RELOCS_STRIPPED; + COFF->Characteristics |= IMAGE_FILE_RELOCS_STRIPPED; COFF->SizeOfOptionalHeader = sizeof(pe32plus_header) + sizeof(data_directory) * NumberfOfDataDirectory; |
