[gcc]

2012-02-07  Michael Meissner  <meissner@linux.vnet.ibm.com>

	* config/rs6000/rs6000.c (rs6000_trampoline_init): Fix error
	message for -mno-pointers-to-nested-function.

[gcc/testsuite]
2012-02-07  Michael Meissner  <meissner@linux.vnet.ibm.com>

	* gcc.target/powerpc/no-r11-3.c (outer_func): Fix error message
	for -mno-pointers-to-nested-functions.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@183976 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3d6fe25..da4ceb7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-07  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+       * config/rs6000/rs6000.c (rs6000_trampoline_init): Fix error
+       message for -mno-pointers-to-nested-function.
+
 2012-02-07  Eric Botcazou  <ebotcazou@adacore.com>
 
        PR middle-end/51994

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 39c0714..90be03e 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -24032,7 +24032,8 @@ rs6000_trampoline_init (rtx m_tramp, tree fndecl, rtx cxt)
        rtx fnmem, fn_reg, toc_reg;
 
        if (!TARGET_POINTERS_TO_NESTED_FUNCTIONS)
-         error ("-mno-r11 must not be used if you have trampolines");
+         error ("You cannot take the address of a nested function if you use "
+                "the -mno-pointers-to-nested-functions option.");
 
        fnmem = gen_const_mem (Pmode, force_reg (Pmode, fnaddr));
        fn_reg = gen_reg_rtx (Pmode);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a433613..47509f0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-07  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+       * gcc.target/powerpc/no-r11-3.c (outer_func): Fix error message
+       for -mno-pointers-to-nested-functions.
+
 2012-02-07  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc.c-torture/execute/20120207-1.c: New test.

diff --git a/gcc/testsuite/gcc.target/powerpc/no-r11-3.c b/gcc/testsuite/gcc.target/powerpc/no-r11-3.c
index c4b2448..c98797e 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/no-r11-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/no-r11-3.c
@@ -5,7 +5,7 @@
 extern void ext_call (int (func) (void));
 
 int
-outer_func (int init)  /* { dg-error "-mno-r11 must not be used if you have trampolines" "" } */
+outer_func (int init)  /* { dg-error "-mno-pointers-to-nested-functions option" "" } */
 {
   int value = init;