This is an archive of the discontinued LLVM Phabricator instance.

Differential D14758

Handle ARMv7K as an alias, instead of fake architecture (NFC)
AbandonedPublic

Authored by tyomitch on Nov 17 2015, 2:34 PM.

Details

Reviewers
rengolin
t.p.northover
Summary

Clang-side update, corresponding to D14757

Diff Detail

Event Timeline

tyomitch updated this revision to Diff 40437.Nov 17 2015, 2:34 PM
tyomitch retitled this revision from to Handle ARMv7K as an alias, instead of fake architecture (NFC).
tyomitch updated this object.
tyomitch added reviewers: t.p.northover, rengolin.
tyomitch added a subscriber: cfe-commits.
Herald added subscribers: rengolin, aemerson. · View Herald TranscriptNov 17 2015, 2:34 PM
tyomitch added a parent revision: D14757: Handle ARMv7K as an alias, instead of fake architecture (NFC).Nov 17 2015, 2:42 PM
rengolin requested changes to this revision.Nov 18 2015, 3:49 AM
rengolin edited edge metadata.
rengolin added inline comments.
lib/Driver/Tools.cpp
6298

This doesn't fix the "horrible hack".

This revision now requires changes to proceed.Nov 18 2015, 3:49 AM
tyomitch abandoned this revision.Nov 20 2015, 8:51 AM

Revision Contents

PathSize
lib/
Driver/
8 lines

Diff 40437

lib/Driver/Tools.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 6,289 Lines • ▼ Show 20 Lines
} }
/// getLLVMArchSuffixForARM - Get the LLVM arch name to use for a particular /// getLLVMArchSuffixForARM - Get the LLVM arch name to use for a particular
/// CPU (or Arch, if CPU is generic). /// CPU (or Arch, if CPU is generic).
// FIXME: This is redundant with -mcpu, why does LLVM use this. // FIXME: This is redundant with -mcpu, why does LLVM use this.
StringRef arm::getLLVMArchSuffixForARM(StringRef CPU, StringRef Arch, StringRef arm::getLLVMArchSuffixForARM(StringRef CPU, StringRef Arch,
const llvm::Triple &Triple) { const llvm::Triple &Triple) {
unsigned ArchKind; unsigned ArchKind;
if (Arch == "armv7k" || Arch == "thumbv7k")
rengolinUnsubmitted
Not Done
ReplyInline Actions

This doesn't fix the "horrible hack".

rengolin: This doesn't fix the "horrible hack".
return "v7k"; // In other cases, Cortex-A7 should resolve to ARMv7-A
if (CPU == "generic") { if (CPU == "generic") {
std::string ARMArch = tools::arm::getARMArch(Arch, Triple); std::string ARMArch = tools::arm::getARMArch(Arch, Triple);
ArchKind = llvm::ARM::parseArch(ARMArch); ArchKind = llvm::ARM::parseArch(ARMArch);
if (ArchKind == llvm::ARM::AK_INVALID) if (ArchKind == llvm::ARM::AK_INVALID)
// In case of generic Arch, i.e. "arm", // In case of generic Arch, i.e. "arm",
// extract arch from default cpu of the Triple // extract arch from default cpu of the Triple
ArchKind = llvm::ARM::parseCPUArch(Triple.getARMCPUForArch(ARMArch)); ArchKind = llvm::ARM::parseCPUArch(Triple.getARMCPUForArch(ARMArch));
} else { } else {
// FIXME: horrible hack to get around the fact that Cortex-A7 is only an ArchKind = llvm::ARM::parseCPUArch(CPU);
// armv7k triple if it's actually been specified via "-arch armv7k".
ArchKind = (Arch == "armv7k" || Arch == "thumbv7k")
? (unsigned)llvm::ARM::AK_ARMV7K
: llvm::ARM::parseCPUArch(CPU);
} }
if (ArchKind == llvm::ARM::AK_INVALID) if (ArchKind == llvm::ARM::AK_INVALID)
return ""; return "";
return llvm::ARM::getSubArch(ArchKind); return llvm::ARM::getSubArch(ArchKind);
} }
void arm::appendEBLinkFlags(const ArgList &Args, ArgStringList &CmdArgs, void arm::appendEBLinkFlags(const ArgList &Args, ArgStringList &CmdArgs,
const llvm::Triple &Triple) { const llvm::Triple &Triple) {
▲ Show 20 Lines • Show All 3,978 Lines • Show Last 20 Lines