Changeset 668

Timestamp:

Sep 9, 2003, 1:58:32 AM (22 years ago)

Author:

bird

Message:

#572,#570: Corrected mangling for C++.

Location:

trunk/src/gcc/gcc/config/i386

Files:

• emx.c (modified) (5 diffs, 1 prop)
• emx.h (modified) (1 diff, 1 prop)

trunk/src/gcc/gcc/config/i386/emx.c

@@ -123 +123 @@
 #endif
 
-int emx_c_set_decl_assembler_name (tree decl)
+int emx_c_set_decl_assembler_name (tree decl, bool fclass)
 {
   static int recurse;
@@ -132 +132 @@
   int rc = 1;
 
+  dfprintf((stderr, "emx_c_set_decl_assembler_name\n"));
+  DUMP(decl);
+
   /* Sometimes we recursively call DECL_ASSEMBLER_NAME to apply the default
      mangling rules for current compiler. */
@@ -141 +144 @@
     return 0;
 
-  dfprintf((stderr, "emx_c_set_decl_assembler_name\n"));
-  DUMP(decl);
-
   recurse++;
   type = TREE_TYPE (decl);
@@ -155 +155 @@
 
       oldsym = IDENTIFIER_POINTER (DECL_NAME (decl));
+      if (fclass)
+        return 0;
 
       /* Specifying '*' as first symbol character tells gcc (see varasm.c,
@@ -198 +200 @@
       /* Mangle decl as the former assembler name modified with a
          suffix consisting of an atsign (@) followed by the number of bytes of
-         arguments */
+         arguments.
+         For C++ the same applies as for optlink. See above. */
 
       int total = 0;

trunk/src/gcc/gcc/config/i386/emx.h

@@ -103 +103 @@
 
 /* Do our own mangling on some kinds of decls */
-extern int emx_c_set_decl_assembler_name PARAMS ((tree));
+extern int emx_c_set_decl_assembler_name PARAMS ((tree, _Bool));
 #define TARGET_C_SET_DECL_ASSEMBLER_NAME(decl) \
-  emx_c_set_decl_assembler_name (decl)
+  emx_c_set_decl_assembler_name (decl, 0)
 #define TARGET_CXX_SET_DECL_ASSEMBLER_NAME(decl) \
-  (DECL_LANG_SPECIFIC(decl) && DECL_FUNCTION_MEMBER_P (decl) ? 0 : \
-   emx_c_set_decl_assembler_name (decl))
+  (emx_c_set_decl_assembler_name (decl, DECL_LANG_SPECIFIC(decl) && DECL_FUNCTION_MEMBER_P (decl)))
 
 /* pretty warnings and errors in C++ */