summaryrefslogtreecommitdiff
path: root/libobjc
diff options
context:
space:
mode:
authornicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4>2004-06-19 23:46:27 +0000
committernicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4>2004-06-19 23:46:27 +0000
commit98fde0243abecebd4f90b991aa89e725928120ba (patch)
treed4ba8b4591b99223feb0641b13f2a9dc0283bc04 /libobjc
parent8495c0caa5e5c7405db047eacf57e0bc0a98e473 (diff)
downloadgcc-98fde0243abecebd4f90b991aa89e725928120ba.tar.gz
Tidied up/fixed compilation of exception.c
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83399 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
-rw-r--r--libobjc/ChangeLog6
-rw-r--r--libobjc/Makefile.in6
2 files changed, 11 insertions, 1 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 1c85986c7bd..ef554a7f6a8 100644
--- 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 95c94bf44e3..6af980e610b 100644
--- 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) $<