aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Schuff <dschuff@chromium.org>2013-02-04 14:56:34 -0800
committerDerek Schuff <dschuff@chromium.org>2013-02-04 14:56:34 -0800
commitdbbbf3eb9d821f4ad3caab162ab70627fb32e10c (patch)
tree02efbe010c1a056a90271752379eb175715c5dce
parent334e37be3e88c1d125bc833531a7d3056cc606a9 (diff)
Remove the unnecessary hack and document the actually necessary one.
-rw-r--r--lib/MC/MCAssembler.cpp4
-rw-r--r--lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/MC/MCAssembler.cpp b/lib/MC/MCAssembler.cpp
index 0b572eeca8..416af8b46f 100644
--- a/lib/MC/MCAssembler.cpp
+++ b/lib/MC/MCAssembler.cpp
@@ -241,7 +241,9 @@ MCSectionData::MCSectionData(const MCSection &_Section, MCAssembler *A)
{
// @LOCALMOD-BEGIN
if (A) {
- // TODO(dschuff): Carryover from previous localmods. still necessary?
+ // Necessary for IRT building because the IRT loader expects the end of
+ // the section to be bundle-aligned. Padding happens with 0's though,
+ // so it's not really ideal. TODO(dschuff) figure out how to do it right.
A->getSectionList().push_back(this);
if (A->isBundlingEnabled() && _Section.UseCodeAlign())
setAlignment(A->getBundleAlignSize());
diff --git a/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp b/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
index b5d09fa925..50537ab050 100644
--- a/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
+++ b/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
@@ -146,8 +146,6 @@ private:
}
void EmitMappingSymbol(StringRef Name) {
- // @LOCALMOD, and a terrible hack which should be fixed ASAP
- return;
MCSymbol *Start = getContext().CreateTempSymbol();
EmitLabel(Start);