This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[boehm-gc] Fix autoheader [1/2]
- From: Kelley Cook <kcook at gcc dot gnu dot org>
- To: Hans Boehm <Hans dot Boehm at hp dot com>, GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Mon, 27 Sep 2004 14:29:27 -0400
- Subject: [boehm-gc] Fix autoheader [1/2]
- Hop-count: 1
This patches updates configure.ac to use the newer AC_DEFINE style.
Comments came from Makefile.*
After this patch autoheader, and consequently autoreconf works
properly. Generated configure is identical except for whitespace.
Generated include/gc_config.h.in is attached for clarity.
OK to install?
Kelley Cook
2004-09-27 Kelley Cook <kcook@gcc.gnu.org>
* configure.ac: Update all AC_DEFINEs to newer style.
* configure: Regenerate.
* include/gc_config.h.in: Regenerate.
diff -wprcd ../../gcc-orig/boehm-gc/configure.ac ./configure.ac
*** ../../gcc-orig/boehm-gc/configure.ac Fri Aug 27 20:41:39 2004
--- ./configure.ac Mon Sep 27 13:07:21 2004
*************** case "$THREADS" in
*** 126,184 ****
THREADLIBS=-lpthread
case "$host" in
x86-*-linux* | ia64-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* | alpha-*-linux*)
! AC_DEFINE(GC_LINUX_THREADS)
! AC_DEFINE(_REENTRANT)
if test "${enable_parallel_mark}" = yes; then
! AC_DEFINE(PARALLEL_MARK)
fi
! AC_DEFINE(THREAD_LOCAL_ALLOC)
;;
*-*-linux*)
! AC_DEFINE(GC_LINUX_THREADS)
! AC_DEFINE(_REENTRANT)
;;
*-*-aix*)
! AC_DEFINE(GC_AIX_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)
AM_CPPFLAGS="$AM_CPPFLAGS -pthread"
THREADLIBS=-pthread
;;
*-*-solaris*)
! AC_DEFINE(GC_SOLARIS_THREADS)
! AC_DEFINE(GC_SOLARIS_PTHREADS)
;;
*-*-irix*)
! AC_DEFINE(GC_IRIX_THREADS)
;;
*-*-cygwin*)
! AC_DEFINE(GC_WIN32_THREADS)
;;
*-*-darwin*)
! AC_DEFINE(GC_DARWIN_THREADS)
! AC_DEFINE(THREAD_LOCAL_ALLOC)
if test "${enable_parallel_mark}" = yes; then
! AC_DEFINE(PARALLEL_MARK)
fi
;;
*-*-osf*)
! AC_DEFINE(GC_OSF1_THREADS)
if test "${enable_parallel_mark}" = yes; then
! AC_DEFINE(PARALLEL_MARK)
! AC_DEFINE(THREAD_LOCAL_ALLOC)
# May want to enable it in other cases, too.
# Measurements havent yet been done.
fi
--- 125,183 ----
THREADLIBS=-lpthread
case "$host" in
x86-*-linux* | ia64-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* | alpha-*-linux*)
! AC_DEFINE(GC_LINUX_THREADS,1,[support for Xavier Leroy's Linux threads])
! AC_DEFINE(_REENTRANT,1,[Use reentrant code])
if test "${enable_parallel_mark}" = yes; then
! AC_DEFINE(PARALLEL_MARK,1,[allow the marker to run in multiple threads])
fi
! AC_DEFINE(THREAD_LOCAL_ALLOC,1,[define GC_local_malloc() & GC_local_malloc_atomic()])
;;
*-*-linux*)
! AC_DEFINE(GC_LINUX_THREADS,1)
! AC_DEFINE(_REENTRANT,1)
;;
*-*-aix*)
! AC_DEFINE(GC_AIX_THREADS,1,[support AIX threads])
! AC_DEFINE(_REENTRANT,1)
;;
*-*-hpux*)
AC_MSG_WARN("Only HP/UX 11 threads are supported.")
! AC_DEFINE(GC_HPUX_THREADS,1,[enables support for HP/UX 11 pthreads])
! AC_DEFINE(_POSIX_C_SOURCE,199506L,[POSIX version of C Source])
if test "${enable_parallel_mark}" = yes; then
! AC_DEFINE(PARALLEL_MARK,1)
fi
! AC_DEFINE(THREAD_LOCAL_ALLOC,1)
THREADLIBS="-lpthread -lrt"
;;
*-*-freebsd*)
AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
! AC_DEFINE(GC_FREEBSD_THREADS,1,[support FreeBSD threads])
AM_CPPFLAGS="$AM_CPPFLAGS -pthread"
THREADLIBS=-pthread
;;
*-*-solaris*)
! AC_DEFINE(GC_SOLARIS_THREADS,1,[support for Solaris (thr_) threads])
! AC_DEFINE(GC_SOLARIS_PTHREADS,1,[support for Solaris pthreads])
;;
*-*-irix*)
! AC_DEFINE(GC_IRIX_THREADS,1,[support for Irix pthreads])
;;
*-*-cygwin*)
! AC_DEFINE(GC_WIN32_THREADS,1,[support for win32 threads])
;;
*-*-darwin*)
! AC_DEFINE(GC_DARWIN_THREADS,1,[support for Mac OS X pthreads])
! AC_DEFINE(THREAD_LOCAL_ALLOC,1)
if test "${enable_parallel_mark}" = yes; then
! AC_DEFINE(PARALLEL_MARK,1)
fi
;;
*-*-osf*)
! AC_DEFINE(GC_OSF1_THREADS,1,[support for Tru64 pthreads])
if test "${enable_parallel_mark}" = yes; then
! AC_DEFINE(PARALLEL_MARK,1)
! AC_DEFINE(THREAD_LOCAL_ALLOC,1)
# May want to enable it in other cases, too.
# Measurements havent yet been done.
fi
*************** case "$THREADS" in
*** 188,194 ****
esac
;;
win32)
! AC_DEFINE(GC_WIN32_THREADS)
dnl Old wine getenv may not return NULL for missing entry.
dnl Define EMPTY_GETENV_RESULTS here to work around the bug.
;;
--- 187,193 ----
esac
;;
win32)
! AC_DEFINE(GC_WIN32_THREADS,1)
dnl Old wine getenv may not return NULL for missing entry.
dnl Define EMPTY_GETENV_RESULTS here to work around the bug.
;;
*************** AC_MSG_RESULT($THREADLIBS)
*** 198,216 ****
# Use pthread GCC switch
THREADLIBS=-pthread
if test "${enable_parallel_mark}" = yes; then
! AC_DEFINE(PARALLEL_MARK)
fi
! AC_DEFINE(THREAD_LOCAL_ALLOC)
! AC_DEFINE(GC_DGUX386_THREADS)
! AC_DEFINE(DGUX_THREADS)
# Enable _POSIX4A_DRAFT10_SOURCE with flag -pthread
AM_CPPFLAGS="-pthread $AM_CPPFLAGS"
;;
aix)
THREADS=posix
THREADLIBS=-lpthread
! AC_DEFINE(GC_AIX_THREADS)
! AC_DEFINE(_REENTRANT)
;;
decosf1 | irix | mach | os2 | solaris | dce | vxworks)
AC_MSG_ERROR(thread package $THREADS not yet supported)
--- 197,215 ----
# Use pthread GCC switch
THREADLIBS=-pthread
if test "${enable_parallel_mark}" = yes; then
! AC_DEFINE(PARALLEL_MARK,1)
fi
! AC_DEFINE(THREAD_LOCAL_ALLOC,1)
! AC_DEFINE(GC_DGUX386_THREADS,1,[support for DB/UX on I386 threads])
! AC_DEFINE(DGUX_THREADS,1,[No description])
# Enable _POSIX4A_DRAFT10_SOURCE with flag -pthread
AM_CPPFLAGS="-pthread $AM_CPPFLAGS"
;;
aix)
THREADS=posix
THREADLIBS=-lpthread
! AC_DEFINE(GC_AIX_THREADS,1)
! AC_DEFINE(_REENTRANT,1)
;;
decosf1 | irix | mach | os2 | solaris | dce | vxworks)
AC_MSG_ERROR(thread package $THREADS not yet supported)
*************** case "$TARGET_ECOS" in
*** 260,266 ****
no)
;;
*)
! AC_DEFINE(ECOS)
AM_CPPFLAGS="${AM_CPPFLAGS} -I${TARGET_ECOS}/include"
addobjs="$addobjs ecos.lo"
;;
--- 259,265 ----
no)
;;
*)
! AC_DEFINE(ECOS,1,[Target is ECOS])
AM_CPPFLAGS="${AM_CPPFLAGS} -I${TARGET_ECOS}/include"
addobjs="$addobjs ecos.lo"
;;
*************** case "$host" in
*** 313,324 ****
machdep="alpha_mach_dep.lo"
;;
i?86-*-solaris2.[[89]] | i?86-*-solaris2.1?)
! 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"
--- 312,323 ----
machdep="alpha_mach_dep.lo"
;;
i?86-*-solaris2.[[89]] | i?86-*-solaris2.1?)
! AC_DEFINE(SOLARIS25_PROC_VDB_BUG_FIXED,1,[PROC_VDB in Solaris 2.5 gives wrong values for dirty bits])
;;
mipstx39-*-elf*)
machdep="mips_ultrix_mach_dep.lo"
! AC_DEFINE(STACKBASE, __stackbase,[No description])
! AC_DEFINE(DATASTART_IS_ETEXT,1,[No description])
;;
mips-dec-ultrix*)
machdep="mips_ultrix_mach-dep.lo"
*************** case "$host" in
*** 335,347 ****
;;
sparc-sun-solaris2.3)
machdep="sparc_mach_dep.lo"
! AC_DEFINE(SUNOS53_SHARED_LIB)
;;
sparc-sun-solaris2.*)
machdep="sparc_mach_dep.lo"
;;
ia64-*-*)
! AC_DEFINE(NO_EXECUTE_PERMISSION)
machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
;;
esac
--- 334,346 ----
;;
sparc-sun-solaris2.3)
machdep="sparc_mach_dep.lo"
! AC_DEFINE(SUNOS53_SHARED_LIB,1,[Avoid Solaris 5.3 dynamic library bug])
;;
sparc-sun-solaris2.*)
machdep="sparc_mach_dep.lo"
;;
ia64-*-*)
! AC_DEFINE(NO_EXECUTE_PERMISSION,1,[cause some or all of the heap to not have execute permission])
machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
;;
esac
*************** AC_SUBST(MY_CFLAGS)
*** 409,448 ****
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(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(gc-debug,
[ --enable-gc-debug include full support for pointer backtracing etc.],
[ if test "$enable_gc_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)
;;
i[3456]86-*-dgux*)
! AC_DEFINE(MAKE_BACK_GRAPH)
;;
esac
fi])
--- 408,447 ----
dnl Include defines that have become de facto standard.
dnl ALL_INTERIOR_POINTERS can be overridden in startup code.
! AC_DEFINE(SILENT,1,[disables statistics printing])
! AC_DEFINE(NO_SIGNALS,1,[does not disable signals])
! AC_DEFINE(ALL_INTERIOR_POINTERS,1,[allows all pointers to the interior of objects to be recognized])
dnl By default, make the library as general as possible.
! AC_DEFINE(JAVA_FINALIZATION,1,[make it somewhat safer to finalize objects out of order])
! AC_DEFINE(GC_GCJ_SUPPORT,1,[include support for gcj])
! AC_DEFINE(ATOMIC_UNCOLLECTABLE,1,[include code for GC_malloc_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,1,[use empty GC_disable_signals and GC_enable_signals])
! AC_DEFINE(NO_DEBUGGING,1,[removes GC_dump])
fi
AC_ARG_ENABLE(gc-debug,
[ --enable-gc-debug include full support for pointer backtracing etc.],
[ if test "$enable_gc_debug" = "yes"; then
AC_MSG_WARN("Must define GC_DEBUG and use debug alloc. in clients.")
! AC_DEFINE(KEEP_BACK_PTRS,1,[Add code to save back pointers])
! AC_DEFINE(DBG_HDRS_ALL,1,[Make sure that all objects have debug headers])
case $host in
ia64-*-linux* )
! AC_DEFINE(MAKE_BACK_GRAPH,1,[Enable GC_PRINT_BACK_HEIGHT environment variable])
;;
x86-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* )
! AC_DEFINE(MAKE_BACK_GRAPH,1)
AC_MSG_WARN("Client must not use -fomit-frame-pointer.")
! AC_DEFINE(SAVE_CALL_COUNT, 8, [number of call frames saved with objects allocated through the debugging interface])
;;
i[3456]86-*-dgux*)
! AC_DEFINE(MAKE_BACK_GRAPH,1)
;;
esac
fi])
diff -wprcd ../../gcc-orig/boehm-gc/include/gc_config.h.in ./include/gc_config.h.in
*** ../../gcc-orig/boehm-gc/include/gc_config.h.in Fri Aug 13 19:05:32 2004
--- ./include/gc_config.h.in Mon Sep 27 13:08:05 2004
***************
*** 1,34 ****
--- 1,152 ----
+ /* include/gc_config.h.in. Generated from configure.ac by autoheader. */
+
+ /* allows all pointers to the interior of objects to be recognized */
#undef ALL_INTERIOR_POINTERS
+
+ /* include code for GC_malloc_atomic_uncollectable */
#undef ATOMIC_UNCOLLECTABLE
+
+ /* No description */
#undef DATASTART_IS_ETEXT
+
+ /* Make sure that all objects have debug headers */
#undef DBG_HDRS_ALL
+
+ /* No description */
#undef DGUX_THREADS
+
+ /* Target is ECOS */
#undef ECOS
+
+ /* support AIX threads */
#undef GC_AIX_THREADS
+
+ /* support for Mac OS X pthreads */
#undef GC_DARWIN_THREADS
+
+ /* support for DB/UX on I386 threads */
#undef GC_DGUX386_THREADS
+
+ /* support FreeBSD threads */
#undef GC_FREEBSD_THREADS
+
+ /* include support for gcj */
#undef GC_GCJ_SUPPORT
+
+ /* enables support for HP/UX 11 pthreads */
#undef GC_HPUX_THREADS
+
+ /* support for Irix pthreads */
#undef GC_IRIX_THREADS
+
+ /* support for Xavier Leroy's Linux threads */
#undef GC_LINUX_THREADS
+
+ /* support for Tru64 pthreads */
#undef GC_OSF1_THREADS
+
+ /* support for Solaris pthreads */
#undef GC_SOLARIS_PTHREADS
+
+ /* support for Solaris (thr_) threads */
#undef GC_SOLARIS_THREADS
+
+ /* support for win32 threads */
#undef GC_WIN32_THREADS
+
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+
+ /* Define to 1 if you have the <stdint.h> header file. */
+ #undef HAVE_STDINT_H
+
+ /* Define to 1 if you have the <stdlib.h> header file. */
+ #undef HAVE_STDLIB_H
+
+ /* Define to 1 if you have the <strings.h> header file. */
+ #undef HAVE_STRINGS_H
+
+ /* Define to 1 if you have the <string.h> header file. */
+ #undef HAVE_STRING_H
+
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #undef HAVE_SYS_STAT_H
+
+ /* Define to 1 if you have the <sys/types.h> header file. */
+ #undef HAVE_SYS_TYPES_H
+
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+
+ /* make it somewhat safer to finalize objects out of order */
#undef JAVA_FINALIZATION
+
+ /* Add code to save back pointers */
#undef KEEP_BACK_PTRS
+
+ /* Enable GC_PRINT_BACK_HEIGHT environment variable */
#undef MAKE_BACK_GRAPH
+
+ /* removes GC_dump */
#undef NO_DEBUGGING
+
+ /* cause some or all of the heap to not have execute permission */
#undef NO_EXECUTE_PERMISSION
+
+ /* Define to 1 if your C compiler doesn't accept -c and -o together. */
+ #undef NO_MINUS_C_MINUS_O
+
+ /* does not disable signals */
#undef NO_SIGNALS
+
+ /* use empty GC_disable_signals and GC_enable_signals */
#undef NO_SIGSET
+
+ /* 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 version of this package. */
+ #undef PACKAGE_VERSION
+
+ /* allow the marker to run in multiple threads */
#undef PARALLEL_MARK
+
+ /* number of call frames saved with objects allocated through the debugging
+ interface */
#undef SAVE_CALL_COUNT
+
+ /* disables statistics printing */
#undef SILENT
+
+ /* PROC_VDB in Solaris 2.5 gives wrong values for dirty bits */
#undef SOLARIS25_PROC_VDB_BUG_FIXED
+
+ /* No description */
#undef STACKBASE
+
+ /* Define to 1 if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+
+ /* Avoid Solaris 5.3 dynamic library bug */
#undef SUNOS53_SHARED_LIB
+
+ /* define GC_local_malloc() & GC_local_malloc_atomic() */
#undef THREAD_LOCAL_ALLOC
+
+ /* POSIX version of C Source */
#undef _POSIX_C_SOURCE
+
+ /* Use reentrant code */
#undef _REENTRANT