From badd8df972e158548d7014a193e44ff1bce55686 Mon Sep 17 00:00:00 2001 From: Anton Korobeynikov Date: Sat, 19 Jul 2008 21:44:57 +0000 Subject: [PATCH] Unbreak build: 'DarwinTargetAsmInfo' was already taken as PPC TAI flavour. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@53801 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/PowerPC/PPCTargetAsmInfo.cpp | 14 ++++++++------ lib/Target/PowerPC/PPCTargetAsmInfo.h | 8 ++++---- lib/Target/PowerPC/PPCTargetMachine.cpp | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/Target/PowerPC/PPCTargetAsmInfo.cpp b/lib/Target/PowerPC/PPCTargetAsmInfo.cpp index 058de655efa..75868d4a591 100644 --- a/lib/Target/PowerPC/PPCTargetAsmInfo.cpp +++ b/lib/Target/PowerPC/PPCTargetAsmInfo.cpp @@ -32,7 +32,7 @@ PPCTargetAsmInfo::PPCTargetAsmInfo(const PPCTargetMachine &TM) { AssemblerDialect = TM.getSubtargetImpl()->getAsmFlavor(); } -DarwinTargetAsmInfo::DarwinTargetAsmInfo(const PPCTargetMachine &TM) +PPCDarwinTargetAsmInfo::PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM) : PPCTargetAsmInfo(TM) { PCSymbol = "."; @@ -93,8 +93,9 @@ DarwinTargetAsmInfo::DarwinTargetAsmInfo(const PPCTargetMachine &TM) /// format used for encoding pointers in exception handling data. Reason is /// 0 for data, 1 for code labels, 2 for function pointers. Global is true /// if the symbol can be relocated. -unsigned DarwinTargetAsmInfo::PreferredEHDataFormat(DwarfEncoding::Target Reason, - bool Global) const { +unsigned +PPCDarwinTargetAsmInfo::PreferredEHDataFormat(DwarfEncoding::Target Reason, + bool Global) const { if (Reason == DwarfEncoding::Functions && Global) return (DW_EH_PE_pcrel | DW_EH_PE_indirect | DW_EH_PE_sdata4); else if (Reason == DwarfEncoding::CodeLabels || !Global) @@ -104,7 +105,7 @@ unsigned DarwinTargetAsmInfo::PreferredEHDataFormat(DwarfEncoding::Target Reason } -LinuxTargetAsmInfo::LinuxTargetAsmInfo(const PPCTargetMachine &TM) +PPCLinuxTargetAsmInfo::PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM) : PPCTargetAsmInfo(TM) { CommentString = "#"; @@ -155,8 +156,9 @@ LinuxTargetAsmInfo::LinuxTargetAsmInfo(const PPCTargetMachine &TM) /// format used for encoding pointers in exception handling data. Reason is /// 0 for data, 1 for code labels, 2 for function pointers. Global is true /// if the symbol can be relocated. -unsigned LinuxTargetAsmInfo::PreferredEHDataFormat(DwarfEncoding::Target Reason, - bool Global) const { +unsigned +PPCLinuxTargetAsmInfo::PreferredEHDataFormat(DwarfEncoding::Target Reason, + bool Global) const { // We really need to write something here. return TargetAsmInfo::PreferredEHDataFormat(Reason, Global); } diff --git a/lib/Target/PowerPC/PPCTargetAsmInfo.h b/lib/Target/PowerPC/PPCTargetAsmInfo.h index 4884628b2e7..cca7bdb3e26 100644 --- a/lib/Target/PowerPC/PPCTargetAsmInfo.h +++ b/lib/Target/PowerPC/PPCTargetAsmInfo.h @@ -25,14 +25,14 @@ namespace llvm { explicit PPCTargetAsmInfo(const PPCTargetMachine &TM); }; - struct DarwinTargetAsmInfo : public PPCTargetAsmInfo { - explicit DarwinTargetAsmInfo(const PPCTargetMachine &TM); + struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo { + explicit PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM); virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason, bool Global) const; }; - struct LinuxTargetAsmInfo : public PPCTargetAsmInfo { - explicit LinuxTargetAsmInfo(const PPCTargetMachine &TM); + struct PPCLinuxTargetAsmInfo : public PPCTargetAsmInfo { + explicit PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM); virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason, bool Global) const; }; diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp index cfec534ac20..8fa0809c1a7 100644 --- a/lib/Target/PowerPC/PPCTargetMachine.cpp +++ b/lib/Target/PowerPC/PPCTargetMachine.cpp @@ -27,9 +27,9 @@ Y("ppc64", " PowerPC 64"); const TargetAsmInfo *PPCTargetMachine::createTargetAsmInfo() const { if (Subtarget.isDarwin()) - return new DarwinTargetAsmInfo(*this); + return new PPCDarwinTargetAsmInfo(*this); else - return new LinuxTargetAsmInfo(*this); + return new PPCLinuxTargetAsmInfo(*this); } unsigned PPC32TargetMachine::getJITMatchQuality() { -- 2.34.1