# Work around what appears to be a GNU make bug handling MAKEFLAGS
# values defined in terms of make variables, as is the case for CC and
-diff -Nur ../boehm-gc/Makefile.am~ boehm-gc/Makefile.am~
---- ../boehm-gc/Makefile.am~ Thu Oct 24 16:42:27 2002
-+++ boehm-gc/Makefile.am~ Wed Dec 31 16:00:00 1969
-@@ -1,159 +0,0 @@
--## Process this file with automake to produce Makefile.in.
--
--## FIXME: `make dist' in this directory will not currently work. Many
--## files that should be in the distribution are not mentioned in this
--## Makefile.am.
--
--AUTOMAKE_OPTIONS = cygnus
--
--SUBDIRS = include
--
--# Multilib support variables.
--MULTISRCTOP =
--MULTIBUILDTOP =
--MULTIDIRS =
--MULTISUBDIR =
--MULTIDO = true
--MULTICLEAN = true
--
--## Install a library built with a cross compiler in tooldir, not
--## libdir.
--if USE_LIBDIR
--toolexeclibdir = $(libdir)$(MULTISUBDIR)
--else
--toolexecdir = $(exec_prefix)/$(target_alias)
--toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
--endif
--
--noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la
--
--GC_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 irix_threads.c \
--linux_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
--
--EXTRA_GC_SOURCES = alpha_mach_dep.s \
--mips_sgi_mach_dep.S mips_ultrix_mach_dep.s powerpc_macosx_mach_dep.s \
--rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
--sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
--
--libgcjgc_la_SOURCES = $(GC_SOURCES)
--libgcjgc_convenience_la_SOURCES = $(GC_SOURCES)
--EXTRA_libgcjgc_la_SOURCES = $(EXTRA_GC_SOURCES)
--EXTRA_libgcjgc_convenience_la_SOURCES = $(EXTRA_GC_SOURCES)
--
--# Include THREADLIBS here to ensure that the correct versions of
--# linuxthread semaphore functions get linked:
--libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS)
--libgcjgc_la_DEPENDENCIES = @addobjs@
--libgcjgc_la_LDFLAGS = -version-info 1:1:0 -rpath $(toolexeclibdir)
--
--libgcjgc_convenience_la_LIBADD = @addobjs@
--libgcjgc_convenience_la_DEPENDENCIES = @addobjs@
--
--AM_CXXFLAGS = @GC_CFLAGS@
--AM_CFLAGS = @GC_CFLAGS@
--
--check_PROGRAMS = gctest
--# The following hack produces a warning from automake, but we need it in order
--# to build a file from a subdirectory. FIXME.
--test.o: tests/test.c
-- $(COMPILE) -c $(srcdir)/tests/test.c
--# Using $< in the above seems to fail with the HP/UX on Itanium make.
--
--gctest_OBJECTS = test.o
--gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
--gctest_LDFLAGS = -shared-libgcc
--TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
--TESTS = gctest
--
--## FIXME: relies on internal code generated by automake.
--all_objs = @addobjs@ $(libgcjgc_la_OBJECTS)
--$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
--include/private/gc_hdrs.h include/gc.h include/gc_gcj.h include/gc_mark.h
--
--## FIXME: we shouldn't have to do this, but automake forces us to.
--.s.lo:
--## We use -Wp,-P to strip #line directives. Irix `as' chokes on
--## these.
-- $(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
--
--## We have our own definition of LTCOMPILE because we want to use our
--## CFLAGS, not those passed in from the top level make.
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS)
--LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@
--
--AM_CFLAGS = @GC_CFLAGS@
--
--# Work around what appears to be a GNU make bug handling MAKEFLAGS
--# values defined in terms of make variables, as is the case for CC and
--# friends when we are called from the top level Makefile.
--AM_MAKEFLAGS = \
-- "AR_FLAGS=$(AR_FLAGS)" \
-- "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
-- "CFLAGS=$(CFLAGS)" \
-- "CXXFLAGS=$(CXXFLAGS)" \
-- "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
-- "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
-- "INSTALL=$(INSTALL)" \
-- "INSTALL_DATA=$(INSTALL_DATA)" \
-- "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-- "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-- "LDFLAGS=$(LDFLAGS)" \
-- "LIBCFLAGS=$(LIBCFLAGS)" \
-- "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
-- "MAKE=$(MAKE)" \
-- "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
-- "PICFLAG=$(PICFLAG)" \
-- "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
-- "SHELL=$(SHELL)" \
-- "EXPECT=$(EXPECT)" \
-- "RUNTEST=$(RUNTEST)" \
-- "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
-- "exec_prefix=$(exec_prefix)" \
-- "infodir=$(infodir)" \
-- "libdir=$(libdir)" \
-- "prefix=$(prefix)" \
-- "tooldir=$(tooldir)" \
-- "AR=$(AR)" \
-- "AS=$(AS)" \
-- "CC=$(CC)" \
-- "CXX=$(CXX)" \
-- "LD=$(LD)" \
-- "LIBCFLAGS=$(LIBCFLAGS)" \
-- "NM=$(NM)" \
-- "PICFLAG=$(PICFLAG)" \
-- "RANLIB=$(RANLIB)" \
-- "DESTDIR=$(DESTDIR)"
--
--CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
--
--# Multilib support.
--.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
-- maintainer-clean-multi
--
--all-am: all-multi
--install-am: install-multi
--mostlyclean-am: mostlyclean-multi
--clean-am: clean-multi
--distclean-am: distclean-multi
--maintainer-clean-am: maintainer-clean-multi
--
--all-multi:
-- : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
--install-multi:
-- $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
--mostlyclean-multi:
-- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean
--clean-multi:
-- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean
--distclean-multi:
-- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean
--maintainer-clean-multi:
-- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean
--
--MAKEOVERRIDES=
diff -Nur ../boehm-gc/Makefile.in boehm-gc/Makefile.in
--- ../boehm-gc/Makefile.in Mon May 26 13:08:48 2003
+++ boehm-gc/Makefile.in Tue May 13 17:18:14 2003
--- ../boehm-gc/alpha_mach_dep.s Mon May 26 12:48:52 2003
+++ boehm-gc/alpha_mach_dep.s Fri Aug 17 11:30:45 2001
@@ -1,4 +1,3 @@
-- # $Id: darwin.patch,v 1.4 2003/09/10 04:33:29 megacz Exp $
+- # $Id: darwin.patch,v 1.5 2003/09/10 04:36:20 megacz Exp $
.arch ev6
.text
+ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
DEFS="$DEFS"
)
-diff -Nur ../boehm-gc/configure.in~ boehm-gc/configure.in~
---- ../boehm-gc/configure.in~ Mon May 26 13:33:22 2003
-+++ boehm-gc/configure.in~ Wed Dec 31 16:00:00 1969
-@@ -1,317 +0,0 @@
--# Copyright (c) 1999, 2000, 2001, 2002 by Red Hat, Inc. All rights reserved.
--#
--# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
--# OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
--#
--# Permission is hereby granted to use or copy this program
--# for any purpose, provided the above notices are retained on all copies.
--# Permission to modify the code and to distribute modified code is granted,
--# provided the above notices are retained, and a notice that the code was
--# modified is included with the above copyright notice.
--#
--# Original author: Tom Tromey
--
--dnl Process this file with autoconf to produce configure.
--
--AC_INIT(gcj_mlc.c)
--
--# This works around the fact that libtool configuration may change LD
--# for this particular configuration, but some shells, instead of
--# keeping the changes in LD private, export them just because LD is
--# exported.
--ORIGINAL_LD_FOR_MULTILIBS=$LD
--
--dnl Can't be done in GC_CONFIGURE because that confuses automake.
--AC_CONFIG_AUX_DIR(.)
--
--GC_CONFIGURE(.)
--
--AM_PROG_LIBTOOL
--
--dnl We use these options to decide which functions to include.
--AC_ARG_WITH(target-subdir,
--[ --with-target-subdir=SUBDIR
-- configuring with a cross compiler])
--AC_ARG_WITH(cross-host,
--[ --with-cross-host=HOST configuring with a cross compiler])
--
--AM_MAINTAINER_MODE
--# automake wants to see AC_EXEEXT. But we don't need it. And having
--# it is actually a problem, because the compiler we're passed can't
--# necessarily do a full link. So we fool automake here.
--if false; then
-- # autoconf 2.50 runs AC_EXEEXT by default, and the macro expands
-- # to nothing, so nothing would remain between `then' and `fi' if it
-- # were not for the `:' below.
-- :
-- AC_EXEEXT
--fi
--
--AC_MSG_CHECKING([for thread model used by GCC])
--THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
--if test -z "$THREADS"; then
-- THREADS=no
--fi
--AC_MSG_RESULT([$THREADS])
--
--AC_ARG_ENABLE(parallel-mark,
--[ --enable-parallel-mark parallelize marking and free list construction],
-- [case "$THREADS" in
-- no | none | single)
-- AC_MSG_ERROR([Parallel mark requires --enable-threads=x spec])
-- ;;
-- esac]
--)
--
--INCLUDES=-I${srcdir}/include
--THREADLIBS=
--case "$THREADS" in
-- no | none | single)
-- THREADS=none
-- ;;
-- posix | pthreads)
-- THREADS=posix
-- THREADLIBS=-lpthread
-- case "$host" in
-- x86-*-linux* | ia64-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* )
-- AC_DEFINE(GC_LINUX_THREADS)
-- AC_DEFINE(_REENTRANT)
-- if test "${enable_parallel_mark}"; then
-- AC_DEFINE(PARALLEL_MARK)
-- fi
-- AC_DEFINE(THREAD_LOCAL_ALLOC)
-- ;;
-- *-*-linux*)
-- AC_DEFINE(GC_LINUX_THREADS)
-- AC_DEFINE(_REENTRANT)
-- ;;
-- *-*-hpux*)
-- AC_MSG_WARN("Only HP/UX 11 threads are supported.")
-- AC_DEFINE(GC_HPUX_THREADS)
-- AC_DEFINE(_POSIX_C_SOURCE,199506L)
-- if test "${enable_parallel_mark}" = yes; then
-- AC_DEFINE(PARALLEL_MARK)
-- fi
-- AC_DEFINE(THREAD_LOCAL_ALLOC)
-- THREADLIBS="-lpthread -lrt"
-- ;;
-- *-*-freebsd*)
-- AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
-- AC_DEFINE(GC_FREEBSD_THREADS)
-- INCLUDES="$INCLUDES -pthread"
-- THREADLIBS=-pthread
-- ;;
-- *-*-solaris*)
-- AC_DEFINE(GC_SOLARIS_THREADS)
-- AC_DEFINE(GC_SOLARIS_PTHREADS)
-- ;;
-- *-*-irix*)
-- AC_DEFINE(GC_IRIX_THREADS)
-- ;;
-- *-*-cygwin*)
-- THREADLIBS=
-- ;;
-- esac
-- ;;
-- *-*-darwin*)
-- AC_DEFINE(GC_DARWIN_THREADS)
-- AC_DEFINE(THREAD_LOCAL_ALLOC)
-- if test "${enable_parallel_mark}" = yes; then
-- AC_DEFINE(PARALLEL_MARK)
-- fi
-- ;;
-- win32)
-- AC_DEFINE(GC_WIN32_THREADS)
-- AC_DEFINE(NO_GETENV)
-- ;;
-- decosf1 | irix | mach | os2 | solaris | dce | vxworks)
-- AC_MSG_ERROR(thread package $THREADS not yet supported)
-- ;;
-- *)
-- AC_MSG_ERROR($THREADS is an unknown thread package)
-- ;;
--esac
--AC_SUBST(THREADLIBS)
--
--case "$host" in
-- powerpc-*-darwin*)
-- powerpc_darwin=true
-- ;;
--esac
--AM_CONDITIONAL(POWERPC_DARWIN,test x$powerpc_darwin = xtrue)
--
--# We never want libdl on darwin. It is a fake libdl that just ends up making
--# dyld calls anyway
--case "$host" in
-- *-*-darwin*) ;;
-- *)
-- AC_CHECK_LIB(dl, dlopen, EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -ldl")
-- ;;
--esac
--
--AC_SUBST(EXTRA_TEST_LIBS)
--
--target_all=libgcjgc.la
--AC_SUBST(target_all)
--AC_SUBST(target_alias)
--
--dnl If the target is an eCos system, use the appropriate eCos
--dnl I/O routines.
--dnl FIXME: this should not be a local option but a global target
--dnl system; at present there is no eCos target.
--TARGET_ECOS="no"
--AC_ARG_WITH(ecos,
--[ --with-ecos enable runtime eCos target support],
--TARGET_ECOS="$with_ecos"
--)
--
--addobjs=
--CXXINCLUDES=
--case "$TARGET_ECOS" in
-- no)
-- ;;
-- *)
-- AC_DEFINE(ECOS)
-- CXXINCLUDES="-I${TARGET_ECOS}/include"
-- addobjs="$addobjs ecos.lo"
-- ;;
--esac
--AC_SUBST(CXX)
--
--AC_SUBST(INCLUDES)
--AC_SUBST(CXXINCLUDES)
--
--machdep=
--case "$host" in
-- alpha*-*-openbsd*)
-- machdep="alpha_mach_dep.lo"
-- if test x"${ac_cv_lib_dl_dlopen}" != xyes ; then
-- AC_MSG_WARN(OpenBSD/Alpha without dlopen(). Shared library support is disabled)
-- AM_DISABLE_SHARED
-- fi
-- ;;
-- alpha*-*-*)
-- machdep="alpha_mach_dep.lo"
-- ;;
-- i?86-*-solaris2.[[89]]*)
-- AC_DEFINE(SOLARIS25_PROC_VDB_BUG_FIXED)
-- ;;
-- mipstx39-*-elf*)
-- machdep="mips_ultrix_mach_dep.lo"
-- AC_DEFINE(STACKBASE, __stackbase)
-- AC_DEFINE(DATASTART_IS_ETEXT)
-- ;;
-- mips-dec-ultrix*)
-- machdep="mips_ultrix_mach-dep.lo"
-- ;;
-- mips*-*-linux*)
-- ;;
-- mips-*-*)
-- machdep="mips_sgi_mach_dep.lo"
-- AC_DEFINE(NO_EXECUTE_PERMISSION)
-- ;;
-- sparc-sun-solaris2.3*)
-- machdep="sparc_mach_dep.lo"
-- AC_DEFINE(SUNOS53_SHARED_LIB)
-- ;;
-- sparc-sun-solaris2.*)
-- machdep="sparc_mach_dep.lo"
-- ;;
-- ia64-*-*)
-- machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
-- ;;
--esac
--if test x"$machdep" = x; then
-- machdep="mach_dep.lo"
--fi
--addobjs="$addobjs $machdep"
--AC_SUBST(addobjs)
--
--dnl As of 4.13a2, the collector will not properly work on Solaris when
--dnl built with gcc and -O. So we remove -O in the appropriate case.
--case "$host" in
-- sparc-sun-solaris2*)
-- if test "$GCC" = yes; then
-- new_CFLAGS=
-- for i in $CFLAGS; do
-- case "$i" in
-- -O*)
-- ;;
-- *)
-- new_CFLAGS="$new_CFLAGS $i"
-- ;;
-- esac
-- done
-- CFLAGS="$new_CFLAGS"
-- fi
-- ;;
--esac
--
--dnl We need to override the top-level CFLAGS. This is how we do it.
--MY_CFLAGS="$CFLAGS"
--AC_SUBST(MY_CFLAGS)
--
--dnl Include defines that have become de facto standard.
--dnl ALL_INTERIOR_POINTERS can be overridden in startup code.
--AC_DEFINE(SILENT)
--AC_DEFINE(NO_SIGNALS)
--AC_DEFINE(NO_EXECUTE_PERMISSION)
--AC_DEFINE(ALL_INTERIOR_POINTERS)
--
--dnl By default, make the library as general as possible.
--AC_DEFINE(JAVA_FINALIZATION)
--AC_DEFINE(GC_GCJ_SUPPORT)
--AC_DEFINE(ATOMIC_UNCOLLECTABLE)
--
--dnl This is something of a hack. When cross-compiling we turn off
--dnl some functionality. These is only correct when targetting an
--dnl embedded system. FIXME.
--if test -n "${with_cross_host}"; then
-- AC_DEFINE(NO_SIGSET)
-- AC_DEFINE(NO_DEBUGGING)
--fi
--
--AC_ARG_ENABLE(full-debug,
--[ --enable-full-debug include full support for pointer backtracing etc.],
--[ if test "$enable_full_debug" = "yes"; then
-- AC_MSG_WARN("Must define GC_DEBUG and use debug alloc. in clients.")
-- AC_DEFINE(KEEP_BACK_PTRS)
-- AC_DEFINE(DBG_HDRS_ALL)
-- case $host in
-- ia64-*-linux* )
-- AC_DEFINE(MAKE_BACK_GRAPH)
-- ;;
-- x86-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* )
-- AC_DEFINE(MAKE_BACK_GRAPH)
-- AC_MSG_WARN("Client must not use -fomit-frame-pointer.")
-- AC_DEFINE(SAVE_CALL_COUNT, 8)
-- ;;
-- esac ]
-- fi)
--
--AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
--
--if test "${multilib}" = "yes"; then
-- multilib_arg="--enable-multilib"
--else
-- multilib_arg=
--fi
--
--AC_OUTPUT(Makefile include/Makefile, [
--dnl Put all the -D options in a file.
--echo "$DEFS" > boehm-cflags
--
--if test -n "$CONFIG_FILES"; then
-- LD="${ORIGINAL_LD_FOR_MULTILIBS}"
-- ac_file=Makefile . ${gc_basedir}/../config-ml.in
--fi],
--srcdir=${srcdir}
--host=${host}
--target=${target}
--with_multisubdir=${with_multisubdir}
--ac_configure_args="${multilib_arg} ${ac_configure_args}"
--CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
--gc_basedir=${gc_basedir}
--CC="${CC}"
--DEFS="$DEFS"
--)
diff -Nur ../boehm-gc/darwin_stop_world.c boehm-gc/darwin_stop_world.c
--- ../boehm-gc/darwin_stop_world.c Sun Jun 1 14:17:58 2003
+++ boehm-gc/darwin_stop_world.c Wed Dec 31 16:00:00 1969
projects / org.ibex.core.git / commitdiff