From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18194 invoked by alias); 2 Dec 2012 00:48:46 -0000 Received: (qmail 18184 invoked by uid 22791); 2 Dec 2012 00:48:45 -0000 X-SWARE-Spam-Status: No, hits=2.1 required=5.0 tests=AWL,BAYES_50,KAM_STOCKTIP,KHOP_RCVD_UNTRUST,KHOP_SPAMHAUS_DROP,RCVD_IN_DNSWL_LOW,TW_KG X-Spam-Check-By: sourceware.org Received: from youngberry.canonical.com (HELO youngberry.canonical.com) (91.189.89.112) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 02 Dec 2012 00:48:35 +0000 Received: from dslb-088-073-096-115.pools.arcor-ip.net ([88.73.96.115] helo=[192.168.42.216]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1TexjV-0000ZQ-20 for java-patches@gcc.gnu.org; Sun, 02 Dec 2012 00:48:33 +0000 Message-ID: <50BAA558.6030502@ubuntu.com> Date: Sun, 02 Dec 2012 00:48:00 -0000 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: GCJ-patches Subject: [patch][boehm-gc update] ChangeLog changes and configury updates Content-Type: multipart/mixed; boundary="------------080202070508090209070104" X-IsSubscribed: yes Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org X-SW-Source: 2012-q4/txt/msg00041.txt.bz2 This is a multi-part message in MIME format. --------------080202070508090209070104 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Content-length: 346 This re-adds/updates the boehm-gc configury and splits the ChangeLog into the upstream ChangeLog and the gcc ChangeLog. committed to the boehm-gc merge branch. Matthias 2012-12-01 Matthias Klose * Rename ChangeLog to ChangeLog.gcc, removing upstream entries from ChangeLog.gcc. [no diff included here] --------------080202070508090209070104 Content-Type: text/x-diff; name="boehm-configury.diff" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="boehm-configury.diff" Content-length: 27535 ChangeLog.gcc 2012-12-01 Matthias Klose * configure.ac (AC_CONFIG_MACRO_DIR): Comment out. Require autoconf 2.64. Set ORIGINAL_LD_FOR_MULTILIBS. Call AC_CANONICAL_HOST, ACX_NONCANONICAL_TARGET, GCC_NO_EXECUTABLES. Call AM_INIT_AUTOMAKE with no-define no-dist. Check for ar and ranlib. De-precious CC and CXX so that the right flags are passed down to multilibs. Call AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER. Use gc_config.h.in as the config header file, re-add gc_ext_config.h.in. * Makefile.am (ACLOCAL_MFLAGS): Comment out. Do not install header files, libraries and pkgconfig files. Set AM_MAKEFLAGS. * cord/cord.am: Do not install header files, libraries files. * include/include.am: Do not install header files. * autogen.sh: Call autoreconf with -I .. -I ../config. * m4/pkg.m4: New. * Makefile.in, aclocal.m4, configure, include/gc_config.h, include/gc_ext_config.h: Regenerate. * real_malloc.c, gc_cpp.cc: Use gc_config.h. * include/private/gc_pmark.h, include/private/gc_priv.h: Likewise. * cord/cordxtra.c, cord/cordprnt.c, cord/cordbscs.c: Likewise. * tests/initsecondarythread.c, tests/subthread_create.c, tests/test.c, tests/threadkey_test.c, tests/test_cpp.cc, tests/thread_leak_test.c, tests/disclaim_test.c: Likewise. Index: autogen.sh =================================================================== --- autogen.sh (Revision 194032) +++ autogen.sh (Arbeitskopie) @@ -12,7 +12,7 @@ # prefix. Otherwise, you may need to invoke autoreconf with the appropriate # -I options to locate the required *.m4 files. -autoreconf -i +autoreconf -i -I m4 -I .. -I ../config echo echo "Ready to run './configure'." Index: cord/cordprnt.c =================================================================== --- cord/cordprnt.c (Revision 194032) +++ cord/cordprnt.c (Arbeitskopie) @@ -21,8 +21,8 @@ /* All this cruft is needed because we want to rely on the underlying */ /* sprintf implementation whenever possible. */ -#ifdef HAVE_CONFIG_H -# include "config.h" +#ifdef HAVE_GC_CONFIG_H +# include "gc_config.h" #endif #ifndef CORD_BUILD # define CORD_BUILD Index: cord/cordbscs.c =================================================================== --- cord/cordbscs.c (Revision 194032) +++ cord/cordbscs.c (Arbeitskopie) @@ -11,8 +11,8 @@ * modified is included with the above copyright notice. */ -#ifdef HAVE_CONFIG_H -# include "config.h" +#ifdef HAVE_GC_CONFIG_H +# include "gc_config.h" #endif #ifndef CORD_BUILD # define CORD_BUILD Index: cord/cord.am =================================================================== --- cord/cord.am (Revision 194032) +++ cord/cord.am (Arbeitskopie) @@ -1,5 +1,5 @@ -lib_LTLIBRARIES += libcord.la +noinst_LTLIBRARIES += libcord.la libcord_la_LIBADD = $(top_builddir)/libgc.la libcord_la_LDFLAGS = -version-info 1:3:0 -no-undefined @@ -22,4 +22,4 @@ cord/tests/de_win.h \ cord/tests/de_win.rc -pkginclude_HEADERS += include/cord.h +dist_noinst_HEADERS += include/cord.h Index: cord/cordxtra.c =================================================================== --- cord/cordxtra.c (Revision 194032) +++ cord/cordxtra.c (Arbeitskopie) @@ -17,8 +17,8 @@ * cord_basics. */ -#ifdef HAVE_CONFIG_H -# include "config.h" +#ifdef HAVE_GC_CONFIG_H +# include "gc_config.h" #endif #ifndef CORD_BUILD # define CORD_BUILD Index: Makefile.am =================================================================== --- Makefile.am (Revision 194032) +++ Makefile.am (Arbeitskopie) @@ -1,4 +1,5 @@ # Copyright (c) 1999-2001 by Red Hat, Inc. All rights reserved. +# Copyright (c) 2012 Free Software Foundation, Inc. # # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED # OR IMPLIED. ANY USE IS AT YOUR OWN RISK. @@ -27,16 +28,17 @@ # endif SUBDIRS = -ACLOCAL_AMFLAGS = -I m4 +# FIXME: if set, copies the libtool m4 files into m4/ +#ACLOCAL_AMFLAGS = -I m4 -I .. -I ../config AM_CPPFLAGS = \ -I$(top_builddir)/include -I$(top_srcdir)/include \ $(ATOMIC_OPS_CFLAGS) # Initialize variables so that we can declare files locally. EXTRA_DIST = -lib_LTLIBRARIES = +noinst_LTLIBRARIES = include_HEADERS = -pkginclude_HEADERS = +noinst_HEADERS = dist_noinst_HEADERS = check_PROGRAMS = check_LTLIBRARIES = @@ -48,7 +50,7 @@ # C Library # --------- -lib_LTLIBRARIES += libgc.la +noinst_LTLIBRARIES += libgc.la libgc_convenience.la if SINGLE_GC_OBJ libgc_la_SOURCES = extra/gc.c else @@ -100,6 +102,10 @@ libgc_la_DEPENDENCIES = @addobjs@ libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined +libgc_convenience_la_SOURCES = $(libgc_la_SOURCES) +libgc_convenience_la_LIBADD = @addobjs@ +libgc_convenience_la_DEPENDENCIES = @addobjs@ + EXTRA_libgc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \ src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s @@ -108,9 +114,9 @@ # ------------- if CPLUSPLUS -lib_LTLIBRARIES += libgccpp.la -pkginclude_HEADERS += include/gc_cpp.h -include_HEADERS += include/extra/gc_cpp.h +noinst_LTLIBRARIES += libgccpp.la +noinst_HEADERS += include/gc_cpp.h +noinst_HEADERS += include/extra/gc_cpp.h libgccpp_la_SOURCES = gc_cpp.cc libgccpp_la_LIBADD = ./libgc.la libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined @@ -127,6 +133,8 @@ AM_CXXFLAGS = @GC_CFLAGS@ AM_CFLAGS = @GC_CFLAGS@ +AM_LDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) +override CFLAGS := $(filter-out $(O0_CFLAGS), $(CFLAGS)) $(O0_CFLAGS) ## FIXME: relies on internal code generated by automake. ## FIXME: ./configure --enable-dependency-tracking should be used @@ -196,6 +204,47 @@ .S.s: if $(CPP) $< >$@ ; then :; else rm -f $@; fi +# 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)" + include include/include.am include cord/cord.am include tests/tests.am Index: tests/thread_leak_test.c =================================================================== --- tests/thread_leak_test.c (Revision 194032) +++ tests/thread_leak_test.c (Arbeitskopie) @@ -1,6 +1,6 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" +#ifdef HAVE_GC_CONFIG_H +# include "gc_config.h" #endif #ifndef GC_THREADS Index: tests/initsecondarythread.c =================================================================== --- tests/initsecondarythread.c (Revision 194032) +++ tests/initsecondarythread.c (Arbeitskopie) @@ -15,8 +15,8 @@ * thread. */ -#ifdef HAVE_CONFIG_H -# include "config.h" +#ifdef HAVE_GC_CONFIG_H +# include "gc_config.h" #endif #ifndef GC_THREADS Index: tests/test_cpp.cc =================================================================== --- tests/test_cpp.cc (Revision 194032) +++ tests/test_cpp.cc (Arbeitskopie) @@ -22,8 +22,8 @@ ***************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" +#ifdef HAVE_GC_CONFIG_H +# include "gc_config.h" #endif #undef GC_BUILD Index: tests/subthread_create.c =================================================================== --- tests/subthread_create.c (Revision 194032) +++ tests/subthread_create.c (Arbeitskopie) @@ -1,7 +1,7 @@ -#ifdef HAVE_CONFIG_H +#ifdef HAVE_GC_CONFIG_H /* For PARALLEL_MARK */ -# include "config.h" +# include "gc_config.h" #endif #ifndef GC_THREADS Index: tests/test.c =================================================================== --- tests/test.c (Revision 194032) +++ tests/test.c (Arbeitskopie) @@ -18,8 +18,8 @@ /* GC. It uses GC internals to allow more precise results */ /* checking for some of the tests. */ -# ifdef HAVE_CONFIG_H -# include "config.h" +# ifdef HAVE_GC_CONFIG_H +# include "gc_config.h" # endif # undef GC_BUILD Index: tests/threadkey_test.c =================================================================== --- tests/threadkey_test.c (Revision 194032) +++ tests/threadkey_test.c (Arbeitskopie) @@ -1,6 +1,6 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" +#ifdef HAVE_GC_CONFIG_H +# include "gc_config.h" #endif #ifndef GC_THREADS Index: tests/disclaim_test.c =================================================================== --- tests/disclaim_test.c (Revision 194032) +++ tests/disclaim_test.c (Arbeitskopie) @@ -20,9 +20,9 @@ #include #include -#ifdef HAVE_CONFIG_H +#ifdef HAVE_GC_CONFIG_H /* For GC_[P]THREADS */ -# include "config.h" +# include "gc_config.h" #endif #include "gc_disclaim.h" Index: m4/pkg.m4 =================================================================== --- m4/pkg.m4 (Revision 0) +++ m4/pkg.m4 (Arbeitskopie) @@ -0,0 +1,159 @@ +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# 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 of the License, 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. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES Index: include/include.am =================================================================== --- include/include.am (Revision 194032) +++ include/include.am (Arbeitskopie) @@ -12,7 +12,7 @@ # installed headers # -pkginclude_HEADERS += \ +dist_noinst_HEADERS += \ include/gc.h \ include/gc_allocator.h \ include/gc_backptr.h \ @@ -50,5 +50,5 @@ include/private/thread_local_alloc.h # unprefixed header -include_HEADERS += \ +dist_noinst_HEADERS += \ include/extra/gc.h Index: include/gc_config.h.in =================================================================== --- include/gc_config.h.in (Revision 0) +++ include/gc_config.h.in (Arbeitskopie) @@ -0,0 +1,257 @@ +/* include/gc_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to recognise all pointers to the interior of objects. */ +#undef ALL_INTERIOR_POINTERS + +/* Define to enable atomic uncollectible allocation. */ +#undef ATOMIC_UNCOLLECTABLE + +/* See doc/README.macros. */ +#undef DARWIN_DONT_PARSE_STACK + +/* Define to force debug headers on all objects. */ +#undef DBG_HDRS_ALL + +/* Define to enable support for DB/UX threads. */ +#undef DGUX_THREADS + +/* Define to enable eCos target support. */ +#undef ECOS + +/* Wine getenv may not return NULL for missing entry. */ +#undef EMPTY_GETENV_RESULTS + +/* Define to enable alternative finalization interface. */ +#undef ENABLE_DISCLAIM + +/* Define to support IBM AIX threads. */ +#undef GC_AIX_THREADS + +/* The alpha version number, if applicable. */ +#undef GC_ALPHA_VERSION + +/* Define to enable internal debug assertions. */ +#undef GC_ASSERTIONS + +/* Define to support Darwin pthreads. */ +#undef GC_DARWIN_THREADS + +/* Define to enable support for DB/UX threads on i386. */ +#undef GC_DGUX386_THREADS + +/* Define to build dynamic libraries with only API symbols exposed. */ +#undef GC_DLL + +/* Define to support FreeBSD pthreads. */ +#undef GC_FREEBSD_THREADS + +/* Define to include support for gcj. */ +#undef GC_GCJ_SUPPORT + +/* Define to support GNU pthreads. */ +#undef GC_GNU_THREADS + +/* Define if backtrace information is supported. */ +#undef GC_HAVE_BUILTIN_BACKTRACE + +/* Define to support HP/UX 11 pthreads. */ +#undef GC_HPUX_THREADS + +/* Enable Win32 DllMain-based approach of threads registering. */ +#undef GC_INSIDE_DLL + +/* Define to support Irix pthreads. */ +#undef GC_IRIX_THREADS + +/* Define to support pthreads on Linux. */ +#undef GC_LINUX_THREADS + +/* Define to support NetBSD pthreads. */ +#undef GC_NETBSD_THREADS + +/* Define to support OpenBSD pthreads. */ +#undef GC_OPENBSD_THREADS + +/* Define to support Tru64 pthreads. */ +#undef GC_OSF1_THREADS + +/* Read environment variables from the GC 'env' file. */ +#undef GC_READ_ENV_FILE + +/* Define to support rtems-pthreads. */ +#undef GC_RTEMS_PTHREADS + +/* Define to support Solaris pthreads. */ +#undef GC_SOLARIS_THREADS + +/* Define to support platform-specific threads. */ +#undef GC_THREADS + +/* Explicitly prefix exported/imported WINAPI symbols with '_'. */ +#undef GC_UNDERSCORE_STDCALL + +/* See doc/README.macros. */ +#undef GC_USE_DLOPEN_WRAP + +/* The major version number of this GC release. */ +#undef GC_VERSION_MAJOR + +/* The minor version number of this GC release. */ +#undef GC_VERSION_MINOR + +/* Define to support win32-pthreads. */ +#undef GC_WIN32_PTHREADS + +/* Define to support Win32 threads. */ +#undef GC_WIN32_THREADS + +/* Define to install pthread_atfork() handlers by default. */ +#undef HANDLE_FORK + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* See doc/README.macros. */ +#undef JAVA_FINALIZATION + +/* Define to save back-pointers in debugging headers. */ +#undef KEEP_BACK_PTRS + +/* Define to optimize for large heaps or root sets. */ +#undef LARGE_CONFIG + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + +/* See doc/README.macros. */ +#undef MAKE_BACK_GRAPH + +/* Number of GC cycles to wait before unmapping an unused block. */ +#undef MUNMAP_THRESHOLD + +/* Define to not use system clock (cross compiling). */ +#undef NO_CLOCK + +/* Disable debugging, like GC_dump and its callees. */ +#undef NO_DEBUGGING + +/* Define to make the collector not allocate executable memory by default. */ +#undef NO_EXECUTE_PERMISSION + +/* Prohibit installation of pthread_atfork() handlers. */ +#undef NO_HANDLE_FORK + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to enable parallel marking. */ +#undef PARALLEL_MARK + +/* If defined, redirect free to this function. */ +#undef REDIRECT_FREE + +/* If defined, redirect malloc to this function. */ +#undef REDIRECT_MALLOC + +/* If defined, redirect GC_realloc to this function. */ +#undef REDIRECT_REALLOC + +/* The number of caller frames saved when allocating with the debugging API. + */ +#undef SAVE_CALL_COUNT + +/* Shorten the headers to minimize object size at the expense of checking for + writes past the end (see doc/README.macros). */ +#undef SHORT_DBG_HDRS + +/* Define to tune the collector for small heap sizes. */ +#undef SMALL_CONFIG + +/* See the comment in gcconfig.h. */ +#undef SOLARIS25_PROC_VDB_BUG_FIXED + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define to work around a Solaris 5.3 bug (see dyn_load.c). */ +#undef SUNOS53_SHARED_LIB + +/* Define to enable thread-local allocation optimisation. */ +#undef THREAD_LOCAL_ALLOC + +/* Use Unicode (W) variant of Win32 API instead of ASCII (A) one. */ +#undef UNICODE + +/* Define to use of compiler-support for thread-local variables. */ +#undef USE_COMPILER_TLS + +/* Define to use mmap instead of sbrk to expand the heap. */ +#undef USE_MMAP + +/* Define to return memory to OS with munmap calls (see doc/README.macros). */ +#undef USE_MUNMAP + +/* Define to use Win32 VirtualAlloc (instead of sbrk or mmap) to expand the + heap. */ +#undef USE_WINALLOC + +/* The POSIX feature macro. */ +#undef _POSIX_C_SOURCE + +/* Indicates the use of pthreads (NetBSD). */ +#undef _PTHREADS + +/* Required define if using POSIX threads. */ +#undef _REENTRANT + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif Index: include/private/gc_priv.h =================================================================== --- include/private/gc_priv.h (Revision 194032) +++ include/private/gc_priv.h (Arbeitskopie) @@ -18,8 +18,8 @@ #ifndef GC_PRIVATE_H #define GC_PRIVATE_H -#ifdef HAVE_CONFIG_H -# include "config.h" +#ifdef HAVE_GC_CONFIG_H +# include "gc_config.h" #endif #ifndef GC_BUILD Index: include/private/gc_pmark.h =================================================================== --- include/private/gc_pmark.h (Revision 194032) +++ include/private/gc_pmark.h (Arbeitskopie) @@ -22,8 +22,8 @@ #ifndef GC_PMARK_H #define GC_PMARK_H -#ifdef HAVE_CONFIG_H -# include "config.h" +#ifdef HAVE_GC_CONFIG_H +# include "gc_config.h" #endif #ifndef GC_BUILD Index: include/gc_ext_config.h.in =================================================================== --- include/gc_ext_config.h.in (Revision 0) +++ include/gc_ext_config.h.in (Arbeitskopie) @@ -0,0 +1,7 @@ +/* include/gc_ext_config.h.in. This contains definitions needed by +external clients that do not want to include the full gc.h. Currently this +is used by libjava/include/boehm-gc.h. */ + +#undef THREAD_LOCAL_ALLOC + +#undef HAVE_PTHREAD_GETATTR_NP Index: real_malloc.c =================================================================== --- real_malloc.c (Revision 194032) +++ real_malloc.c (Arbeitskopie) @@ -12,8 +12,8 @@ * modified is included with the above copyright notice. */ -# ifdef HAVE_CONFIG_H -# include "config.h" +# ifdef HAVE_GC_CONFIG_H +# include "gc_config.h" # endif # ifdef PCR Index: configure.ac =================================================================== --- configure.ac (Revision 194032) +++ configure.ac (Arbeitskopie) @@ -1,4 +1,6 @@ -# Copyright (c) 1999-2001 by Red Hat, Inc. All rights reserved. +# Copyright (c) 1999, 2000, 2001, 2002, 2003, 2006, 2010, 2011 by Red Hat, Inc. +# Copyright 2004 Nathanael Nerode +# Copyright (c) 2012 Free Software Foundation, Inc. # # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED # OR IMPLIED. ANY USE IS AT YOUR OWN RISK. @@ -15,22 +17,48 @@ AC_INIT(gc,7.3alpha3,gc@linux.hpl.hp.com) ## version must conform to [0-9]+[.][0-9]+(alpha[0-9]+)? AC_CONFIG_SRCDIR(gcj_mlc.c) -AC_CONFIG_MACRO_DIR([m4]) +dnl FIXME: if set, copies the libtool m4 files into m4/ +dnl AC_CONFIG_MACRO_DIR([m4]) +# 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 + +AM_ENABLE_MULTILIB(, ..) + +AC_CANONICAL_HOST AC_CANONICAL_TARGET -AC_PREREQ(2.61) + +# Get the 'noncanonical' system names. +ACX_NONCANONICAL_TARGET + +AC_PREREQ(2.64) AC_REVISION($Revision: 1.69 $) GC_SET_VERSION -AM_INIT_AUTOMAKE([foreign dist-bzip2 nostdinc]) -AM_CONFIG_HEADER([include/config.h]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 nostdinc no-define no-dist]) AM_MAINTAINER_MODE AC_SUBST(PACKAGE) AC_SUBST(GC_VERSION) +# The autoconf 2.5x version of the no-executables hack. +GCC_NO_EXECUTABLES + +# Yak. We must force CC and CXX to /not/ be precious variables; otherwise +# the wrong, non-multilib-adjusted value will be used in multilibs. +# As a side effect, we have to subst CFLAGS and CXXFLAGS ourselves. + +m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) +m4_define([_AC_ARG_VAR_PRECIOUS],[]) +AC_PROG_CC +AC_PROG_CXX +m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) AM_PROG_CC_C_O -AC_PROG_CXX AM_PROG_AS +AC_CHECK_TOOL(AR, ar) +AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL @@ -903,6 +931,7 @@ dnl Produce the Files dnl ----------------- +AC_CONFIG_HEADERS([include/gc_config.h include/gc_ext_config.h]) AC_CONFIG_FILES([Makefile bdw-gc.pc]) AC_CONFIG_COMMANDS([default],, Index: gc_cpp.cc =================================================================== --- gc_cpp.cc (Revision 194032) +++ gc_cpp.cc (Arbeitskopie) @@ -19,8 +19,8 @@ built-in "new" and "delete". **************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" +#ifdef HAVE_GC_CONFIG_H +# include "gc_config.h" #endif #ifndef GC_BUILD --------------080202070508090209070104--