* pex-os2.c: Remove.

	* configure.ac: Remove *-*-os2-emx* case when setting pexecute.
	* Makefile.in (CFILES): Remove pex-os2.c.
	(CONFIGURED_OFILES): Remove pex-os2.o.
	(pex-os2.o): Remove target.
	* configure: Rebuild.

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index bbd4b51..485fbf5 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-09  Ian Lance Taylor  <ian@airs.com>
+
+       * pex-os2.c: Remove.
+       * configure.ac: Remove *-*-os2-emx* case when setting pexecute.
+       * Makefile.in (CFILES): Remove pex-os2.c.
+       (CONFIGURED_OFILES): Remove pex-os2.o.
+       (pex-os2.o): Remove target.
+       * configure: Rebuild.
+
 2005-03-07  Ian Lance Taylor  <ian@airs.com>
 
        * mpw-config.in: Remove.

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 2dc4e7a..419ffdc 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -142,7 +142,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c                                \
         mempcpy.c memset.c mkstemps.c                                  \
        objalloc.c obstack.c                                            \
        partition.c                                                     \
-        pex-djgpp.c pex-msdos.c pex-os2.c                              \
+        pex-djgpp.c pex-msdos.c                                        \
         pex-unix.c pex-win32.c                                         \
          physmem.c putenv.c                                            \
        random.c regex.c rename.c rindex.c                              \
@@ -188,7 +188,7 @@ CONFIGURED_OFILES = ./asprintf.o ./atexit.o                         \
        ./index.o ./insque.o                                            \
        ./memchr.o ./memcmp.o ./memcpy.o ./memmove.o ./mempcpy.o        \
         ./memset.o ./mkstemps.o                                        \
-       ./pex-djgpp.o ./pex-msdos.o ./pex-os2.o                 \
+       ./pex-djgpp.o ./pex-msdos.o                                     \
         ./pex-unix.o ./pex-win32.o                                     \
         ./putenv.o                                                     \
        ./random.o ./rename.o ./rindex.o                                \
@@ -758,13 +758,6 @@ $(CONFIGURED_OFILES): stamp-picdir
        else true; fi
        $(COMPILE.c) $(srcdir)/pex-msdos.c $(OUTPUT_OPTION)
 
-./pex-os2.o: $(srcdir)/pex-os2.c config.h $(INCDIR)/ansidecl.h \
-       $(INCDIR)/libiberty.h $(srcdir)/pex-common.h
-       if [ x"$(PICFLAG)" != x ]; then \
-         $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-os2.c -o pic/$@; \
-       else true; fi
-       $(COMPILE.c) $(srcdir)/pex-os2.c $(OUTPUT_OPTION)
-
 ./pex-unix.o: $(srcdir)/pex-unix.c config.h $(INCDIR)/ansidecl.h \
        $(INCDIR)/libiberty.h $(srcdir)/pex-common.h
        if [ x"$(PICFLAG)" != x ]; then \

diff --git a/libiberty/configure b/libiberty/configure
index ed656bc..9e238de 100755 (executable)
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -6709,7 +6709,6 @@ case "${host}" in
      *-*-mingw* | *-*-winnt*)  pexecute=./pex-win32.o  ;;
      *-*-msdosdjgpp*)          pexecute=./pex-djgpp.o  ;;
      *-*-msdos*)               pexecute=./pex-msdos.o  ;;
-     *-*-os2-emx*)             pexecute=./pex-os2.o    ;;
      *)                                pexecute=./pex-unix.o   ;;
 esac
 

diff --git a/libiberty/configure.ac b/libiberty/configure.ac
index b171608..4637eec 100644 (file)
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
@@ -523,7 +523,6 @@ case "${host}" in
      *-*-mingw* | *-*-winnt*)  pexecute=./pex-win32.o  ;;
      *-*-msdosdjgpp*)          pexecute=./pex-djgpp.o  ;;
      *-*-msdos*)               pexecute=./pex-msdos.o  ;;
-     *-*-os2-emx*)             pexecute=./pex-os2.o    ;;
      *)                                pexecute=./pex-unix.o   ;;
 esac
 AC_SUBST(pexecute)

diff --git a/libiberty/pex-os2.c b/libiberty/pex-os2.c
deleted file mode 100644 (file)
index d9eacf1..0000000
--- a/libiberty/pex-os2.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Utilities to execute a program in a subprocess (possibly linked by pipes
-   with other subprocesses), and wait for it.  OS/2 specialization.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
-   Free Software Foundation, Inc.
-
-This file is part of the libiberty library.
-Libiberty is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-Libiberty is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with libiberty; see the file COPYING.LIB.  If not,
-write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#include "pex-common.h"
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-
-/* ??? Does OS2 have process.h?  */
-extern int spawnv ();
-extern int spawnvp ();
-
-int
-pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags)
-     const char *program;
-     char * const *argv;
-     const char *this_pname;
-     const char *temp_base;
-     char **errmsg_fmt, **errmsg_arg;
-     int flags;
-{
-  int pid;
-
-  if ((flags & PEXECUTE_ONE) != PEXECUTE_ONE)
-    abort ();
-  /* ??? Presumably 1 == _P_NOWAIT.  */
-  pid = (flags & PEXECUTE_SEARCH ? spawnvp : spawnv) (1, program, argv);
-  if (pid == -1)
-    {
-      *errmsg_fmt = install_error_msg;
-      *errmsg_arg = program;
-      return -1;
-    }
-  return pid;
-}
-
-int
-pwait (pid, status, flags)
-     int pid;
-     int *status;
-     int flags;
-{
-  /* ??? Here's an opportunity to canonicalize the values in STATUS.
-     Needed?  */
-  int pid = wait (status);
-  return pid;
-}