73 lines
2.6 KiB
Diff
73 lines
2.6 KiB
Diff
diff -Naur old/src/plugins/projectexplorer/abi.cpp new/src/plugins/projectexplorer/abi.cpp
|
|
--- old/src/plugins/projectexplorer/abi.cpp 2021-06-08 15:11:07.000000000 +0300
|
|
+++ new/src/plugins/projectexplorer/abi.cpp 2021-06-11 15:18:59.406846169 +0300
|
|
@@ -164,6 +164,8 @@
|
|
return Abi::AvrArchitecture;
|
|
if (arch.startsWith("asmjs"))
|
|
return Abi::AsmJsArchitecture;
|
|
+ if (arch.startsWith("e2k"))
|
|
+ return Abi::E2KArchitecture;
|
|
|
|
return Abi::UnknownArchitecture;
|
|
}
|
|
@@ -381,6 +383,8 @@
|
|
case 50: // EM_IA_64
|
|
result.append(Abi(Abi::ItaniumArchitecture, os, flavor, Abi::ElfFormat, 64));
|
|
break;
|
|
+ case 175: // EM_MCST_ELBRUS
|
|
+ result.append(Abi(Abi::E2KArchitecture, os, flavor, Abi::ElfFormat, 64));
|
|
default:
|
|
;
|
|
}
|
|
@@ -624,6 +628,8 @@
|
|
width = 32;
|
|
} else if (p.startsWith("asmjs")) {
|
|
arch = AsmJsArchitecture;
|
|
+ } else if (p.startsWith("e2k")) {
|
|
+ arch = E2KArchitecture;
|
|
} else if (p == "none") {
|
|
os = BareMetalOS;
|
|
flavor = GenericFlavor;
|
|
@@ -801,6 +807,8 @@
|
|
return QLatin1String("cr16");
|
|
case RiscVArchitecture:
|
|
return QLatin1String("riscv");
|
|
+ case E2KArchitecture:
|
|
+ return QLatin1String("e2k");
|
|
case UnknownArchitecture:
|
|
Q_FALLTHROUGH();
|
|
default:
|
|
@@ -975,6 +983,8 @@
|
|
return XtensaArchitecture;
|
|
if (a == "asmjs")
|
|
return AsmJsArchitecture;
|
|
+ if (a == "e2k")
|
|
+ return E2KArchitecture;
|
|
|
|
return UnknownArchitecture;
|
|
}
|
|
diff -Naur old/src/plugins/projectexplorer/abi.h new/src/plugins/projectexplorer/abi.h
|
|
--- old/src/plugins/projectexplorer/abi.h 2021-06-08 15:11:07.000000000 +0300
|
|
+++ new/src/plugins/projectexplorer/abi.h 2021-06-11 15:13:49.376113153 +0300
|
|
@@ -76,6 +76,7 @@
|
|
R32CArchitecture,
|
|
CR16Architecture,
|
|
RiscVArchitecture,
|
|
+ E2KArchitecture,
|
|
UnknownArchitecture
|
|
};
|
|
|
|
diff -Naur old/src/plugins/projectexplorer/gcctoolchain.cpp new/src/plugins/projectexplorer/gcctoolchain.cpp
|
|
--- old/src/plugins/projectexplorer/gcctoolchain.cpp 2021-06-08 15:11:07.000000000 +0300
|
|
+++ new/src/plugins/projectexplorer/gcctoolchain.cpp 2021-06-11 15:18:18.877960735 +0300
|
|
@@ -656,6 +656,9 @@
|
|
|| abi.osFlavor() != host.osFlavor()) // Note: This can fail:-(
|
|
return {};
|
|
|
|
+ if (abi.architecture() == Abi::E2KArchitecture)
|
|
+ return {"linux-lcc"};
|
|
+
|
|
if (abi.os() == Abi::DarwinOS) {
|
|
QString v = version();
|
|
// prefer versioned g++ on macOS. This is required to enable building for older macOS versions
|