On Friday, September 19, 2014, Rui Ueyama <<a href="mailto:ruiu@google.com">ruiu@google.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Thu, Sep 18, 2014 at 11:09 PM, Saleem Abdulrasool <span dir="ltr"><<a href="javascript:_e(%7B%7D,'cvml','compnerd@compnerd.org');" target="_blank">compnerd@compnerd.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: compnerd<br>
Date: Fri Sep 19 01:09:30 2014<br>
New Revision: 218105<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=218105&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=218105&view=rev</a><br>
Log:<br>
Driver: accept /machine:arm for Windows linker<br>
<br>
Accept /machine:arm as an argument. This is changed to support ARM NT.<br>
Although there is no way to differentiate between ARM (Windows CE) and ARM NT<br>
(Windows on ARM), since LLVM currently only supports Windows on ARM, simply take<br>
/machine:arm to mean Windows on ARM.<br>
<br>
Modified:<br>
lld/trunk/lib/Driver/WinLinkDriver.cpp<br>
lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp<br>
lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp<br>
<br>
Modified: lld/trunk/lib/Driver/WinLinkDriver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkDriver.cpp?rev=218105&r1=218104&r2=218105&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkDriver.cpp?rev=218105&r1=218104&r2=218105&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/Driver/WinLinkDriver.cpp (original)<br>
+++ lld/trunk/lib/Driver/WinLinkDriver.cpp Fri Sep 19 01:09:30 2014<br>
@@ -188,8 +188,10 @@ static bool parseSubsystem(StringRef arg<br>
}<br>
<br>
static llvm::COFF::MachineTypes stringToMachineType(StringRef str) {<br>
+ // FIXME: we have no way to differentiate between ARM and ARMNT currently.<br>
+ // However, given that LLVM only supports ARM NT, default to that for now.<br>
return llvm::StringSwitch<llvm::COFF::MachineTypes>(str.lower())<br>
- .Case("arm", llvm::COFF::IMAGE_FILE_MACHINE_ARM)<br>
+ .Case("arm", llvm::COFF::IMAGE_FILE_MACHINE_ARMNT)<br>
.Case("ebc", llvm::COFF::IMAGE_FILE_MACHINE_EBC)<br>
.Case("x64", llvm::COFF::IMAGE_FILE_MACHINE_AMD64)<br>
.Case("x86", llvm::COFF::IMAGE_FILE_MACHINE_I386)<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp?rev=218105&r1=218104&r2=218105&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp?rev=218105&r1=218104&r2=218105&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp Fri Sep 19 01:09:30 2014<br>
@@ -74,10 +74,13 @@ bool PECOFFLinkingContext::validateImpl(<br>
return false;<br>
}<br>
<br>
- // Architectures other than x86/x64 is not supported yet.<br>
- if (_machineType != llvm::COFF::IMAGE_FILE_MACHINE_I386 &&<br>
- _machineType != llvm::COFF::IMAGE_FILE_MACHINE_AMD64) {<br>
- diagnostics << "Machine type other than x86/x64 is not supported.\n";<br>
+ switch (_machineType) {<br>
+ case llvm::COFF::IMAGE_FILE_MACHINE_I386:<br>
+ case llvm::COFF::IMAGE_FILE_MACHINE_AMD64:<br>
+ case llvm::COFF::IMAGE_FILE_MACHINE_ARMNT:<br>
+ break;<br>
+ default:<br>
+ diagnostics << "Machine type other than arm/x86/x86_64 is not supported.\n";<br>
return false;<br>
}<br>
<br>
<br>
Modified: lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp?rev=218105&r1=218104&r2=218105&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp?rev=218105&r1=218104&r2=218105&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp (original)<br>
+++ lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp Fri Sep 19 01:09:30 2014<br>
@@ -221,9 +221,8 @@ TEST_F(WinLinkParserTest, MachineX64) {<br>
}<br>
<br>
TEST_F(WinLinkParserTest, MachineArm) {<br>
- EXPECT_FALSE(parse("link.exe", "/machine:arm", "a.obj", nullptr));<br>
- EXPECT_TRUE(StringRef(errorMessage()).startswith(<br>
- "Machine type other than x86/x64 is not supported"));<br>
+ EXPECT_TRUE(parse("link.exe", "/machine:arm", "a.obj", nullptr));<br>
+ EXPECT_EQ(llvm::COFF::IMAGE_FILE_MACHINE_ARMNT, _context.getMachineType());<br>
}<br></blockquote><div><br></div><div>This was actually a negative test to verify that it prints out the error message for unsupported platform. Can you keep it by changing the input to something like /machine:ebc?</div></div></div></div></blockquote><div><br></div><div>Ah, good point. Will do that soon. What do you think of using an invalid machine specification instead of a random valid configuration?<span></span></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
TEST_F(WinLinkParserTest, MajorImageVersion) {<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="javascript:_e(%7B%7D,'cvml','llvm-commits@cs.uiuc.edu');" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>
</blockquote><br><br>-- <br>Saleem Abdulrasool<br>compnerd (at) compnerd (dot) org<br>