From f5bb45f89564129fcaca25b9dd84750ffc02beed Mon Sep 17 00:00:00 2001
From: Jakob Stoklund Olesen <stoklund@2pi.dk>
Date: Fri, 16 Dec 2011 16:07:41 +0000
Subject: [PATCH] Note ARM constant island alignment in the release notes.

The command line option should be removed, but not until the feature has
gotten a lot of testing. The ARMConstantIslandPass tends to have subtle
bugs that only show up after a while.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@146739 91177308-0d34-0410-b5e6-96231b3b80d8
---
 docs/ReleaseNotes.html                   | 4 ++--
 lib/Target/ARM/ARMConstantIslandPass.cpp | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html
index b9361a57739..dbeba164557 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 2039d41bf5a..fc85666855c 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"));
-- 
2.34.1