summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/ReleaseNotes.html4
-rw-r--r--lib/Target/ARM/ARMConstantIslandPass.cpp1
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html
index b9361a5773..dbeba16455 100644
--- a/docs/ReleaseNotes.html
+++ b/docs/ReleaseNotes.html
@@ -366,8 +366,8 @@ Release Notes</a>.</h1>
<p>New features of the ARM target include:</p>
<ul>
- <li>....</li>
-</ul>
+ <li>The constant island pass now supports basic block and constant pool entry
+ alignments greater than 4 bytes.</li> </ul>
</div>
diff --git a/lib/Target/ARM/ARMConstantIslandPass.cpp b/lib/Target/ARM/ARMConstantIslandPass.cpp
index 2039d41bf5..fc85666855 100644
--- a/lib/Target/ARM/ARMConstantIslandPass.cpp
+++ b/lib/Target/ARM/ARMConstantIslandPass.cpp
@@ -52,6 +52,7 @@ static cl::opt<bool>
AdjustJumpTableBlocks("arm-adjust-jump-tables", cl::Hidden, cl::init(true),
cl::desc("Adjust basic block layout to better use TB[BH]"));
+// FIXME: This option should be removed once it has received sufficient testing.
static cl::opt<bool>
AlignConstantIslands("arm-align-constant-islands", cl::Hidden, cl::init(true),
cl::desc("Align constant islands in code"));