mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-25 11:05:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

boehm-gc.h: Include gc_ext_config.h, not gc_config.h.

Browse Source 
2005-01-01  Bryce McKinlay  <mckinlay@redhat.com>

	* include/boehm-gc.h: Include gc_ext_config.h, not gc_config.h.

2005-01-01  Bryce McKinlay  <mckinlay@redhat.com>

	* configure.ac (AC_CONFIG_HEADERS): Build both include/gc_config.h
	and include/gc_ext_config.h.
	* include/gc_ext_config.h: New file. Define only THREAD_LOCAL_ALLOC.
	* include/gc.h: Undef PACKAGE_* before including gc_config.h.

From-SVN: r92801
This commit is contained in:
Bryce McKinlay 2005-01-02 03:35:57 +00:00 committed by Bryce McKinlay
parent 3ffd0339c7
commit 9a060b37a1
7 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
boehm-gc/ChangeLog
View File

@ -1,3 +1,10 @@
2005-01-01 Bryce McKinlay <mckinlay@redhat.com>
* configure.ac (AC_CONFIG_HEADERS): Build both include/gc_config.h
and include/gc_ext_config.h.
* include/gc_ext_config.h: New file. Define only THREAD_LOCAL_ALLOC.
* include/gc.h: Undef PACKAGE_* before including gc_config.h.
2004-12-13 Kelley Cook <kcook@gcc.gnu.org>
* configure: Regenerate.

3
boehm-gc/configure vendored
View File

@ -6580,7 +6580,7 @@ else
multilib_arg=
fi
ac_config_headers="$ac_config_headers include/gc_config.h"
ac_config_headers="$ac_config_headers include/gc_config.h include/gc_ext_config.h"
ac_config_files="$ac_config_files Makefile include/Makefile"
@ -7178,6 +7178,7 @@ do
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"include/gc_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/gc_config.h" ;;
"include/gc_ext_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/gc_ext_config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;

2
boehm-gc/configure.ac
View File

@ -468,7 +468,7 @@ else
multilib_arg=
fi
AC_CONFIG_HEADERS([include/gc_config.h])
AC_CONFIG_HEADERS([include/gc_config.h include/gc_ext_config.h])
AC_CONFIG_FILES(Makefile include/Makefile)
AC_OUTPUT

22
boehm-gc/include/gc.h
View File

@ -30,6 +30,28 @@
# define _GC_H
/*
* As this header includes gc_config.h, preprocessor conflicts can occur with
* clients that include their own autoconf headers. The following #undef's
* work around some likely conflicts.
*/
# ifdef PACKAGE_NAME
# undef PACKAGE_NAME
# endif
# ifdef PACKAGE_BUGREPORT
# undef PACKAGE_BUGREPORT
# endif
# ifdef PACKAGE_STRING
# undef PACKAGE_STRING
# endif
# ifdef PACKAGE_TARNAME
# undef PACKAGE_TARNAME
# endif
# ifdef PACKAGE_VERSION
# undef PACKAGE_VERSION
# endif
# include <gc_config.h>
# include "gc_config_macros.h"

5
boehm-gc/include/gc_ext_config.h.in Normal file
View File

@ -0,0 +1,5 @@
/* 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

4
libjava/ChangeLog
View File

@ -1,3 +1,7 @@
2005-01-01 Bryce McKinlay <mckinlay@redhat.com>
* include/boehm-gc.h: Include gc_ext_config.h, not gc_config.h.
2004-12-31 Andreas Jaeger <aj@suse.de>
* testsuite/lib/libjava.exp (libjava_find_gij): Handle multilibs.

2
libjava/include/boehm-gc.h
View File

@ -26,7 +26,7 @@ extern "C"
#include <java/lang/Class.h>
#include <string.h>
#include <gc_config.h>
#include <gc_ext_config.h> // for THREAD_LOCAL_ALLOC
extern "C" void * GC_gcj_malloc(size_t, void *);
extern "C" void * GC_malloc_atomic(size_t);