OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure.ac: New name of configure.in. 

boehm-gc/ChangeLog:
2005-06-16  Paolo Bonzini  <bonzini@gnu.org>

	* boehm-gc/configure.ac: New name of configure.in.
	Remove useless multilib stuff.  Change uses of
	INCLUDES and CXXINCLUDES to AM_CPPFLAGS.
	* boehm-gc/configure.in: New name of configure.in.
	* boehm-gc/Makefile.am: Update for automake 1.8.5.
	* boehm-gc/acinclude.m4: Include ../config/acx.m4.
	* boehm-gc/aclocal.m4: Regenerate.
	* boehm-gc/configure: Regenerate.

contrib/ChangeLog:
2004-06-16  Paolo Bonzini  <bonzini@gnu.org>

	* gcc_update (boehm-gc/configure): Depend on
	boehm-gc/configure.ac instead of boehm-gc/configure.in

gcc/ChangeLog:
2004-06-16  Paolo Bonzini  <bonzini@gnu.org>

	* doc/install.texi: boehm-gc now uses automake 1.8.5.

From-SVN: r83227
This commit is contained in:
Paolo Bonzini 2004-06-16 07:35:00 +00:00 committed by Paolo Bonzini
parent 6bbba4c73c
commit bf9a420e62
11 changed files with 2440 additions and 907 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
boehm-gc/ChangeLog
View File

@ -1,3 +1,15 @@
2005-06-16 Paolo Bonzini <bonzini@gnu.org>
* boehm-gc/configure.ac: New name of configure.in.
Remove useless multilib stuff. Change uses of
INCLUDES and CXXINCLUDES to AM_CPPFLAGS.
* boehm-gc/configure.in: New name of configure.in.
* boehm-gc/Makefile.am: Update for automake 1.8.5.
* boehm-gc/acinclude.m4: Include ../config/acx.m4.
* boehm-gc/aclocal.m4: Regenerate.
* boehm-gc/configure: Regenerate.
* boehm-gc/Makefile.in: Regenerate.
2005-06-15 Paolo Bonzini <bonzini@gnu.org>
* .cvsignore: New file.

58
boehm-gc/Makefile.am
View File

@ -4,20 +4,10 @@
## files that should be in the distribution are not mentioned in this
## Makefile.am.
target_noncanonical=@target_noncanonical@
AUTOMAKE_OPTIONS = cygnus
AUTOMAKE_OPTIONS = cygnus subdir-objects
SUBDIRS = include
# Multilib support variables.
MULTISRCTOP =
MULTIBUILDTOP =
MULTIDIRS =
MULTISUBDIR =
MULTIDO = true
MULTICLEAN = true
noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la
if POWERPC_DARWIN
@ -35,15 +25,13 @@ backgraph.c win32_threads.c \
pthread_support.c pthread_stop_world.c darwin_stop_world.c \
$(asm_libgc_sources)
EXTRA_GC_SOURCES = alpha_mach_dep.S \
EXTRA_DIST = alpha_mach_dep.S \
mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
libgcjgc_la_SOURCES = $(GC_SOURCES)
libgcjgc_convenience_la_SOURCES = $(GC_SOURCES)
EXTRA_libgcjgc_la_SOURCES = $(EXTRA_GC_SOURCES)
EXTRA_libgcjgc_convenience_la_SOURCES = $(EXTRA_GC_SOURCES)
# Include THREADLIBS here to ensure that the correct versions of
# linuxthread semaphore functions get linked:
@ -58,25 +46,12 @@ AM_CXXFLAGS = @GC_CFLAGS@
AM_CFLAGS = @GC_CFLAGS@
check_PROGRAMS = gctest
# The following hack produces a warning from automake, but we need it in order
# to build a file from a subdirectory. FIXME.
test.o: tests/test.c
$(COMPILE) -c $(srcdir)/tests/test.c
# Using $< in the above seems to fail with the HP/UX on Itanium make.
gctest_OBJECTS = test.o
gctest_SOURCES = tests/test.c
gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
gctest_LDFLAGS = -shared-libgcc
TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
TESTS = gctest
## FIXME: relies on internal code generated by automake.
all_objs = @addobjs@ $(libgcjgc_la_OBJECTS)
$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
include/gc_pthread_redirects.h include/gc_config_macros.h \
include/gc_mark.h @addincludes@
## FIXME: we shouldn't have to do this, but automake forces us to.
.s.lo:
## We use -Wp,-P to strip #line directives. Irix `as' chokes on
@ -85,8 +60,7 @@ include/gc_mark.h @addincludes@
## We have our own definition of LTCOMPILE because we want to use our
## CFLAGS, not those passed in from the top level make.
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) \
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS)
LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@
@ -133,28 +107,4 @@ AM_MAKEFLAGS = \
CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
# Multilib support.
.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
maintainer-clean-multi
all-am: all-multi
install-am: install-multi
mostlyclean-am: mostlyclean-multi
clean-am: clean-multi
distclean-am: distclean-multi
maintainer-clean-am: maintainer-clean-multi
all-multi:
: $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
install-multi:
$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
mostlyclean-multi:
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean
clean-multi:
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean
distclean-multi:
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean
maintainer-clean-multi:
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean
MAKEOVERRIDES=

997
boehm-gc/Makefile.in
View File

File diff suppressed because it is too large Load Diff

1
boehm-gc/acinclude.m4
View File

@ -12,6 +12,7 @@
# Original author: Tom Tromey
sinclude(../libtool.m4)
sinclude(../config/acx.m4)
dnl The line below arranges for aclocal not to bring a definition of
dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
dnl to add a definition of LIBTOOL to Makefile.in.

1120
boehm-gc/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

1074
boehm-gc/configure vendored
View File

File diff suppressed because it is too large Load Diff

70
boehm-gc/configure.in → boehm-gc/configure.ac
View File

@ -24,40 +24,11 @@ AC_INIT(gcj_mlc.c)
# exported.
ORIGINAL_LD_FOR_MULTILIBS=$LD
dnl Default to --enable-multilib
AC_ARG_ENABLE(multilib,
[ --enable-multilib build many library versions (default)],
[case "${enableval}" in
yes) multilib=yes ;;
no) multilib=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes])dnl
dnl We may get other options which we don't document:
dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
dnl I needed to add the -n test to allow configuration in src directory - HB
if test "[$]{srcdir}" = "."; then
if test "[$]{with_target_subdir}" != "." -a -n "[$]{with_target_subdir}"; then
gc_basedir="[$]{srcdir}/[$]{with_multisrctop}../."
else
gc_basedir="[$]{srcdir}/[$]{with_multisrctop}."
fi
else
gc_basedir="[$]{srcdir}/."
fi
AC_SUBST(gc_basedir)
AC_CONFIG_AUX_DIR($gc_basedir/..)
if :; then :; else
# This overrides the previous occurrence for automake, but not for
# autoconf, which is exactly what we want.
AC_CONFIG_AUX_DIR(..)
fi
AM_ENABLE_MULTILIB(, ..)
AC_CANONICAL_SYSTEM
# Get the 'noncanonical' system names.
sinclude(../config/acx.m4)
_GCC_TOPLEV_NONCANONICAL_BUILD
_GCC_TOPLEV_NONCANONICAL_HOST
_GCC_TOPLEV_NONCANONICAL_TARGET
@ -82,6 +53,8 @@ AC_PROG_CC
AC_PROG_CXX
m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
AM_PROG_CC_C_O
AC_SUBST(CFLAGS)
AC_SUBST(CXXFLAGS)
@ -143,7 +116,7 @@ AC_ARG_ENABLE(parallel-mark,
esac]
)
INCLUDES="-I`cd $srcdir && ${PWDCMD-pwd}`/include"
AM_CPPFLAGS="-I`cd $srcdir && ${PWDCMD-pwd}`/include"
THREADLIBS=
case "$THREADS" in
no | none | single)
@ -182,7 +155,7 @@ case "$THREADS" in
*-*-freebsd*)
AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
AC_DEFINE(GC_FREEBSD_THREADS)
INCLUDES="$INCLUDES -pthread"
AM_CPPFLAGS="$AM_CPPFLAGS -pthread"
THREADLIBS=-pthread
;;
*-*-solaris*)
@ -210,7 +183,7 @@ case "$THREADS" in
# May want to enable it in other cases, too.
# Measurements havent yet been done.
fi
INCLUDES="$INCLUDES -pthread"
AM_CPPFLAGS="$AM_CPPFLAGS -pthread"
THREADLIBS="-lpthread -lrt"
;;
esac
@ -232,7 +205,7 @@ AC_MSG_RESULT($THREADLIBS)
AC_DEFINE(GC_DGUX386_THREADS)
AC_DEFINE(DGUX_THREADS)
# Enable _POSIX4A_DRAFT10_SOURCE with flag -pthread
INCLUDES="-pthread $INCLUDES"
AM_CPPFLAGS="-pthread $AM_CPPFLAGS"
;;
aix)
THREADS=posix
@ -285,13 +258,12 @@ addobjs=
addlibs=
addincludes=
addtests=
CXXINCLUDES=
case "$TARGET_ECOS" in
no)
;;
*)
AC_DEFINE(ECOS)
CXXINCLUDES="-I${TARGET_ECOS}/include"
AM_CPPFLAGS="${AM_CPPFLAGS} -I${TARGET_ECOS}/include"
addobjs="$addobjs ecos.lo"
;;
esac
@ -305,8 +277,7 @@ AM_CONDITIONAL(CPLUSPLUS, test "${enable_cplusplus}" = yes)
AC_SUBST(CXX)
AC_SUBST(INCLUDES)
AC_SUBST(CXXINCLUDES)
AC_SUBST(AM_CPPFLAGS)
# Configuration of shared libraries
#
@ -509,23 +480,10 @@ else
multilib_arg=
fi
AC_OUTPUT(Makefile include/Makefile, [
AC_CONFIG_COMMANDS(boehm-cflags, [
dnl Put all the -I and -D options in a file.
echo "$INCLUDES $DEFS" > boehm-cflags
if test -n "$CONFIG_FILES"; then
LD="${ORIGINAL_LD_FOR_MULTILIBS}"
ac_file=Makefile . ${gc_basedir}/../config-ml.in
fi],
srcdir=${srcdir}
host=${host}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${multilib_arg} ${ac_configure_args}"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
gc_basedir=${gc_basedir}
CC="${CC}"
ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
echo "$AM_CPPFLAGS $DEFS" > boehm-cflags], [
DEFS="$DEFS"
INCLUDES="$INCLUDES"
)
AM_CPPFLAGS="$AM_CPPFLAGS"])
AC_CONFIG_FILES(Makefile include/Makefile)
AC_OUTPUT

5
contrib/ChangeLog
View File

@ -1,3 +1,8 @@
2004-06-16 Paolo Bonzini <bonzini@gnu.org>
* gcc_update (boehm-gc/configure): Depend on
boehm-gc/configure.ac instead of boehm-gc/configure.in
2004-06-14 Paolo Bonzini <bonzini@gnu.org>
* gcc_update (libmudflap/configure): Depend on

2
contrib/gcc_update
View File

@ -83,7 +83,7 @@ fastjar/Makefile.in: fastjar/Makefile.am fastjar/configure.ac fastjar/aclocal.m4
fastjar/configure: fastjar/configure.ac fastjar/aclocal.m4
boehm-gc/aclocal.m4: boehm-gc/configure.in boehm-gc/acinclude.m4
boehm-gc/Makefile.in: boehm-gc/Makefile.am boehm-gc/configure.in boehm-gc/aclocal.m4
boehm-gc/configure: boehm-gc/configure.in boehm-gc/aclocal.m4
boehm-gc/configure: boehm-gc/configure.ac boehm-gc/aclocal.m4
libada/configure: libada/configure.ac
libffi/aclocal.m4: libffi/configure.ac libffi/acinclude.m4
libffi/Makefile.in: libffi/Makefile.am libffi/configure.ac libffi/aclocal.m4

4
gcc/ChangeLog
View File

@ -1,3 +1,7 @@
2004-06-16 Paolo Bonzini <bonzini@gnu.org>
* doc/install.texi: boehm-gc now uses automake 1.8.5.
2004-06-16 Paolo Bonzini <bonzini@gnu.org>
* toplev.h (rest_of_compilation): Adjust prototype.

4
gcc/doc/install.texi
View File

@ -315,8 +315,8 @@ file. Specifically this applies to the @file{gcc}, @file{intl},
@file{libiberty}, @file{libobjc} directories as well as any
of their subdirectories.
The Java directories @file{boehm-gc} and @file{libjava}
require a modified version of automake 1.4 downloadable from
The Java directory @file{libjava} requires a modified version of
automake 1.4 downloadable from
@uref{ftp://gcc.gnu.org/pub/java/automake-gcj-1.4.tar.gz}.
Every other directory requires automake 1.8.5.