diff options
author | Derek Schuff <dschuff@chromium.org> | 2013-02-04 10:43:45 -0800 |
---|---|---|
committer | Derek Schuff <dschuff@chromium.org> | 2013-02-04 10:43:45 -0800 |
commit | 80abe0746cec97dd07ba74db157e85f6e83487a2 (patch) | |
tree | 3edb499ed31c708a87ec25f56d6918701d91c8e3 /lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp | |
parent | 3d5de9e56f3e5af59772bdf2cbedb0903d938bb8 (diff) |
Cherry-pick not-yet-committed upstream change to fix relaxation at bundle end
Diffstat (limited to 'lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp')
-rw-r--r-- | lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp b/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp index 39ded8fb57..b5d09fa925 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp +++ b/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp @@ -146,6 +146,8 @@ private: } void EmitMappingSymbol(StringRef Name) { + // @LOCALMOD, and a terrible hack which should be fixed ASAP + return; MCSymbol *Start = getContext().CreateTempSymbol(); EmitLabel(Start); @@ -197,5 +199,3 @@ namespace llvm { } } - - |