This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
C++ PATCH: Fix mainline merge botch
- From: Mark Mitchell <mark at codesourcery dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Sat, 26 Apr 2003 13:26:08 -0700
- Subject: C++ PATCH: Fix mainline merge botch
- Reply-to: mark at codesourcery dot com
This patch should fix the mainline bootstrap failure; a patch I moved
over from the 3.3 branch didn't get merged in correctly.
Sorry!
--
Mark Mitchell
CodeSourcery, LLC
mark at codesourcery dot com
2003-04-26 Mark Mitchell <mark at codesourcery dot com>
* decl2.c (finish_file): Fix merge botch.
Index: decl2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/decl2.c,v
retrieving revision 1.620
diff -c -5 -p -r1.620 decl2.c
*** decl2.c 26 Apr 2003 01:27:06 -0000 1.620
--- decl2.c 26 Apr 2003 20:21:38 -0000
*************** finish_file ()
*** 2754,2763 ****
--- 2754,2765 ----
the use of undefined functions if there is no body for
the function. */
if (!DECL_SAVED_TREE (decl))
continue;
+ import_export_decl (decl);
+
/* We lie to the back-end, pretending that some functions
are not defined when they really are. This keeps these
functions from being put out unnecessarily. But, we must
stop lying when the functions are referenced, or if they
are not comdat since they need to be put out now. This