This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: configure changes for GC merge
- From: Bryce McKinlay <mckinlay at redhat dot com>
- To: java-patches at gcc dot gnu dot org
- Date: Fri, 13 Aug 2004 19:03:00 -0400
- Subject: FYI: configure changes for GC merge
This patch changes the libjava and boehm-gc configury to not use the
boehm-cflags file to pass GC configuration settings to libjava. Instead
of compiling libjava's files with -D options sourced from this file, the
options are now picked up through including gc.h and gc_config.h.
Bryce
boehm-gc:
2004-08-13 Bryce McKinlay <mckinlay@redhat.com>
* configure.ac (gc_cflags): Add -Iinclude.
(AC_CONFIG_HEADERS): New. Configure gc_config.h header.
Don't write DEFS to boehm-cflags file.
* configure: Rebuilt.
libjava:
2004-08-13 Bryce McKinlay <mckinlay@redhat.com>
* configure.in (GCINCS): Don't use "boehm-cflags". Instead, -I
boehm-gc's include dirs.
* configure: Rebuilt.
* include/boehm-gc.h: Include gc_config.h.
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/configure.ac,v
retrieving revision 1.1
diff -u -r1.1 configure.ac
--- configure.ac 16 Jun 2004 07:34:42 -0000 1.1
+++ configure.ac 13 Aug 2004 22:59:53 -0000
@@ -37,7 +37,7 @@
mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
AC_SUBST(mkinstalldirs)
-AM_INIT_AUTOMAKE(gc, 6.1a1, no-define)
+AM_INIT_AUTOMAKE(gc, 6.3, no-define)
# The autoconf 2.5x version of the no-executables hack.
sinclude(../config/no-executables.m4)
@@ -79,7 +79,7 @@
*) gc_flagbasedir='[$](top_builddir)/'[$]{gc_basedir} ;;
esac
-gc_cflags="[$]{gc_cflags} -I"'[$](top_builddir)'"/./targ-include -I[$]{gc_flagbasedir}/libc/include"
+gc_cflags="[$]{gc_cflags} -Iinclude -I"'[$](top_builddir)'"/./targ-include -I[$]{gc_flagbasedir}/libc/include"
case "${host}" in
*-*-cygwin32*)
gc_cflags="[$]{gc_cflags} -I[$]{gc_flagbasedir}/../winsup/include"
@@ -480,10 +480,7 @@
multilib_arg=
fi
-AC_CONFIG_COMMANDS(boehm-cflags, [
-dnl Put all the -I and -D options in a file.
-echo "$AM_CPPFLAGS $DEFS" > boehm-cflags], [
-DEFS="$DEFS"
-AM_CPPFLAGS="$AM_CPPFLAGS"])
+AC_CONFIG_HEADERS([include/gc_config.h])
+
AC_CONFIG_FILES(Makefile include/Makefile)
AC_OUTPUT
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.204
diff -u -r1.204 configure.in
--- configure.in 12 Aug 2004 16:20:07 -0000 1.204
+++ configure.in 13 Aug 2004 23:00:12 -0000
@@ -579,11 +579,8 @@
GCLIBS=../boehm-gc/libgcjgc_convenience.la
JC1GCSPEC='-fuse-boehm-gc'
GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs"
-
- # We also want to pick up some cpp flags required when including
- # boehm-config.h. Yuck.
- GCINCS="`cat ../boehm-gc/boehm-cflags`"
- GCOBJS=boehm.lo
+ GCINCS='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include'
+ GCOBJS=boehm.lo
GCHDR=boehm-gc.h
# The POSIX thread support needs to know this.
AC_DEFINE(HAVE_BOEHM_GC, 1, [Define if Boehm GC in use.])
Index: include/boehm-gc.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/include/boehm-gc.h,v
retrieving revision 1.6
diff -u -r1.6 boehm-gc.h
--- include/boehm-gc.h 28 Dec 2002 06:38:52 -0000 1.6
+++ include/boehm-gc.h 13 Aug 2004 23:00:12 -0000
@@ -26,6 +26,8 @@
#include <java/lang/Class.h>
#include <string.h>
+#include <gc_config.h>
+
extern "C" void * GC_gcj_malloc(size_t, void *);
extern "C" void * GC_malloc_atomic(size_t);
#ifdef THREAD_LOCAL_ALLOC