diff options
| author | Matthias Klose <doko@ubuntu.com> | 2012-12-02 02:22:30 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2012-12-02 02:22:30 +0000 |
| commit | 907b75b23a794ffb70b429dec9eee7cc1d1c4b88 (patch) | |
| tree | a0edf8ef95923290dc473827635e31a78a3df774 | |
| parent | 9f896b6091db3acf7ce57a458acb85e0b90dd2a0 (diff) | |
2012-12-01 Matthias Klose <doko@ubuntu.com>gcj/bdwgc-20121125-merge
* configure.ac: Define and substitute GCDEFS.
Add -DGC_GCJ_SUPPORT when built for boehm-gc.
* Makefile.am (AM_CXXFLAGS): Add @GCDEFS@.
* configure: Regenerate.
* Makefile.in, include/Makefile.in, testsuite/Makefile.in: Regenerate.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcj/bdwgc-20121125-merge@194048 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog.merge | 8 | ||||
| -rw-r--r-- | libjava/Makefile.am | 1 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 | ||||
| -rwxr-xr-x | libjava/configure | 10 | ||||
| -rw-r--r-- | libjava/configure.ac | 3 | ||||
| -rw-r--r-- | libjava/gcj/Makefile.in | 1 | ||||
| -rw-r--r-- | libjava/include/Makefile.in | 1 | ||||
| -rw-r--r-- | libjava/testsuite/Makefile.in | 1 |
8 files changed, 24 insertions, 3 deletions
diff --git a/libjava/ChangeLog.merge b/libjava/ChangeLog.merge index b61154dad71..0669c0a613f 100644 --- a/libjava/ChangeLog.merge +++ b/libjava/ChangeLog.merge @@ -1,5 +1,13 @@ 2012-12-01 Matthias Klose <doko@ubuntu.com> + * configure.ac: Define and substitute GCDEFS. + Add -DGC_GCJ_SUPPORT when built for boehm-gc. + * Makefile.am (AM_CXXFLAGS): Add @GCDEFS@. + * configure: Regenerate. + * Makefile.in, include/Makefile.in, testsuite/Makefile.in: Regenerate. + +2012-12-01 Matthias Klose <doko@ubuntu.com> + * gnu/gcj/util/natGCInfo.cc: Don't declare GC_clear_stack. 2012-12-01 Matthias Klose <doko@ubuntu.com> diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 1b7196285aa..b1013dbb7f7 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -361,6 +361,7 @@ AM_CXXFLAGS = \ @LIBGCJ_CXXFLAGS@ \ $(WARNINGS) \ -D_GNU_SOURCE \ + @GCDEFS@ \ -DPREFIX="\"$(prefix)\"" \ -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\"" \ -DJAVA_HOME="\"$(JAVA_HOME_DIR)\"" \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 1380a7ef633..c73e127ee83 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -553,6 +553,7 @@ EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCC_FOR_ECJX = @GCC_FOR_ECJX@ +GCDEFS = @GCDEFS@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ GCJ = @GCJ@ @@ -1009,6 +1010,7 @@ AM_CXXFLAGS = \ @LIBGCJ_CXXFLAGS@ \ $(WARNINGS) \ -D_GNU_SOURCE \ + @GCDEFS@ \ -DPREFIX="\"$(prefix)\"" \ -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\"" \ -DJAVA_HOME="\"$(JAVA_HOME_DIR)\"" \ diff --git a/libjava/configure b/libjava/configure index 50dafd048b5..d8377cfd24d 100755 --- a/libjava/configure +++ b/libjava/configure @@ -704,6 +704,7 @@ GCTESTSPEC JC1GCSPEC GCSPEC GCDEPS +GCDEFS GCINCS GCLIBS LIBGCJTESTSPEC @@ -13366,7 +13367,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13369 "configure" +#line 13370 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13472,7 +13473,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13475 "configure" +#line 13476 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19467,7 +19468,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19470 "configure" +#line 19471 "configure" struct S { ~S(); }; void bar(); void foo() @@ -20628,6 +20629,7 @@ fi GCLIBS= GCINCS= +GCDEFS= GCDEPS= GCSPEC= JC1GCSPEC= @@ -20636,6 +20638,7 @@ case "$GC" in boehm) { $as_echo "$as_me:${as_lineno-$LINENO}: result: boehm" >&5 $as_echo "boehm" >&6; } + GCDEFS=-DGC_GCJ_SUPPORT GCLIBS=../boehm-gc/libgc_convenience.la JC1GCSPEC='-fuse-boehm-gc' GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" @@ -20662,6 +20665,7 @@ esac + ac_config_links="$ac_config_links include/java-gc.h:include/$GCHDR" if test "$GC" = boehm; then diff --git a/libjava/configure.ac b/libjava/configure.ac index f8865374a06..143b588393d 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -987,6 +987,7 @@ AC_ARG_ENABLE(java-gc, [GC=boehm]) GCLIBS= GCINCS= +GCDEFS= GCDEPS= GCSPEC= JC1GCSPEC= @@ -994,6 +995,7 @@ GCTESTSPEC= case "$GC" in boehm) AC_MSG_RESULT(boehm) + GCDEFS=-DGC_GCJ_SUPPORT GCLIBS=../boehm-gc/libgc_convenience.la JC1GCSPEC='-fuse-boehm-gc' GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" @@ -1013,6 +1015,7 @@ case "$GC" in esac AC_SUBST(GCLIBS) AC_SUBST(GCINCS) +AC_SUBST(GCDEFS) AC_SUBST(GCDEPS) AC_SUBST(GCSPEC) AC_SUBST(JC1GCSPEC) diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index 3951e358907..72e75d571fd 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -135,6 +135,7 @@ EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCC_FOR_ECJX = @GCC_FOR_ECJX@ +GCDEFS = @GCDEFS@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ GCJ = @GCJ@ diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 34f4ad03178..1e0712bb1b6 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -136,6 +136,7 @@ EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCC_FOR_ECJX = @GCC_FOR_ECJX@ +GCDEFS = @GCDEFS@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ GCJ = @GCJ@ diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index 28c4630cf44..8152373656e 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -111,6 +111,7 @@ EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCC_FOR_ECJX = @GCC_FOR_ECJX@ +GCDEFS = @GCDEFS@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ GCJ = @GCJ@ |