From eb11fae6d08f479c0799db45860a98af528fa6e7 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 28 Jul 2018 10:51:19 +0000 Subject: Vendor import of llvm trunk r338150: https://llvm.org/svn/llvm-project/llvm/trunk@338150 --- lib/Object/COFFModuleDefinition.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'lib/Object/COFFModuleDefinition.cpp') diff --git a/lib/Object/COFFModuleDefinition.cpp b/lib/Object/COFFModuleDefinition.cpp index a571354648d6..c703071b86e0 100644 --- a/lib/Object/COFFModuleDefinition.cpp +++ b/lib/Object/COFFModuleDefinition.cpp @@ -37,6 +37,7 @@ enum Kind { Identifier, Comma, Equal, + EqualEqual, KwBase, KwConstant, KwData, @@ -104,9 +105,10 @@ public: } case '=': Buf = Buf.drop_front(); - // GNU dlltool accepts both = and ==. - if (Buf.startswith("=")) + if (Buf.startswith("=")) { Buf = Buf.drop_front(); + return Token(EqualEqual, "=="); + } return Token(Equal, "="); case ',': Buf = Buf.drop_front(); @@ -282,6 +284,13 @@ private: E.Private = true; continue; } + if (Tok.K == EqualEqual) { + read(); + E.AliasTarget = Tok.Value; + if (Machine == IMAGE_FILE_MACHINE_I386 && !isDecorated(E.AliasTarget, MingwDef)) + E.AliasTarget = std::string("_").append(E.AliasTarget); + continue; + } unget(); Info.Exports.push_back(E); return Error::success(); -- cgit v1.2.3