[PATCH] Fix ObjC vs. shared libgcc

[Franz Sirl <Franz dot Sirl-kernel at lauterbach dot com>]

Hi,

this patch  fixes the ObjC testsuite compilation  failures with no 
3.0/mainline compiler at the install location. It is a simplified copy  of 
the code in cp/g++spec.c.

Bootstrapped on powerpc-linux-gnu.

OK for mainline and branch?

Franz.

	* gccspec.c (lang_specific_driver): If compiling ObjC, add
	-shared-libgcc when necessary.
	* Makefile.in (gccspec.o): Compile with DRIVER_DEFINES.

testsuite:

	* lib/objc.exp (objc_target_compile): Add ${rootme} to ld_library_path
	variable.

Index: gcc/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.649
diff -u -p -r1.649 Makefile.in
--- gcc/Makefile.in	2001/04/25 00:58:04	1.649
+++ gcc/Makefile.in	2001/04/27 21:17:53
@@ -1315,6 +1315,12 @@ gcc.o: gcc.c $(CONFIG_H) $(SYSTEM_H) int
   -c $(srcdir)/gcc.c)
 
 gccspec.o: gccspec.c $(CONFIG_H) $(SYSTEM_H) $(GCC_H)
+	(SHLIB_LINK='$(SHLIB_LINK)' \
+	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
+	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+  $(DRIVER_DEFINES) \
+  -c $(srcdir)/gccspec.c)
+
 cppspec.o: cppspec.c $(CONFIG_H) $(SYSTEM_H) $(GCC_H)
 
 tree-check.h: s-check ; @true
Index: gcc/gccspec.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gccspec.c,v
retrieving revision 1.4
diff -u -p -r1.4 gccspec.c
--- gcc/gccspec.c	2000/08/02 20:21:25	1.4
+++ gcc/gccspec.c	2001/04/27 21:17:53
@@ -1,5 +1,5 @@
 /* Specific flags and argument handling of the C front-end.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -29,7 +29,67 @@ lang_specific_driver (in_argc, in_argv, 
      const char *const **in_argv ATTRIBUTE_UNUSED;
      int *in_added_libraries ATTRIBUTE_UNUSED;
 {
-  return;  /* Not used for C. */
+#ifdef ENABLE_SHARED_LIBGCC
+  int i;
+
+  /* The new argument list will be contained in this.  */
+  const char **arglist;
+
+  /* True if we should add -shared-libgcc to the command-line.  */
+  int shared_libgcc = 0;
+
+  /* The total number of arguments with the new stuff.  */
+  int argc;
+
+  /* The argument list.  */
+  const char *const *argv;
+
+  argc = *in_argc;
+  argv = *in_argv;
+
+  for (i = 1; i < argc; i++)
+    {
+      if (argv[i][0] == '-')
+	{
+	  if (strcmp (argv[i], "-static-libgcc") == 0
+	      || strcmp (argv[i], "-static") == 0)
+	    return;
+	}
+      else
+	{
+	  int len; 
+
+	  /* If the filename ends in .m or .mi, we are compiling ObjC
+	     and want to pass -shared-libgcc.  */
+	  len = strlen (argv[i]);
+	  if ((len > 2 && argv[i][len - 2] == '.' && argv[i][len - 1] == 'm')
+	      ||  (len > 3 && argv[i][len - 3] == '.' && argv[i][len - 2] == 'm'
+		   && argv[i][len - 1] == 'i'))
+	    shared_libgcc = 1;
+	}
+    }
+
+  if  (shared_libgcc)
+    {
+      /* Make sure to have room for the trailing NULL argument.  */
+      arglist = (const char **) xmalloc ((argc+2) * sizeof (char *));
+
+      i = 0;
+      do
+	{
+	  arglist[i] = argv[i];
+	  i++;
+	}
+      while (i < argc);
+
+      arglist[i++] = "-shared-libgcc";
+
+      arglist[i] = NULL;
+
+      *in_argc = i;
+      *in_argv = arglist;
+    }
+#endif
 }
 
 /* Called before linking.  Returns 0 on success and -1 on failure. */
Index: gcc/testsuite/lib/objc.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/objc.exp,v
retrieving revision 1.5
diff -u -p -r1.5 objc.exp
--- gcc/testsuite/lib/objc.exp	2000/08/06 18:41:49	1.5
+++ gcc/testsuite/lib/objc.exp	2001/04/27 21:17:53
@@ -113,13 +113,14 @@ proc objc_init { args } {
 }
 
 proc objc_target_compile { source dest type options } {
+    global rootme;
     global tmpdir;
     global gluefile wrap_flags;
     global OBJC_UNDER_TEST
     global TOOL_OPTIONS
     global ld_library_path
 
-    set ld_library_path "."
+    set ld_library_path ".:${rootme}"
     lappend options "libs=-lobjc"
 
     if { [target_info needs_status_wrapper]!="" && [info exists gluefile] } {