Changeset 626

Timestamp:

Aug 17, 2003, 3:49:56 AM (22 years ago)

Author:

bird

Message:

#597: OS/2 EMX config/hacks.

Location:

trunk/src/binutils/libiberty

Files:

• Makefile.in (modified) (2 diffs, 1 prop)
• config.table (modified) (2 diffs, 1 prop)
• config/mh-emx (modified) (1 diff, 1 prop)
• getpwd.c (modified) (3 diffs, 1 prop)
• lbasename.c (modified) (2 diffs, 1 prop)
• pex-os2.c (modified) (3 diffs, 1 prop)
• strerror.c (modified) (2 diffs, 1 prop)

trunk/src/binutils/libiberty/Makefile.in

@@ -78 +78 @@
 # A configuration can specify extra .o files that should be included,
 # even if they are in libc. (Perhaps the libc version is buggy.)
-EXTRA_OFILES = 
+EXTRA_OFILES =
 
 # Flags to pass to a recursive make.
@@ -108 +108 @@
 # FIXME: add @BUILD_INFO@ once we're sure it works for everyone.
 all: stamp-picdir $(TARGETLIB) needed-list required-list all-subdir
+ifeq "$(BUILD_PLATFORM)" "OS2"
+        $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
+else
         @: $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
+endif
 
 .PHONY: check installcheck

trunk/src/binutils/libiberty/config.table

@@ -13 +13 @@
   i370-*-opened*)       frag=mh-openedition ;;
   i[345]86-*-windows*)  frag=mh-windows ;;
+  *-*-*emx)             frag=mh-emx ;;
 esac
 
@@ -32 +33 @@
   case "${host}" in
     *-*-cygwin*)        ;;
+    *-*-*emx)           ;;
     alpha*-*-linux*)    frag=mh-elfalphapic ;;
     arm*-*-*)           frag=mh-armpic ;;

trunk/src/binutils/libiberty/config/mh-emx

@@ -1 @@
-CFLAGS =
+# r=bird: why this here? Should be sufficient to do -s when linking.
+#CFLAGS = -s -O2
 INSTALL = cp
 
-# Instead of ranlib run dllar which will make a shared library (dll)
-RANLIB = dllar -d 'The GNU -liberty library' -o iberty
+# Add the "s" flag to AR_FLAGS to add an archive index instead of RANLIB
+AR_FLAGS = rcs
+
+# hack: Instead of ranlib run dllar which will make a shared library (dll)
+#       TODO: Don't use RANLIB because it f**ks up install.
+#       TODO: Pass the correct -g/-s flag without using non-standard stuff.
+# bird: Forget this it breaks the install. We'll need a better hack.
+# override RANLIB = kRx.exe dllar.cmd -cc '$(CC)' -d 'The GNU -liberty library' -o iberty -lgcc
+

trunk/src/binutils/libiberty/getpwd.c

@@ -57 +57 @@
 #endif
 
-#if !(defined (VMS) || (defined(_WIN32) && !defined(__CYGWIN__)))
+#if !(defined (VMS) || (defined(_WIN32) && !defined(__CYGWIN__)) || defined(__EMX__))
 
 /* Get the working directory.  Use the PWD environment variable if it's
@@ -105 +105 @@
 }
 
-#else   /* VMS || _WIN32 && !__CYGWIN__ */
+#else   /* VMS || _WIN32 && !__CYGWIN__ || __EMX__ */
 
 #ifndef MAXPATHLEN
@@ -125 +125 @@
 }
 
-#endif  /* VMS || _WIN32 && !__CYGWIN__ */
+#endif  /* VMS || _WIN32 && !__CYGWIN__ || __EMX__ */

trunk/src/binutils/libiberty/lbasename.c

@@ -47 +47 @@
 
 #if defined (_WIN32) || defined (__MSDOS__) \
-    || defined (__DJGPP__) || defined (__OS2__)
+    || defined (__DJGPP__) || defined (__OS2__) || defined (__EMX__)
 #  define HAVE_DOS_BASED_FILE_SYSTEM
-#  ifndef DIR_SEPARATOR_2 
+#  ifndef DIR_SEPARATOR_2
 #    define DIR_SEPARATOR_2 '\\'
 #  endif
@@ -69 +69 @@
 #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
   /* Skip over a possible disk name.  */
-  if (ISALPHA (name[0]) && name[1] == ':') 
+  if (ISALPHA (name[0]) && name[1] == ':')
     name += 2;
 #endif

trunk/src/binutils/libiberty/pex-os2.c

@@ -31 +31 @@
 #include <sys/wait.h>
 #endif
-
-/* ??? Does OS2 have process.h?  */
-extern int spawnv ();
-extern int spawnvp ();
+#include <process.h>
 
 int
@@ -49 +46 @@
   if ((flags & PEXECUTE_ONE) != PEXECUTE_ONE)
     abort ();
-  /* ??? Presumably 1 == _P_NOWAIT.  */
-  pid = (flags & PEXECUTE_SEARCH ? spawnvp : spawnv) (1, program, argv);
+  pid = (flags & PEXECUTE_SEARCH ? spawnvp : spawnv) (P_WAIT, program, argv);
   if (pid == -1)
     {
@@ -71 +67 @@
   return pid;
 }
+

trunk/src/binutils/libiberty/strerror.c

@@ -20 +20 @@
 #include <stdio.h>
 #include <errno.h>
+#ifdef __EMX__ /* EM put these two in the wrong header, they should be in stdio.h. */
+#include <stdlib.h>
+#endif
 
 #ifdef HAVE_SYS_ERRLIST
@@ -659 +662 @@
       msg = (char *) sys_errlist[errnoval];
     }
-  
+
   return (msg);
 }