Tidied up/fixed compilation of exception.c

From-SVN: r83399

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 1c85986c7bd9117a252ea2f62524082ff2a02d19..ef554a7f6a8952f18042f0ccb49c7c2633d8aa23 100644 (file)
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-20  Alexander Malmberg  <alexander@malmberg.org>
+
+        * Makefile.in (exception.lo): Remove $(OBJC_GCFLAGS).
+        (exception_gc.lo): New.
+        (OBJS_GC): Add exception_gc.lo.
+       
 2004-06-17  Richard Henderson  <rth@redhat.com>
 
        * exception.c: New file.

diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index 95c94bf44e372ce9331993962b7675da084a27bf..6af980e610b5efe319a8e6288c1c8ea8ccdf9e8b 100644 (file)
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -151,7 +151,7 @@ OBJS_GC = archive_gc.lo class_gc.lo encoding_gc.lo gc_gc.lo hash_gc.lo \
          init_gc.lo linking_gc.lo misc_gc.lo nil_method_gc.lo \
          NXConstStr_gc.lo Object_gc.lo objects_gc.lo Protocol_gc.lo \
          sarray_gc.lo selector_gc.lo sendmsg_gc.lo thr_gc.lo \
-         $(OBJC_THREAD_FILE)_gc.lo
+         $(OBJC_THREAD_FILE)_gc.lo exception_gc.lo
 
 runtime-info.h: 
        echo "" > tmp-runtime.m
@@ -254,6 +254,10 @@ $(OBJC_THREAD_FILE)_gc.lo: $(OBJC_THREAD_FILE).c
                $(INCLUDES) $<
 
 exception.lo: exception.c
+       $(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) \
+               -fexceptions $(INCLUDES) $<
+
+exception_gc.lo: exception.c
        $(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) \
                -fexceptions $(INCLUDES) $<