RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-02 00:16:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support: correct Windows normalisation

Browse Source 
If the environment is unknown and no object file is provided, then assume an
"MSVC" environment, otherwise, set the environment to the object file format.

In the case that we have a known environment but a non-native file format for
Windows (COFF) which is used for MCJIT, then append the custom file format to
the triple as an additional component.

This fixes the MCJIT tests on Windows.

llvm-svn: 205130
This commit is contained in:
Saleem Abdulrasool 2014-03-30 07:19:31 +00:00
parent 735b5fcf3b
commit e7827c151a
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Support/Triple.cpp
View File

@ -434,6 +434,8 @@ std::string Triple::normalize(StringRef Str) {
if (Components.size() > 3)
Environment = parseEnvironment(Components[3]);
ObjectFormatType ObjectFormat = UnknownObjectFormat;
if (Components.size() > 4)
ObjectFormat = parseFormat(Components[4]);
// Note which components are already in their final position. These will not
// be moved.
@ -544,8 +546,16 @@ std::string Triple::normalize(StringRef Str) {
if (OS == Triple::Win32) {
Components.resize(4);
Components[2] = "windows";
if (Environment == UnknownEnvironment && ObjectFormat == UnknownObjectFormat)
Components[3] = "msvc";
if (Environment == UnknownEnvironment) {
if (ObjectFormat == UnknownObjectFormat)
Components[3] = "msvc";
else
Components[3] = getObjectFormatTypeName(ObjectFormat);
} else if (ObjectFormat != UnknownObjectFormat &&
ObjectFormat != Triple::COFF) {
Components.resize(5);
Components[4] = getObjectFormatTypeName(ObjectFormat);
}
} else if (OS == Triple::MinGW32) {
Components.resize(4);
Components[2] = "windows";

9
unittests/ADT/TripleTest.cpp
View File

@ -513,6 +513,13 @@ TEST(TripleTest, FileFormat) {
EXPECT_EQ(Triple::COFF, Triple("i686--win32").getObjectFormat());
EXPECT_EQ(Triple::ELF, Triple("i686-pc-windows-msvc-elf").getObjectFormat());
{
Triple Normalized(Triple::normalize("i686-pc-windows-msvc-elf"));
EXPECT_EQ(Triple::ELF, Normalized.getObjectFormat());
}
Triple T = Triple("");
T.setObjectFormat(Triple::ELF);
EXPECT_EQ(Triple::ELF, T.getObjectFormat());
@ -546,5 +553,7 @@ TEST(TripleTest, NormalizeWindows) {
EXPECT_EQ("x86_64--windows-macho", Triple::normalize("x86_64-win32-macho"));
EXPECT_EQ("i686-pc-windows-itanium", Triple::normalize("i686-pc-windows-itanium"));
EXPECT_EQ("i686-pc-windows-msvc", Triple::normalize("i686-pc-windows-msvc"));
}
}