From e06a19b85dfce9ea18be97247d4ca315963edc5c Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 26 Apr 2017 19:24:42 +0000
Subject: Vendor import of lld trunk r301441:
 https://llvm.org/svn/llvm-project/lld/trunk@301441

---
 COFF/ModuleDef.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'COFF/ModuleDef.cpp')

diff --git a/COFF/ModuleDef.cpp b/COFF/ModuleDef.cpp
index c9a40ac5ab8c..740ce867a7c4 100644
--- a/COFF/ModuleDef.cpp
+++ b/COFF/ModuleDef.cpp
@@ -38,6 +38,7 @@ enum Kind {
   Comma,
   Equal,
   KwBase,
+  KwConstant,
   KwData,
   KwExports,
   KwHeapsize,
@@ -92,6 +93,7 @@ public:
       StringRef Word = Buf.substr(0, End);
       Kind K = llvm::StringSwitch<Kind>(Word)
                    .Case("BASE", KwBase)
+                   .Case("CONSTANT", KwConstant)
                    .Case("DATA", KwData)
                    .Case("EXPORTS", KwExports)
                    .Case("HEAPSIZE", KwHeapsize)
@@ -227,6 +229,11 @@ private:
         E.Data = true;
         continue;
       }
+      if (Tok.K == KwConstant) {
+        warn("CONSTANT keyword is obsolete; use DATA");
+        E.Constant = true;
+        continue;
+      }
       if (Tok.K == KwPrivate) {
         E.Private = true;
         continue;
-- 
cgit v1.3