Miscellaneous cvs wackiness: remove resurrected files and `solve'

artificial conflicts.

3 files changed, 6 insertions, 264 deletions

diff --git a/gnu/egcs/gcc/collect2.c b/gnu/egcs/gcc/collect2.c
index 56ab9cd5e57..42329c0c661 100644
--- a/gnu/egcs/gcc/collect2.c
+++ b/gnu/egcs/gcc/collect2.c
@@ -3043,21 +3043,11 @@ scan_prog_file (prog_name, which_pass)
 
 #ifdef COLLECT_EXPORT_LIST
 
-/* This new function is used to decide whether we should
-   generate import list for an object or to use it directly.  */
+/* Never generate import list (gcc-2.95 branch).  */
 static int
 use_import_list (prog_name)
      char *prog_name;
 {
-  char *p;
-
-  /* If we do not build a shared object then import list should not be used.  */
-  if (! shared_obj) return 0;
-
-  /* Currently we check only for libgcc, but this can be changed in future.  */
-  p = strstr (prog_name, "libgcc.a");
-  if (p != 0 && (strlen (p) == sizeof ("libgcc.a") - 1))
-    return 1;
   return 0;
 }
 
diff --git a/gnu/egcs/gcc/cp/decl.c b/gnu/egcs/gcc/cp/decl.c
index 4b6770d15ac..6a6aeddb4a0 100644
--- a/gnu/egcs/gcc/cp/decl.c
+++ b/gnu/egcs/gcc/cp/decl.c
@@ -8967,9 +8967,12 @@ grokfndecl (ctype, type, declarator, orig_declarator, virtualp, flags, quals,
 					    template_count, 
 					    2 * (funcdef_flag != 0) + 
 					    4 * (friendp != 0));
+
       if (decl == error_mark_node)
 	return NULL_TREE;
 
+      maybe_vlist_ctor_wrapper (decl, funcdef_flag);
+
       if ((! TYPE_FOR_JAVA (ctype) || check_java_method (decl))
 	  && check)
 	{
@@ -12171,6 +12174,8 @@ grok_ctor_properties (ctype, decl)
       parmtype = TREE_VALUE (parmtypes);
     }
 
+  maybe_vlist_ctor_wrapper (decl, 0);
+
   /* [class.copy]
 
      A non-template constructor for class X is a copy constructor if
diff --git a/gnu/egcs/gcc/typescript b/gnu/egcs/gcc/typescript
deleted file mode 100644
index ab590382d5b..00000000000
--- a/gnu/egcs/gcc/typescript
+++ /dev/null
@@ -1,253 +0,0 @@
-Script started on Sun Sep 24 17:20:02 2000
-$ cvs -d /cvs import src/gnu/egcs/gcc CYGNUS GCC-2_95_pre3_20000916


-)07[?47h[?1h=
-CVS: ----------------------------------------------------------------------

-CVS: Enter Log.  Lines beginning with `CVS:' are removed automatically

-CVS:

-CVS: ----------------------------------------------------------------------

-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~
-~/tmp/cvsblqmx28670: unmodified: line 1Snych Synch with FSF stable tree
Copying file for recovery...

/tmp/cvsblqmx28670: 5 lines, 256 characters[?1l>

-[?47l8
[?1l>I src/gnu/egcs/gcc/CVS

-U src/gnu/egcs/gcc/.cvsignore

-U src/gnu/egcs/gcc/.gdbinit

-U src/gnu/egcs/gcc/ABOUT-GCC-NLS

-U src/gnu/egcs/gcc/ABOUT-NLS

-U src/gnu/egcs/gcc/BUGS

-U src/gnu/egcs/gcc/COPYING

-U src/gnu/egcs/gcc/COPYING.LIB

-U src/gnu/egcs/gcc/ChangeLog

-U src/gnu/egcs/gcc/ChangeLog.0

-U src/gnu/egcs/gcc/ChangeLog.lib

-U src/gnu/egcs/gcc/FSFChangeLog

-U src/gnu/egcs/gcc/FSFChangeLog.10

-U src/gnu/egcs/gcc/FSFChangeLog.11

-U src/gnu/egcs/gcc/INSTALL

-U src/gnu/egcs/gcc/LANGUAGES

-U src/gnu/egcs/gcc/Makefile.in

-U src/gnu/egcs/gcc/NEWS

-U src/gnu/egcs/gcc/PROBLEMS

-U src/gnu/egcs/gcc/README

-U src/gnu/egcs/gcc/README-bugs

-U src/gnu/egcs/gcc/README-fixinc

-U src/gnu/egcs/gcc/README.ACORN

-U src/gnu/egcs/gcc/README.ALTOS

-U src/gnu/egcs/gcc/README.APOLLO

-U src/gnu/egcs/gcc/README.C4X

-U src/gnu/egcs/gcc/README.DWARF

-U src/gnu/egcs/gcc/README.FRESCO

-U src/gnu/egcs/gcc/README.NS32K

-U src/gnu/egcs/gcc/README.RS6000

-U src/gnu/egcs/gcc/README.TRAD

-U src/gnu/egcs/gcc/README.X11

-U src/gnu/egcs/gcc/README.gnat

-U src/gnu/egcs/gcc/SERVICE

-U src/gnu/egcs/gcc/TESTS.FLUNK

-U src/gnu/egcs/gcc/acconfig.h

-U src/gnu/egcs/gcc/aclocal.m4

-U src/gnu/egcs/gcc/alias.c

-U src/gnu/egcs/gcc/assert.h

-U src/gnu/egcs/gcc/basic-block.h

-U src/gnu/egcs/gcc/bitmap.c

-U src/gnu/egcs/gcc/bitmap.h

-U src/gnu/egcs/gcc/build-make

-U src/gnu/egcs/gcc/c-aux-info.c

-U src/gnu/egcs/gcc/c-common.c

-U src/gnu/egcs/gcc/c-convert.c

-U src/gnu/egcs/gcc/c-decl.c

-U src/gnu/egcs/gcc/c-gperf.h

-U src/gnu/egcs/gcc/c-iterate.c

-U src/gnu/egcs/gcc/c-lang.c

-U src/gnu/egcs/gcc/c-lex.c

-U src/gnu/egcs/gcc/c-lex.h

-U src/gnu/egcs/gcc/c-parse.c

-U src/gnu/egcs/gcc/c-parse.gperf

-U src/gnu/egcs/gcc/c-parse.h

-U src/gnu/egcs/gcc/c-parse.in

-U src/gnu/egcs/gcc/c-parse.y

-U src/gnu/egcs/gcc/c-pragma.c

-U src/gnu/egcs/gcc/c-pragma.h

-U src/gnu/egcs/gcc/c-tree.h

-U src/gnu/egcs/gcc/c-typeck.c

-U src/gnu/egcs/gcc/caller-save.c

-U src/gnu/egcs/gcc/calls.c

-U src/gnu/egcs/gcc/cccp.1

-U src/gnu/egcs/gcc/cccp.c

-U src/gnu/egcs/gcc/cexp.c

-U src/gnu/egcs/gcc/cexp.y

-C src/gnu/egcs/gcc/collect2.c

-U src/gnu/egcs/gcc/collect2.h

-U src/gnu/egcs/gcc/combine.c

-U src/gnu/egcs/gcc/conditions.h

-U src/gnu/egcs/gcc/config.guess

-U src/gnu/egcs/gcc/config.in

-U src/gnu/egcs/gcc/configure

-U src/gnu/egcs/gcc/configure.bat

-U src/gnu/egcs/gcc/configure.frag

-U src/gnu/egcs/gcc/configure.in

-U src/gnu/egcs/gcc/configure.lang

-U src/gnu/egcs/gcc/convert.c

-U src/gnu/egcs/gcc/convert.h

-U src/gnu/egcs/gcc/cpp.1

-U src/gnu/egcs/gcc/cpp.fns

-U src/gnu/egcs/gcc/cpp.texi

-U src/gnu/egcs/gcc/cppalloc.c

-U src/gnu/egcs/gcc/cpperror.c

-U src/gnu/egcs/gcc/cppexp.c

-U src/gnu/egcs/gcc/cppfiles.c

-U src/gnu/egcs/gcc/cpphash.c

-U src/gnu/egcs/gcc/cpphash.h

-U src/gnu/egcs/gcc/cppinit.c

-U src/gnu/egcs/gcc/cpplib.c

-U src/gnu/egcs/gcc/cpplib.h

-U src/gnu/egcs/gcc/cppmain.c

-U src/gnu/egcs/gcc/cppspec.c

-U src/gnu/egcs/gcc/cppulp.c

-U src/gnu/egcs/gcc/cross-make

-U src/gnu/egcs/gcc/crtstuff.c

-U src/gnu/egcs/gcc/cse.c

-U src/gnu/egcs/gcc/cstamp-h.in

-U src/gnu/egcs/gcc/dbxout.c

-U src/gnu/egcs/gcc/dbxout.h

-U src/gnu/egcs/gcc/dbxstclass.h

-U src/gnu/egcs/gcc/defaults.h

-U src/gnu/egcs/gcc/doprint.c

-U src/gnu/egcs/gcc/doschk.c

-U src/gnu/egcs/gcc/dostage2

-U src/gnu/egcs/gcc/dostage3

-U src/gnu/egcs/gcc/dwarf.h

-U src/gnu/egcs/gcc/dwarf2.h

-U src/gnu/egcs/gcc/dwarf2out.c

-U src/gnu/egcs/gcc/dwarf2out.h

-U src/gnu/egcs/gcc/dwarfout.c

-U src/gnu/egcs/gcc/dwarfout.h

-U src/gnu/egcs/gcc/dyn-string.c

-U src/gnu/egcs/gcc/dyn-string.h

-U src/gnu/egcs/gcc/eh-common.h

-U src/gnu/egcs/gcc/emit-rtl.c

-U src/gnu/egcs/gcc/enquire.c

-U src/gnu/egcs/gcc/except.c

-U src/gnu/egcs/gcc/except.h

-U src/gnu/egcs/gcc/exgettext

-U src/gnu/egcs/gcc/explow.c

-U src/gnu/egcs/gcc/expmed.c

-U src/gnu/egcs/gcc/expr.c

-U src/gnu/egcs/gcc/expr.h

-U src/gnu/egcs/gcc/extend.texi

-U src/gnu/egcs/gcc/final.c

-U src/gnu/egcs/gcc/fix-header.c

-U src/gnu/egcs/gcc/fixcpp

-U src/gnu/egcs/gcc/fixinc-nt.sed

-U src/gnu/egcs/gcc/fixincludes

-U src/gnu/egcs/gcc/fixproto

-U src/gnu/egcs/gcc/flags.h

-U src/gnu/egcs/gcc/floatlib.c

-U src/gnu/egcs/gcc/flow.c

-U src/gnu/egcs/gcc/fold-const.c

-U src/gnu/egcs/gcc/fp-test.c

-U src/gnu/egcs/gcc/frame.c

-U src/gnu/egcs/gcc/frame.h

-U src/gnu/egcs/gcc/function.c

-U src/gnu/egcs/gcc/function.h

-U src/gnu/egcs/gcc/future.options

-U src/gnu/egcs/gcc/gansidecl.h

-U src/gnu/egcs/gcc/gbl-ctors.h

-U src/gnu/egcs/gcc/gcc.1

-U src/gnu/egcs/gcc/gcc.c

-U src/gnu/egcs/gcc/gcc.hlp

-U src/gnu/egcs/gcc/gcc.texi

-U src/gnu/egcs/gcc/gccspec.c

-U src/gnu/egcs/gcc/gcov-io.h

-U src/gnu/egcs/gcc/gcov.c

-U src/gnu/egcs/gcc/gcov.texi

-U src/gnu/egcs/gcc/gcse.c

-U src/gnu/egcs/gcc/gen-protos.c

-U src/gnu/egcs/gcc/genattr.c

-U src/gnu/egcs/gcc/genattrtab.c

-U src/gnu/egcs/gcc/gencheck.c

-U src/gnu/egcs/gcc/gencodes.c

-U src/gnu/egcs/gcc/genconfig.c

-U src/gnu/egcs/gcc/genemit.c

-U src/gnu/egcs/gcc/genextract.c

-U src/gnu/egcs/gcc/genflags.c

-U src/gnu/egcs/gcc/gengenrtl.c

-U src/gnu/egcs/gcc/genmultilib

-U src/gnu/egcs/gcc/genopinit.c

-U src/gnu/egcs/gcc/genoutput.c

-U src/gnu/egcs/gcc/genpeep.c

-U src/gnu/egcs/gcc/genrecog.c

-U src/gnu/egcs/gcc/getpwd.c

-U src/gnu/egcs/gcc/glimits.h

-U src/gnu/egcs/gcc/global.c

-U src/gnu/egcs/gcc/gmon.c

-U src/gnu/egcs/gcc/graph.c

-U src/gnu/egcs/gcc/gstab.h

-U src/gnu/egcs/gcc/gsyms.h

-U src/gnu/egcs/gcc/gsyslimits.h

-U src/gnu/egcs/gcc/gthr.h

-U src/gnu/egcs/gcc/gthr-dce.h

-U src/gnu/egcs/gcc/gthr-posix.h

-U src/gnu/egcs/gcc/gthr-single.h

-U src/gnu/egcs/gcc/gthr-solaris.h

-U src/gnu/egcs/gcc/gthr-vxworks.h

-U src/gnu/egcs/gcc/haifa-sched.c

-U src/gnu/egcs/gcc/halfpic.c

-U src/gnu/egcs/gcc/halfpic.h

-U src/gnu/egcs/gcc/hard-reg-set.h

-U src/gnu/egcs/gcc/hash.c

-U src/gnu/egcs/gcc/hash.h

-U src/gnu/egcs/gcc/hwint.h

-U src/gnu/egcs/gcc/input.h

-U src/gnu/egcs/gcc/install.texi

-U src/gnu/egcs/gcc/install1.texi

-U src/gnu/egcs/gcc/integrate.c

-U src/gnu/egcs/gcc/integrate.h

-U src/gnu/egcs/gcc/intl.c

-U src/gnu/egcs/gcc/intl.h

-U src/gnu/egcs/gcc/invoke.texi

-U src/gnu/egcs/gcc/jump.c

-U src/gnu/egcs/gcc/just-fixinc

-U src/gnu/egcs/gcc/lcm.c

-U src/gnu/egcs/gcc/libgcc1-test.c

-U src/gnu/egcs/gcc/libgcc1.c

-U src/gnu/egcs/gcc/libgcc2.c

-U src/gnu/egcs/gcc/limitx.h

-U src/gnu/egcs/gcc/limity.h

-U src/gnu/egcs/gcc/listing

-U src/gnu/egcs/gcc/local-alloc.c

-U src/gnu/egcs/gcc/longlong.h