* decl2.c (output_vtable_inherit): Use %cDIGIT in the operands.

	* class.c (build_vtable_entry_ref): Likewise.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c19dcd7..7873e86 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1998-09-01  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * decl2.c (output_vtable_inherit): Use %cDIGIT in the operands.
+       * class.c (build_vtable_entry_ref): Likewise.
+
 1998-09-01  Mark Mitchell  <mark@markmitchell.com>
 
        * cp-tree.h (DECL_FRIEND_PSEUDO_TEMPLATE_INSTANTIATION): New macro.

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 75ae6e3..bcdf957 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -431,7 +431,7 @@ build_vtable_entry (delta, pfn)
 /* We want to give the assembler the vtable identifier as well as
    the offset to the function pointer.  So we generate
 
-   __asm__ __volatile__ (".vtable_entry %0, %1"
+   __asm__ __volatile__ (".vtable_entry %c0, %c1"
       : : "s"(&class_vtable),
           "i"((long)&vtbl[idx].pfn - (long)&vtbl[0])); */
 
@@ -439,7 +439,7 @@ static void
 build_vtable_entry_ref (basetype, vtbl, idx)
      tree basetype, vtbl, idx;
 {
-  static char asm_stmt[] = ".vtable_entry %0, %1";
+  static char asm_stmt[] = ".vtable_entry %c0, %c1";
   tree s, i, i2;
 
   s = build_unary_op (ADDR_EXPR, TYPE_BINFO_VTABLE (basetype), 0);

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 1359475..f5c1031 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -2657,8 +2657,7 @@ finish_prevtable_vardecl (prev, vars)
 }
 
 /* We need to describe to the assembler the relationship between
-   a vtable and the vtable of the parent class.  It is not 
-   straightforward how to get this during multiple inheritance.  */
+   a vtable and the vtable of the parent class.  */
 
 static void
 output_vtable_inherit (vars)
@@ -2681,7 +2680,7 @@ output_vtable_inherit (vars)
   else
     my_friendly_abort (980826);
 
-  output_asm_insn (".vtable_inherit %0, %1", op);
+  output_asm_insn (".vtable_inherit %c0, %c1", op);
 }
 
 static int