Daily bump.

[pf3gnuchains/gcc-fork.git] / libobjc / Makefile.in

diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index 3c09183..b9c216b 100644 (file)
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -33,7 +33,7 @@ VPATH = @glibcpp_srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 target_noncanonical = @target_noncanonical@
-gcc_version = @gcc_version@
+gcc_version := $(shell cat $(srcdir)/../gcc/BASE-VER)
 host_subdir = @host_subdir@
 top_srcdir = @top_srcdir@
 toplevel_srcdir = @toplevel_srcdir@
@@ -44,6 +44,8 @@ toolexeclibdir = @toolexeclibdir@
 includedirname = @includedirname@
 libext = @libext@
 
+extra_ldflags_libobjc = @extra_ldflags_libobjc@
+
 top_builddir = .
 
 libdir = $(exec_prefix)/lib
@@ -73,7 +75,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 WARN_CFLAGS = -W -Wall -Wwrite-strings -Wstrict-prototypes
 ALL_CFLAGS = -I. -I$(srcdir) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(WARN_CFLAGS) \
-       -DIN_GCC -DIN_TARGET_LIBS -fno-strict-aliasing
+       -DIN_GCC -DIN_TARGET_LIBS -fno-strict-aliasing -fexceptions
 
 # Libtool
 # The following strings describe the version of the obj-C library 
@@ -146,13 +148,13 @@ OBJC_H = hash.h objc-list.h sarray.h objc.h objc-api.h \
 OBJS =    archive.lo class.lo encoding.lo gc.lo hash.lo init.lo linking.lo \
          misc.lo nil_method.lo NXConstStr.lo Object.lo objects.lo \
          Protocol.lo sarray.lo selector.lo sendmsg.lo thr.lo \
-         $(OBJC_THREAD_FILE).lo exception.lo
+         $(OBJC_THREAD_FILE).lo exception.lo hash_compat.lo
 
 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 exception_gc.lo
+         $(OBJC_THREAD_FILE)_gc.lo exception_gc.lo hash_compat_gc.lo
 
 runtime-info.h: 
        echo "" > tmp-runtime.m
@@ -183,6 +185,10 @@ hash_gc.lo: hash.c
        $(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) \
                $(INCLUDES) $<
 
+hash_compat_gc.lo: hash_compat.c
+       $(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) \
+               $(INCLUDES) $<
+
 init_gc.lo: init.c
        $(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) \
                $(INCLUDES) $<
@@ -267,12 +273,12 @@ doc: info dvi html
 libobjc$(libext).la: $(OBJS)
        $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \
                -rpath $(toolexeclibdir) \
-               -version-info $(LIBOBJC_VERSION)
+               -version-info $(LIBOBJC_VERSION) $(extra_ldflags_libobjc)
 
 libobjc_gc$(libext).la: $(OBJS_GC)
        $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \
                -rpath $(toolexeclibdir) \
-               -version-info $(LIBOBJC_GC_VERSION)
+               -version-info $(LIBOBJC_GC_VERSION) $(extra_ldflags_libobjc)
 
 #
 # FIXME -- The following part does not fit in the libtool context.