PatchSet 7033
Date: 2005/12/23 11:41:54
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Upgraded to boehm-gc 6.6
Members:
ChangeLog:1.4552->1.4553
kaffe/kaffevm/boehm-gc/gc2.c:1.14->1.15
kaffe/kaffevm/boehm-gc/boehm/Makefile.am:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/Makefile.direct:1.2->1.3
kaffe/kaffevm/boehm-gc/boehm/Makefile.in:1.9->1.10
kaffe/kaffevm/boehm-gc/boehm/acinclude.m4:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/aclocal.m4:1.9->1.10
kaffe/kaffevm/boehm-gc/boehm/aix_irix_threads.c:1.3->1.4(DEAD)
kaffe/kaffevm/boehm-gc/boehm/allchblk.c:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/alloc.c:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/alpha_mach_dep.S:1.2->1.3
kaffe/kaffevm/boehm-gc/boehm/config.guess:1.2->1.3
kaffe/kaffevm/boehm-gc/boehm/config.sub:1.2->1.3
kaffe/kaffevm/boehm-gc/boehm/configure:1.9->1.10
kaffe/kaffevm/boehm-gc/boehm/configure.ac:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/configure.in:1.1->1.2
kaffe/kaffevm/boehm-gc/boehm/darwin_stop_world.c:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/depcomp:1.2->1.3
kaffe/kaffevm/boehm-gc/boehm/dyn_load.c:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/libtool.m4:1.2->1.3
kaffe/kaffevm/boehm-gc/boehm/ltmain.sh:1.2->1.3
kaffe/kaffevm/boehm-gc/boehm/mach_dep.c:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/mallocx.c:1.2->1.3
kaffe/kaffevm/boehm-gc/boehm/mark.c:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/mark_rts.c:1.1->1.2
kaffe/kaffevm/boehm-gc/boehm/missing:1.2->1.3
kaffe/kaffevm/boehm-gc/boehm/mkinstalldirs:1.1->1.2
kaffe/kaffevm/boehm-gc/boehm/os_dep.c:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/powerpc_darwin_mach_dep.s:1.2->1.3
kaffe/kaffevm/boehm-gc/boehm/pthread_stop_world.c:1.4->1.5
kaffe/kaffevm/boehm-gc/boehm/pthread_support.c:1.4->1.5
kaffe/kaffevm/boehm-gc/boehm/solaris_threads.c:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/version.h:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/win32_threads.c:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/doc/Makefile.in:1.9->1.10
kaffe/kaffevm/boehm-gc/boehm/doc/README:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/doc/README.changes:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/doc/README.darwin:1.2->1.3
kaffe/kaffevm/boehm-gc/boehm/doc/README.linux:1.1->1.2
kaffe/kaffevm/boehm-gc/boehm/include/Makefile.am:INITIAL->1.2
kaffe/kaffevm/boehm-gc/boehm/include/Makefile.in:1.9->1.10
kaffe/kaffevm/boehm-gc/boehm/include/gc.h:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/include/gc_config_macros.h:1.2->1.3
kaffe/kaffevm/boehm-gc/boehm/include/private/gc_locks.h:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/include/private/gc_priv.h:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/include/private/gcconfig.h:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/include/private/pthread_stop_world.h:1.1->1.2
kaffe/kaffevm/boehm-gc/boehm/include/private/pthread_support.h:1.2->1.3
kaffe/kaffevm/boehm-gc/boehm/tests/test.c:1.2->1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4552 kaffe/ChangeLog:1.4553
--- kaffe/ChangeLog:1.4552 Thu Dec 22 17:51:17 2005
+++ kaffe/ChangeLog Fri Dec 23 11:41:54 2005
@@ -1,3 +1,9 @@
+2005-12-23 Guilhem Lavaux <[EMAIL PROTECTED]>
+
+ * kaffe/kaffevm/boehm-gc/boehm: Upgraded to Boehm-GC 6.6
+
+ * kaffe/kaffevm/gc2.c: Added JVMPI event emission.
+
2005-12-22 Guilhem Lavaux <[EMAIL PROTECTED]>
* kaffe/kaffevm/access.c
Index: kaffe/kaffe/kaffevm/boehm-gc/gc2.c
diff -u kaffe/kaffe/kaffevm/boehm-gc/gc2.c:1.14
kaffe/kaffe/kaffevm/boehm-gc/gc2.c:1.15
--- kaffe/kaffe/kaffevm/boehm-gc/gc2.c:1.14 Sun Oct 2 14:20:08 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/gc2.c Fri Dec 23 11:42:00 2005
@@ -6,7 +6,7 @@
* Copyright (c) 2001
* Transvirtual Technologies, Inc. All rights reserved.
*
- * Copyright (c) 2004
+ * Copyright (c) 2004-2005
* The Kaffe.org's developers. All rights reserved.
* See ChangeLog for details.
*
@@ -31,6 +31,7 @@
#include "gc-refs.h"
#include "gc-kaffe.h"
#include "gc2.h"
+#include "jvmpi_kaffe.h"
/*
* This record describes an allocation type.
@@ -152,6 +153,16 @@
return;
}
+#if defined(ENABLE_JVMPI)
+ if( JVMPI_EVENT_ISENABLED(JVMPI_EVENT_OBJECT_FREE) )
+ {
+ JVMPI_Event ev;
+
+ ev.event_type = JVMPI_EVENT_OBJECT_FREE;
+ ev.u.obj_free.obj_id = ALIGN_FORWARD(ob);
+ jvmpiPostEvent(&ev);
+ }
+#endif
KaffeGC_clearWeakRef(&boehm_gc.collector, ALIGN_FORWARD(ob));
if (f->destroy != NULL)
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.am
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.am:1.3
kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.am:1.4
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.am:1.3 Fri May 6 17:02:53 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.am Fri Dec 23 11:42:00 2005
@@ -30,12 +30,7 @@
else
extra =
endif
-
-if GC_CONVENIENCE
lib_LTLIBRARIES = libgc.la $(extra)
-else
-noinst_LTLIBRARIES= libgc.la
-endif
include_HEADERS = include/gc.h include/gc_local_alloc.h \
include/gc_pthread_redirects.h include/gc_config_macros.h \
@@ -50,7 +45,7 @@
endif
libgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
-dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c aix_irix_threads.c \
+dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c \
@@ -110,10 +105,18 @@
include/gc_mark.h @addincludes@
## FIXME: we shouldn't have to do this, but automake forces us to.
+if COMPILER_XLC
+ ## XLC neither requires nor tolerates the unnecessary assembler goop
+ ASM_CPP_OPTIONS =
+else
+ ## We use -Wp,-P to strip #line directives. Irix `as' chokes on
+ ## these.
+ ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp
+endif
.s.lo:
## We use -Wp,-P to strip #line directives. Irix `as' chokes on
## these.
- $(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
+ $(LTCOMPILE) $(ASM_CPP_OPTIONS) -c $<
## We have our own definition of LTCOMPILE because we want to use our
## CFLAGS, not those passed in from the top level make.
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.direct
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.direct:1.2
kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.direct:1.3
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.direct:1.2 Tue Aug 24
17:59:44 2004
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.direct Fri Dec 23 11:42:00 2005
@@ -36,7 +36,7 @@
# -DGC_LINUX_THREADS -DPARALLEL_MARK -DTHREAD_LOCAL_ALLOC
# To build the parallel collector in a static library on HP/UX,
# add to the above:
-# -DGC_HPUX_THREADS -DPARALLEL_MARK -DTHREAD_LOCAL_ALLOC
-D_POSIX_C_SOURCE=199506L
+# -DGC_HPUX_THREADS -DPARALLEL_MARK -DTHREAD_LOCAL_ALLOC
-D_POSIX_C_SOURCE=199506L -mt
# To build the thread-safe collector on Tru64, add to the above:
# -pthread -DGC_OSF1_THREADS
@@ -70,10 +70,11 @@
# Also requires -D_REENTRANT or -D_POSIX_C_SOURCE=199506L. See README.hp.
# -DGC_LINUX_THREADS enables support for Xavier Leroy's Linux threads.
# see README.linux. -D_REENTRANT may also be required.
-# -DGC_OSF1_THREADS enables support for Tru64 pthreads. Untested.
-# -DGC_FREEBSD_THREADS enables support for FreeBSD pthreads. Untested.
+# -DGC_OSF1_THREADS enables support for Tru64 pthreads.
+# -DGC_FREEBSD_THREADS enables support for FreeBSD pthreads.
# Appeared to run into some underlying thread problems.
-# -DGC_DARWIN_THREADS enables support for Mac OS X pthreads. Untested.
+# -DGC_DARWIN_THREADS enables support for Mac OS X pthreads.
+# -DGC_AIX_THREADS enables support for IBM AIX threads.
# -DGC_DGUX386_THREADS enables support for DB/UX on I386 threads.
# See README.DGUX386.
# -DGC_WIN32_THREADS enables support for win32 threads. That makes sense
@@ -233,8 +234,8 @@
# -DTHREAD_LOCAL_ALLOC defines GC_local_malloc(), GC_local_malloc_atomic()
# and GC_local_gcj_malloc(). Needed for gc_gcj.h interface. These allocate
# in a way that usually does not involve acquisition of a global lock.
-# Currently requires -DGC_LINUX_THREADS, but should be easy to port to
-# other pthreads environments. Recommended for multiprocessors.
+# Currently works only on platforms such as Linux which use
pthread_support.c.
+# Recommended for multiprocessors.
# -DUSE_COMPILER_TLS causes thread local allocation to use compiler-supported
# "__thread" thread-local variables. This is the default in HP/UX. It
# may help performance on recent Linux installations. (It failed for
@@ -276,6 +277,10 @@
# -DPOINTER_SHIFT=n causes the collector to left shift candidate pointers
# by the indicated amount before trying to interpret them. Applied
# after POINTER_MASK. EXPERIMENTAL. See also the preceding macro.
+# -DDARWIN_DONT_PARSE_STACK Causes the Darwin port to discover thread
+# stack bounds in the same way as other pthread ports, without trying to
+# walk the frames onthe stack. This is recommended only as a fallback
+# for applications that don't support proper stack unwinding.
#
CXXFLAGS= $(CFLAGS)
@@ -283,9 +288,9 @@
RANLIB= ranlib
-OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o
headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dbg_mlc.o malloc.o
stubborn.o checksums.o solaris_threads.o aix_irix_threads.o pthread_support.o
pthread_stop_world.o darwin_stop_world.o typd_mlc.o ptr_chck.o mallocx.o
solaris_pthreads.o gcj_mlc.o specific.o gc_dlopen.o backgraph.o win32_threads.o
+OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o
headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dbg_mlc.o malloc.o
stubborn.o checksums.o solaris_threads.o pthread_support.o pthread_stop_world.o
darwin_stop_world.o typd_mlc.o ptr_chck.o mallocx.o solaris_pthreads.o
gcj_mlc.o specific.o gc_dlopen.o backgraph.o win32_threads.o
-CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c
headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c new_hblk.c
real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c checksums.c
solaris_threads.c aix_irix_threads.c pthread_support.c pthread_stop_world.c
darwin_stop_world.c typd_mlc.c ptr_chck.c mallocx.c solaris_pthreads.c
gcj_mlc.c specific.c gc_dlopen.c backgraph.c win32_threads.c
+CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c
headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c new_hblk.c
real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c checksums.c
solaris_threads.c pthread_support.c pthread_stop_world.c darwin_stop_world.c
typd_mlc.c ptr_chck.c mallocx.c solaris_pthreads.c gcj_mlc.c specific.c
gc_dlopen.c backgraph.c win32_threads.c
CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c
cord/cordtest.c include/cord.h include/ec.h include/private/cord_pos.h
cord/de_win.c cord/de_win.h cord/de_cmds.h cord/de_win.ICO cord/de_win.RC
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in:1.9
kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in:1.10
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in:1.9 Tue Oct 25 15:43:02 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in Fri Dec 23 11:42:00 2005
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -31,6 +31,8 @@
+SOURCES = $(libgc_la_SOURCES) $(EXTRA_libgc_la_SOURCES) $(libgccpp_la_SOURCES)
$(gctest_SOURCES) $(test_cpp_SOURCES)
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -58,12 +60,12 @@
DIST_COMMON = $(am__configure_deps) $(dist_noinst_HEADERS) \
$(dist_noinst_SCRIPTS) $(include_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/configure ChangeLog config.guess config.sub \
- depcomp install-sh ltmain.sh missing mkinstalldirs
+ $(top_srcdir)/configure config.guess config.sub depcomp \
+ install-sh ltmain.sh missing mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/libtool.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/libtool.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -78,34 +80,30 @@
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
am__libgc_la_SOURCES_DIST = allchblk.c alloc.c blacklst.c checksums.c \
dbg_mlc.c dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c \
- headers.c aix_irix_threads.c malloc.c mallocx.c mark.c \
- mark_rts.c misc.c new_hblk.c obj_map.c os_dep.c \
- pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
- solaris_pthreads.c solaris_threads.c specific.c stubborn.c \
- typd_mlc.c backgraph.c win32_threads.c pthread_support.c \
- pthread_stop_world.c darwin_stop_world.c \
+ headers.c malloc.c mallocx.c mark.c mark_rts.c misc.c \
+ new_hblk.c obj_map.c os_dep.c pcr_interface.c ptr_chck.c \
+ real_malloc.c reclaim.c solaris_pthreads.c solaris_threads.c \
+ specific.c stubborn.c typd_mlc.c backgraph.c win32_threads.c \
+ pthread_support.c pthread_stop_world.c darwin_stop_world.c \
powerpc_darwin_mach_dep.s
@[EMAIL PROTECTED] = powerpc_darwin_mach_dep.lo
am_libgc_la_OBJECTS = allchblk.lo alloc.lo blacklst.lo checksums.lo \
dbg_mlc.lo dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \
- headers.lo aix_irix_threads.lo malloc.lo mallocx.lo mark.lo \
- mark_rts.lo misc.lo new_hblk.lo obj_map.lo os_dep.lo \
- pcr_interface.lo ptr_chck.lo real_malloc.lo reclaim.lo \
- solaris_pthreads.lo solaris_threads.lo specific.lo stubborn.lo \
- typd_mlc.lo backgraph.lo win32_threads.lo pthread_support.lo \
+ headers.lo malloc.lo mallocx.lo mark.lo mark_rts.lo misc.lo \
+ new_hblk.lo obj_map.lo os_dep.lo pcr_interface.lo ptr_chck.lo \
+ real_malloc.lo reclaim.lo solaris_pthreads.lo \
+ solaris_threads.lo specific.lo stubborn.lo typd_mlc.lo \
+ backgraph.lo win32_threads.lo pthread_support.lo \
pthread_stop_world.lo darwin_stop_world.lo $(am__objects_1)
libgc_la_OBJECTS = $(am_libgc_la_OBJECTS)
[EMAIL PROTECTED]@am_libgc_la_rpath =
[EMAIL PROTECTED]@am_libgc_la_rpath = -rpath $(libdir)
libgccpp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libgccpp_la_OBJECTS = gc_cpp.lo
libgccpp_la_OBJECTS = $(am_libgccpp_la_OBJECTS)
[EMAIL PROTECTED]@@[EMAIL PROTECTED] = -rpath \
[EMAIL PROTECTED]@@GC_CONVENIENCE_TRUE@ $(libdir)
[EMAIL PROTECTED]@am_libgccpp_la_rpath = -rpath $(libdir)
@[EMAIL PROTECTED] = test_cpp$(EXEEXT)
am_gctest_OBJECTS = test.$(OBJEXT)
gctest_OBJECTS = $(am_gctest_OBJECTS)
@@ -173,6 +171,8 @@
CCASFLAGS = @CCASFLAGS@ $(DEFS)
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+COMPILER_XLC_FALSE = @COMPILER_XLC_FALSE@
+COMPILER_XLC_TRUE = @COMPILER_XLC_TRUE@
CPLUSPLUS_FALSE = @CPLUSPLUS_FALSE@
CPLUSPLUS_TRUE = @CPLUSPLUS_TRUE@
CPP = @CPP@
@@ -192,8 +192,6 @@
EXEEXT = @EXEEXT@
EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
GC_CFLAGS = @GC_CFLAGS@
-GC_CONVENIENCE_FALSE = @GC_CONVENIENCE_FALSE@
-GC_CONVENIENCE_TRUE = @GC_CONVENIENCE_TRUE@
GC_VERSION = @GC_VERSION@
INCLUDES = @INCLUDES@
INSTALL_DATA = @INSTALL_DATA@
@@ -320,8 +318,7 @@
cord/de_win.RC libtool.m4
@[EMAIL PROTECTED] =
@[EMAIL PROTECTED] = libgccpp.la
[EMAIL PROTECTED]@lib_LTLIBRARIES = libgc.la $(extra)
[EMAIL PROTECTED]@noinst_LTLIBRARIES = libgc.la
+lib_LTLIBRARIES = libgc.la $(extra)
include_HEADERS = include/gc.h include/gc_local_alloc.h \
include/gc_pthread_redirects.h include/gc_config_macros.h \
include/leak_detector.h include/gc_typed.h @addincludes@
@@ -330,7 +327,7 @@
@[EMAIL PROTECTED] =
@[EMAIL PROTECTED] = powerpc_darwin_mach_dep.s
libgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
-dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c aix_irix_threads.c \
+dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c \
@@ -364,6 +361,8 @@
test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS)
$(EXTRA_TEST_LIBS)
TESTS = gctest $(extra_checks)
all_objs = @addobjs@ $(libgc_la_OBJECTS)
[EMAIL PROTECTED]@ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp
[EMAIL PROTECTED]@ASM_CPP_OPTIONS =
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS)
@@ -443,17 +442,8 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
libgc.la: $(libgc_la_OBJECTS) $(libgc_la_DEPENDENCIES)
- $(LINK) $(am_libgc_la_rpath) $(libgc_la_LDFLAGS) $(libgc_la_OBJECTS)
$(libgc_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(libdir) $(libgc_la_LDFLAGS) $(libgc_la_OBJECTS)
$(libgc_la_LIBADD) $(LIBS)
libgccpp.la: $(libgccpp_la_OBJECTS) $(libgccpp_la_DEPENDENCIES)
$(CXXLINK) $(am_libgccpp_la_rpath) $(libgccpp_la_LDFLAGS)
$(libgccpp_la_OBJECTS) $(libgccpp_la_LIBADD) $(LIBS)
@@ -476,7 +466,6 @@
distclean-compile:
-rm -f *.tab.c
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@@ -618,13 +607,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -636,7 +619,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -644,13 +627,7 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -671,7 +648,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -995,7 +972,7 @@
clean: clean-recursive
clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
- clean-libtool clean-noinstLTLIBRARIES mostlyclean-am
+ clean-libtool mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -1051,20 +1028,20 @@
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-TESTS check-am clean clean-checkPROGRAMS clean-generic \
- clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
- clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-includeHEADERS install-info \
- install-info-am install-libLTLIBRARIES install-man \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ clean-libLTLIBRARIES clean-libtool clean-recursive ctags \
+ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
+ dist-tarZ dist-zip distcheck distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-recursive \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-includeHEADERS install-info install-info-am \
+ install-libLTLIBRARIES install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
uninstall-includeHEADERS uninstall-info-am \
uninstall-libLTLIBRARIES
@@ -1078,9 +1055,8 @@
include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
include/gc_pthread_redirects.h include/gc_config_macros.h \
include/gc_mark.h @addincludes@
-
.s.lo:
- $(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
+ $(LTCOMPILE) $(ASM_CPP_OPTIONS) -c $<
#
# :GOTCHA: GNU make rule for making .s out of .S is flawed,
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/acinclude.m4
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/acinclude.m4:1.3
kaffe/kaffe/kaffevm/boehm-gc/boehm/acinclude.m4:1.4
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/acinclude.m4:1.3 Wed Aug 17 22:38:23 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/acinclude.m4 Fri Dec 23 11:42:00 2005
@@ -17,7 +17,7 @@
# [0-9]+[.][0-9]+(alpha[0.9]+)?
# in lex syntax; if there is no alpha number, GC_ALPHA_VERSION is empty
#
-AC_DEFUN([GC_SET_VERSION], [
+AC_DEFUN(GC_SET_VERSION, [
AC_MSG_CHECKING(GC version numbers)
GC_VERSION_MAJOR=`echo $PACKAGE_VERSION | sed
's/^\([[0-9]][[0-9]]*\)[[.]].*$/\1/g'`
GC_VERSION_MINOR=`echo $PACKAGE_VERSION | sed
's/^[[^.]]*[[.]]\([[0-9]][[0-9]]*\).*$/\1/g'`
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/aclocal.m4
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/aclocal.m4:1.9
kaffe/kaffe/kaffevm/boehm-gc/boehm/aclocal.m4:1.10
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/aclocal.m4:1.9 Tue Oct 25 15:43:02 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/aclocal.m4 Fri Dec 23 11:42:00 2005
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.3 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,11 +11,23 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# -*- Autoconf -*-
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Generated from amversion.in; do not edit by hand.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
@@ -28,17 +40,28 @@
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.6])])
+ [AM_AUTOMAKE_VERSION([1.9.3])])
-# Figure out how to run the assembler. -*- Autoconf -*-
+# Figure out how to run the assembler. -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# serial 3
+
+# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
-# serial 4
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
# AM_PROG_AS
# ----------
@@ -51,13 +74,24 @@
AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
])
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+# AM_AUX_DIR_EXPAND
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
@@ -104,16 +138,26 @@
am_aux_dir=`cd $ac_aux_dir && pwd`
])
-# AM_CONDITIONAL -*- Autoconf -*-
+# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
-# serial 7
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 6
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -137,15 +181,26 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
+# serial 7 -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-# serial 8
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -154,6 +209,7 @@
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
@@ -293,16 +349,27 @@
AC_SUBST([AMDEPBACKSLASH])
])
-# Generate code to set up dependency tracking. -*- Autoconf -*-
+# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
-#serial 3
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+#serial 2
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
@@ -361,19 +428,30 @@
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
-# Do all the work for Automake. -*- Autoconf -*-
+# Do all the work for Automake. -*- Autoconf -*-
+
+# This macro actually does too much some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-# serial 12
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 11
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
@@ -475,27 +553,51 @@
done
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
+
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
install_sh=${install_sh-"$am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# -*- Autoconf -*-
+# Copyright (C) 2003 Free Software Foundation, Inc.
-# serial 2
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
@@ -510,17 +612,28 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+# Add --enable-maintainer-mode option to configure.
# From Jim Meyering
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-# serial 4
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
AC_DEFUN([AM_MAINTAINER_MODE],
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
@@ -539,15 +652,26 @@
AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-# Check to see how 'make' treats includes. -*- Autoconf -*-
+# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-# serial 3
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
# AM_MAKE_INCLUDE()
# -----------------
@@ -591,16 +715,27 @@
rm -f confinc confmf
])
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+# -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-# serial 4
+# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -626,16 +761,27 @@
fi
])
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
# AM_PROG_MKDIR_P
# ---------------
# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
+
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
# created by `make install' are always world readable, even if the
# installer happens to have an overly restrictive umask (e.g. 077).
@@ -689,15 +835,26 @@
fi
AC_SUBST([mkdir_p])])
-# Helper functions for option handling. -*- Autoconf -*-
+# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-# serial 3
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -722,16 +879,28 @@
AC_DEFUN([_AM_IF_OPTION],
*** Patch too long, truncated ***
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
