2004-10-01 Eric Christopher <echristo@redhat.com>

	* dwarf2.h (dwarf_calling_convention): Add GNU prefix to
	locally defined enum.
	* dwarf2out.c (add_calling_convention_attribute): Don't
	emit DW_CC_normal.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 758866c..f1b0396 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-01  Eric Christopher  <echristo@redhat.com>
+
+       * dwarf2.h (dwarf_calling_convention): Add GNU prefix to
+       locally defined enum.
+       * dwarf2out.c (add_calling_convention_attribute): Don't
+       emit DW_CC_normal.
+
 2004-10-03  Andrew Pinski  <pinskia@physics.uc.edu>
 
        PR c/17178, PR c/17820

diff --git a/gcc/dwarf2.h b/gcc/dwarf2.h
index 111ff52..4199aa4 100644 (file)
--- a/gcc/dwarf2.h
+++ b/gcc/dwarf2.h
@@ -475,7 +475,7 @@ enum dwarf_calling_convention
     DW_CC_normal = 0x1,
     DW_CC_program = 0x2,
     DW_CC_nocall = 0x3,
-    DW_CC_renesas_sh = 0x40
+    DW_CC_GNU_renesas_sh = 0x40
   };
 
 #define DW_CC_lo_user 0x40

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index aa30848..11bf0f8 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -10631,8 +10631,9 @@ add_calling_convention_attribute (dw_die_ref subr_die, tree type)
 
   value = targetm.dwarf_calling_convention (type);
 
-  /* Only add the attribute if the backend requests it.  */
-  if (value)
+  /* Only add the attribute if the backend requests it, and
+     is not DW_CC_normal.  */
+  if (value && (value != DW_CC_normal))
     add_AT_unsigned (subr_die, DW_AT_calling_convention, value);
 }