* inftarg.c (child_wait): Call proc_wait, not wait.

	(child_mourn_inferior): Call proc_remove_foreign.
	* main.c (gdb_init): Call init_proc.
	* main.c: Provide dummy versions of init_proc, proc_wait, and
	proc_remove_foreign for the gdb case (the libgdb case provides its
	own versions of these functions).
	* Makefile.in (libgdb-files): Add libproc.a.

3 files changed, 41 insertions, 2 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5b37c43..cfc8899 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+Tue May 31 20:35:44 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* inftarg.c (child_wait): Call proc_wait, not wait.
+	(child_mourn_inferior): Call proc_remove_foreign.
+	* main.c (gdb_init): Call init_proc.
+	* main.c: Provide dummy versions of init_proc, proc_wait, and
+	proc_remove_foreign for the gdb case (the libgdb case provides its
+	own versions of these functions).
+	* Makefile.in (libgdb-files): Add libproc.a.
+
 Wed Jun  1 11:08:52 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	Hardware watchpoints for Linux, from Rick Sladkey
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 1842d52..84eb85a 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -555,8 +555,14 @@ gdb: $(OBS) $(TSOBS) $(ADD_DEPS) $(CDEPS) init.o
 	$(CC-LD) $(INTERNAL_LDFLAGS) -o gdb \
 	  init.o $(OBS) $(TSOBS) $(ADD_FILES) $(CLIBS) $(LOADLIBES)
 
-LIBGDBFILES=$(COMMON_OBS) $(LIBGDB_OBS) $(TSOBS) $(ADD_DEPS) $(CDEPS) init.o
-libgdb-files: $(LIBGDBFILES) Makefile.in
+# libproc is not listed here because all-libproc is a dependency of all-gui,
+# not all-gdb, and thus might be built after us.
+LIBGDBDEPS=$(COMMON_OBS) $(LIBGDB_OBS) $(TSOBS) $(ADD_DEPS) $(CDEPS) init.o
+# libproc needs to be before libiberty for alloca.
+LIBGDBFILES=$(COMMON_OBS) $(LIBGDB_OBS) $(TSOBS) ../libproc/libproc.a \
+  $(ADD_DEPS) $(CDEPS) init.o
+
+libgdb-files: $(LIBGDBDEPS) Makefile.in
 	-rm -f libgdb-files
 	for i in $(LIBGDBFILES); do\
 		echo $$i >> libgdb-files;\
diff --git a/gdb/main.c b/gdb/main.c
index eb84f2c..56a34ad 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -518,6 +518,8 @@ read_command_file (stream)
   do_cleanups (cleanups);
 }
 
+extern void init_proc ();
+
 void
 gdb_init ()
 {
@@ -528,6 +530,8 @@ gdb_init ()
   init_main ();		/* But that omits this file!  Do it now */
   init_signals ();
 
+  init_proc ();
+
   /* We need a default language for parsing expressions, so simple things like
      "set width 0" won't fail if no language is explicitly set in a config file
      or implicitly set by reading an executable during startup. */
@@ -1026,6 +1030,25 @@ GDB manual (available as on-line info or a printed manual).\n", gdb_stdout);
     }
   /* No exit -- exit is through quit_command.  */
 }
+
+void
+init_proc ()
+{
+}
+
+int
+proc_wait (pid, status)
+     int pid;
+     int *status;
+{
+  return wait (status);
+}
+
+void
+proc_remove_foreign (pid)
+     int pid;
+{
+}
 #endif /* MAIN_OVERRIDE */
 
 void