From: Rui Ueyama <ruiu@google.com>
Date: Mon, 15 Jun 2015 18:03:47 +0000 (+0000)
Subject: COFF: Fix .reloc section attributes.
X-Git-Tag: llvmorg-3.7.0-rc1~2364
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc2cc7d0b8707a0278469b5bd12167d94807e4bd;p=platform%2Fupstream%2Fllvm.git

COFF: Fix .reloc section attributes.

llvm-svn: 239738
---

diff --git a/lld/COFF/Writer.h b/lld/COFF/Writer.h
index 0db88b7..1e4a9b9 100644
--- a/lld/COFF/Writer.h
+++ b/lld/COFF/Writer.h
@@ -20,9 +20,9 @@
 namespace lld {
 namespace coff {
 
-// Mask for section types (code, data or bss) and permissions
-// (writable, readable or executable).
-const uint32_t PermMask = 0xF00000F0;
+// Mask for section types (code, data, bss, disacardable, etc.)
+// and permissions (writable, readable or executable).
+const uint32_t PermMask = 0xFF0000F0;
 
 // OutputSection represents a section in an output file. It's a
 // container of chunks. OutputSection and Chunk are 1:N relationship.
diff --git a/lld/test/COFF/baserel.test b/lld/test/COFF/baserel.test
index 7313854..6c54310 100644
--- a/lld/test/COFF/baserel.test
+++ b/lld/test/COFF/baserel.test
@@ -66,7 +66,8 @@ BASEREL-HEADER-NEXT: PointerToRelocations: 0x0
 BASEREL-HEADER-NEXT: PointerToLineNumbers: 0x0
 BASEREL-HEADER-NEXT: RelocationCount: 0
 BASEREL-HEADER-NEXT: LineNumberCount: 0
-BASEREL-HEADER-NEXT: Characteristics [ (0x40000040)
+BASEREL-HEADER-NEXT: Characteristics [ (0x42000040)
 BASEREL-HEADER-NEXT:   IMAGE_SCN_CNT_INITIALIZED_DATA (0x40)
+BASEREL-HEADER-NEXT:   IMAGE_SCN_MEM_DISCARDABLE (0x2000000)
 BASEREL-HEADER-NEXT:   IMAGE_SCN_MEM_READ (0x40000000)
 BASEREL-HEADER-NEXT: ]