* config/arm/pe.c (arm_mark_dllimport): Don't use xxx_with_decl.

	* config/mcore/mcore.c (mcore_mark_dllimport): Likewise.
	* config/v850/v850.c (v850_handle_data_area_attribute): Likewise.
	(v850_handle_data_area_attribute): Likewise.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d5448ea..4d95cae 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-26  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+       * config/arm/pe.c (arm_mark_dllimport): Don't use xxx_with_decl.
+       * config/mcore/mcore.c (mcore_mark_dllimport): Likewise.
+       * config/v850/v850.c (v850_handle_data_area_attribute): Likewise.
+       (v850_handle_data_area_attribute): Likewise.
+
 2003-07-26  Geoffrey Keating  <geoffk@apple.com>
 
        * Makefile.in (libbackend.o): Remove options_.h.

diff --git a/gcc/config/arm/pe.c b/gcc/config/arm/pe.c
index 1413eee..d9d54c1 100644 (file)
--- a/gcc/config/arm/pe.c
+++ b/gcc/config/arm/pe.c
@@ -167,7 +167,8 @@ arm_mark_dllimport (decl)
       && !DECL_VIRTUAL_P (decl)
       && DECL_INITIAL (decl))
     {
-      error_with_decl (decl, "initialized variable `%s' is marked dllimport");
+      error ("%Hinitialized variable '%D' is marked dllimport",
+             &DECL_SOURCE_LOCATION (decl), decl);
       return;
     }
   /* Nor can they be static.  */
@@ -176,7 +177,8 @@ arm_mark_dllimport (decl)
       && !DECL_VIRTUAL_P (decl)
       && 0 /*???*/)
     {
-      error_with_decl (decl, "static variable `%s' is marked dllimport");
+      error ("%Hstatic variable '%D' is marked dllimport",
+             &DECL_SOURCE_LOCATION (decl), decl);
       return;
     }
 

diff --git a/gcc/config/mcore/mcore.c b/gcc/config/mcore/mcore.c
index 59c04d6..786ce0c 100644 (file)
--- a/gcc/config/mcore/mcore.c
+++ b/gcc/config/mcore/mcore.c
@@ -3410,7 +3410,8 @@ mcore_mark_dllimport (decl)
       && !DECL_VIRTUAL_P (decl)
       && DECL_INITIAL (decl))
     {
-      error_with_decl (decl, "initialized variable `%s' is marked dllimport");
+      error ("%Hinitialized variable '%D' is marked dllimport",
+             &DECL_SOURCE_LOCATION (decl), decl);
       return;
     }
   

diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index 4db79a9..8da1669 100644 (file)
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -2257,8 +2257,8 @@ v850_handle_data_area_attribute (node, name, args, flags, no_add_attrs)
     case VAR_DECL:
       if (current_function_decl != NULL_TREE)
        {
-         error_with_decl (decl, "\
-a data area attribute cannot be specified for local variables");
+          error ("%Ha data area attribute cannot be specified for "
+                 "local variables", &DECL_SOURCE_LOCATION (decl), decl);
          *no_add_attrs = true;
        }
 
@@ -2268,8 +2268,8 @@ a data area attribute cannot be specified for local variables");
       area = v850_get_data_area (decl);
       if (area != DATA_AREA_NORMAL && data_area != area)
        {
-         error_with_decl (decl, "\
-data area of '%s' conflicts with previous declaration");
+         error ("%Hdata area of '%D' conflicts with previous declaration",
+                 &DECL_SOURCE_LOCATION (decl), decl);
          *no_add_attrs = true;
        }
       break;