PATCH for missing JOINER on m68k-motorola-sysv

Manfred Hollstein manfred@s-direktnet.de
Fri Oct 9 08:06:00 GMT 1998


This particular configuration defines both "NO_DOLLAR_IN_LABEL" and
"NO_DOT_IN_LABEL".  If both are defined, cp-tree.h fails to provide a
definition for "JOINER", hence compilation of decl2.c fails.

I've adopted a similar solution to that used in class.c, but
perhaps we should add a

#define JOINER '_'

to the #else /* NO_DOT_IN_LABEL */ part in cp-tree.h?

Anyway, this patch allows me to continue building on this slooooow
platform ...

manfred


1998-10-08  Manfred Hollstein  <manfred@s-direktnet.de>

	* decl2.c (start_objects): Add new variable `joiner' and
	initialize it properly.

diff -rup -x CVS -x RCS -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-19981006.orig/gcc/cp/decl2.c egcs-19981006/gcc/cp/decl2.c
--- egcs-19981006.orig/gcc/cp/decl2.c	Mon Oct  5 11:41:05 1998
+++ egcs-19981006/gcc/cp/decl2.c	Thu Oct  8 15:50:59 1998
@@ -3066,10 +3066,17 @@ start_objects (method_type, initp)
 
   if (flag_init_priority)
     {
+      char joiner;
+
+#ifdef JOINER
+      joiner = JOINER;
+#else
+      joiner = '_';
+#endif
       if (initp == 0)
 	initp = DEFAULT_INIT_PRIORITY;
 
-      sprintf (type, "%c%c%.5u", method_type, JOINER, initp);
+      sprintf (type, "%c%c%.5u", method_type, joiner, initp);
     }
   else
     sprintf (type, "%c", method_type);



More information about the Gcc-patches mailing list