mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-02-06 06:33:24 +00:00
Support: correct Windows normalisation
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205130 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
a60d50cb9f
commit
b52cb5e0db
@ -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";
|
||||
|
@ -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"));
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user