1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b89cd9a29..72a5f274a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-05-01  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/conformtest.pl: If macro or constant types start
+	"promoted:", expect the symbol to be of the following type
+	promoted by the integer promotions.
+
 	* conform/conformtest.pl: Parse all "constant" and "macro" lines
 	in one place.  Also handle "macro-constant".