lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp - Issue 183273009: Prep for merging 3.4: Undo changes from 3.3 branch

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp

Issue 183273009: Prep for merging 3.4: Undo changes from 3.3 branch (Closed) Base URL: http://git.chromium.org/native_client/pnacl-llvm.git@master

Patch Set: Retry Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp

diff --git a/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp b/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp

index 7a84723ed56a643c7cdf9e4f63381be752bb2cfb..81a86dc5b781752d81a8a72c9ceeb49ceb78c0cc 100644

--- a/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp

+++ b/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp

@@ -107,8 +107,7 @@ unsigned PPCELFObjectWriter::getRelocTypeInner(const MCValue &Target,

case MCSymbolRefExpr::VK_PPC_DTPREL16_HA:

Type = ELF::R_PPC64_DTPREL16_HA;

break;

- case MCSymbolRefExpr::VK_PPC_GAS_HA16:

- case MCSymbolRefExpr::VK_PPC_DARWIN_HA16:

+ case MCSymbolRefExpr::VK_None:

Type = ELF::R_PPC_ADDR16_HA;

break;

case MCSymbolRefExpr::VK_PPC_TOC16_HA:

@@ -135,10 +134,6 @@ unsigned PPCELFObjectWriter::getRelocTypeInner(const MCValue &Target,

Type = ELF::R_PPC64_DTPREL16_LO;

break;

case MCSymbolRefExpr::VK_None:

- Type = ELF::R_PPC_ADDR16;

- break;

- case MCSymbolRefExpr::VK_PPC_GAS_LO16:

- case MCSymbolRefExpr::VK_PPC_DARWIN_LO16:

Type = ELF::R_PPC_ADDR16_LO;

break;

case MCSymbolRefExpr::VK_PPC_TOC_ENTRY:

@@ -161,10 +156,6 @@ unsigned PPCELFObjectWriter::getRelocTypeInner(const MCValue &Target,

case MCSymbolRefExpr::VK_None:

Type = ELF::R_PPC64_ADDR16_DS;

break;

- case MCSymbolRefExpr::VK_PPC_GAS_LO16:

- case MCSymbolRefExpr::VK_PPC_DARWIN_LO16:

- Type = ELF::R_PPC64_ADDR16_LO_DS;

- break;

case MCSymbolRefExpr::VK_PPC_TOC_ENTRY:

Type = ELF::R_PPC64_TOC16_DS;

break;

« no previous file with comments | « lib/Target/NVPTX/NVVMReflect.cpp ('k') | lib/Target/PowerPC/PPCBranchSelector.cpp » ('j') | no next file with comments »