diff options
author | Mark Mitchell <mark@codesourcery.com> | 2003-04-26 20:22:12 +0000 |
---|---|---|
committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2003-04-26 20:22:12 +0000 |
commit | e2b694230a73dbc6e0a2248fb8aba226ebdbc678 (patch) | |
tree | 96865b33cf18bd276d345c3631f8850670082729 | |
parent | 09b04f2d9f3a2fd97e9794dc7fc7857de4be971c (diff) | |
download | gcc-e2b694230a73dbc6e0a2248fb8aba226ebdbc678.zip gcc-e2b694230a73dbc6e0a2248fb8aba226ebdbc678.tar.gz gcc-e2b694230a73dbc6e0a2248fb8aba226ebdbc678.tar.bz2 |
* decl2.c (finish_file): Fix merge botch.
From-SVN: r66114
-rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
-rw-r--r-- | gcc/cp/decl2.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e4b5602..ddf0c3e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2003-04-26 Mark Mitchell <mark@codesourcery.com> + + * decl2.c (finish_file): Fix merge botch. + 2003-04-25 Mark Mitchell <mark@codesourcery.com> * decl2.c (finish_file): Don't call import_export_decl for diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index a52bdaa..cf63b38 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -2756,6 +2756,8 @@ finish_file () 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 |