2001-06-16 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43421 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 74 insertions, 2 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cd9d69dd23c..65f241aac1a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-16  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
+
+	* gccspec.c (lang_specific_driver): If compiling ObjC, add
+	-shared-libgcc when necessary.
+	* Makefile.in (gccspec.o): Compile with DRIVER_DEFINES.
+
 2001-06-16  Daniel Berlin  <dan@cgsoftware.com>
 
 	* bitmap.h: Add dump_bitmap, bitmap_zero, bitmap_union_of_diffs,
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 2b41f3ebd96..6606cabfa75 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1263,6 +1263,12 @@ gcc.o: gcc.c $(CONFIG_H) $(SYSTEM_H) intl.h multilib.h \
   -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
diff --git a/gcc/gccspec.c b/gcc/gccspec.c
index fcad38d9b52..8576ee0d603 100644
--- a/gcc/gccspec.c
+++ b/gcc/gccspec.c
@@ -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, in_added_libraries)
      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. */