Skip to content

R
riscv-gcc-1
Commit ed698112 by Nathanael Nerode
Options

acinclude.m4: Include no-executables.m4. 

	* acinclude.m4: Include no-executables.m4.
	* aclocal.m4: Rebuild.
	* configure.in: Convert to the autoconf 2.59 version of
	of the no-executables hack, and also of the nonstandard CXX
	hack and the multilibbed CC and CXX hack.  Change prerequisite
	to autoconf 2.59.
	* configure: Rebuild with autoconf 2.59.  (Woo-hoo!)
	* Makefile.in, gcj/Makefile.in, include/Makefile.in,
	testsuite/Makefile.in: Regenerate.

From-SVN: r85495
parent d974312d
Showing with 51 additions and 58 deletions
libjava/ChangeLog
2004-07-17 Nathanael Nerode <neroden@gcc.gnu.org>
* acinclude.m4: Include no-executables.m4.
* aclocal.m4: Rebuild.
* configure.in: Convert to the autoconf 2.59 version of
of the no-executables hack, and also of the nonstandard CXX
hack and the multilibbed CC and CXX hack. Change prerequisite
to autoconf 2.59.
* configure: Rebuild with autoconf 2.59. (Woo-hoo!)
* Makefile.in, gcj/Makefile.in, include/Makefile.in,
testsuite/Makefile.in: Regenerate.
2004-08-03 Tom Tromey <tromey@redhat.com> 2004-08-03 Tom Tromey <tromey@redhat.com>
* jni.cc: Reindented. * jni.cc: Reindented.
......
libjava/Makefile.in
...@@ -69,11 +69,13 @@ BACKTRACESPEC = @BACKTRACESPEC@ ...@@ -69,11 +69,13 @@ BACKTRACESPEC = @BACKTRACESPEC@
CAIRO_CFLAGS = @CAIRO_CFLAGS@ CAIRO_CFLAGS = @CAIRO_CFLAGS@
CAIRO_LIBS = @CAIRO_LIBS@ CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@
CHECKREFSPEC = @CHECKREFSPEC@ CHECKREFSPEC = @CHECKREFSPEC@
COMPPATH = @COMPPATH@ COMPPATH = @COMPPATH@
CPP = @CPP@ CPP = @CPP@
CXX = @CXX@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
CXXFLAGS = @CXXFLAGS@
DIRLTDL = @DIRLTDL@ DIRLTDL = @DIRLTDL@
DIVIDESPEC = @DIVIDESPEC@ DIVIDESPEC = @DIVIDESPEC@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
...@@ -99,6 +101,7 @@ IEEESPEC = @IEEESPEC@ ...@@ -99,6 +101,7 @@ IEEESPEC = @IEEESPEC@
INCLTDL = @INCLTDL@ INCLTDL = @INCLTDL@
INTERPRETER = @INTERPRETER@ INTERPRETER = @INTERPRETER@
JC1GCSPEC = @JC1GCSPEC@ JC1GCSPEC = @JC1GCSPEC@
LDFLAGS = @LDFLAGS@
LIBART_CFLAGS = @LIBART_CFLAGS@ LIBART_CFLAGS = @LIBART_CFLAGS@
LIBART_LIBS = @LIBART_LIBS@ LIBART_LIBS = @LIBART_LIBS@
LIBFFI = @LIBFFI@ LIBFFI = @LIBFFI@
...@@ -143,7 +146,6 @@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ ...@@ -143,7 +146,6 @@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
build_subdir = @build_subdir@ build_subdir = @build_subdir@
do_compare = @do_compare@ do_compare = @do_compare@
gcc_version = @gcc_version@ gcc_version = @gcc_version@
glibjava_CXX = @glibjava_CXX@
here = @here@ here = @here@
host_subdir = @host_subdir@ host_subdir = @host_subdir@
libgcj_basedir = @libgcj_basedir@ libgcj_basedir = @libgcj_basedir@
...@@ -2805,7 +2807,6 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES) ...@@ -2805,7 +2807,6 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I./include -I./gcj DEFS = @DEFS@ -I. -I$(srcdir) -I./include -I./gcj
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
...@@ -3074,11 +3075,9 @@ gen_from_JIS_OBJECTS = ...@@ -3074,11 +3075,9 @@ gen_from_JIS_OBJECTS =
gen_from_JIS_LDFLAGS = gen_from_JIS_LDFLAGS =
SCRIPTS = $(bin_SCRIPTS) SCRIPTS = $(bin_SCRIPTS)
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX) CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC) CCLD = $(CC)
......
libjava/acinclude.m4
sinclude(../config/accross.m4) sinclude(../config/accross.m4)
sinclude(../config/acx.m4) sinclude(../config/acx.m4)
sinclude(../config/no-executables.m4)
sinclude(../libtool.m4) sinclude(../libtool.m4)
dnl The lines below arrange for aclocal not to bring libtool.m4 dnl The lines below arrange for aclocal not to bring libtool.m4
......
libjava/aclocal.m4
...@@ -12,6 +12,7 @@ dnl PARTICULAR PURPOSE. ...@@ -12,6 +12,7 @@ dnl PARTICULAR PURPOSE.
sinclude(../config/accross.m4) sinclude(../config/accross.m4)
sinclude(../config/acx.m4) sinclude(../config/acx.m4)
sinclude(../config/no-executables.m4)
sinclude(../libtool.m4) sinclude(../libtool.m4)
dnl The lines below arrange for aclocal not to bring libtool.m4 dnl The lines below arrange for aclocal not to bring libtool.m4
......
libjava/configure
This source diff could not be displayed because it is too large. You can view the blob instead.
libjava/configure.in
dnl Process this with autoconf to create configure dnl Process this with autoconf to create configure
AC_PREREQ(2.13) AC_PREREQ(2.59)
AC_INIT(java/lang/System.java) AC_INIT(java/lang/System.java)
dnl We use these options to decide which functions to include. dnl We use these options to decide which functions to include.
...@@ -84,57 +84,31 @@ AC_ARG_ENABLE(multilib, ...@@ -84,57 +84,31 @@ AC_ARG_ENABLE(multilib,
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes])dnl esac], [multilib=yes])dnl
dnl This shouldn't be needed, as long as top-level dependencies are dnl # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
dnl defined correctly and shared-library paths are set up so that GCC_NO_EXECUTABLES
dnl execution tests succeed. FIXME.
define([AC_PROG_CC_WORKS],[]) # (1) We use an abnormal CXX (without library references), so we
define([AC_PROG_CXX_WORKS],[]) # must cache it under a different name.
# (2) CC, CFLAGS, CXX, CXXFLAGS, LDFLAGS must not be 'precious', or
# the non-multilib-adjusted value will be used in multilibs.
# (3) As a side effect, we must SUBST CXXFLAGS, CFLAGS, and LDFLAGS ourselves.
# (4) As another side effect, automake doesn't automatically include them
# in Makefile.in.
# (5) For libstdc++-v3, -fno-builtin must be present here so that a
# non-conflicting form of std::exit can be guessed by AC_PROG_CXX, and
# used in later tests. This may not be necessary in libjava; I don't know.
m4_define([ac_cv_prog_CXX],[glibcxx_cv_prog_CXX])
m4_rename([_AC_ARG_VAR_PRECIOUS],[glibcxx_PRECIOUS])
m4_define([_AC_ARG_VAR_PRECIOUS],[])
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -fno-builtin"
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX
# We use the libstdc++-v3 version of LIB_AC_PROG_CXX, but use CXXFLAGS="$save_CXXFLAGS"
# glibjava_CXX instead of glibcpp_CXX. That's because we're passed a m4_rename([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
# different definition of CXX than other directories, since we don't AC_SUBST(CFLAGS)
# depend on libstdc++-v3 having already been built. AC_SUBST(CXXFLAGS)
AC_DEFUN(LIB_AC_PROG_CXX, AC_SUBST(LDFLAGS)
[AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
dnl Fool anybody using AC_PROG_CXX.
AC_PROVIDE([AC_PROG_CXX])
# Use glibjava_CXX so that we do not cause CXX to be cached with the
# flags that come in CXX while configuring libjava. They're different
# from those used for all other target libraries. If CXX is set in
# the environment, respect that here.
glibjava_CXX=$CXX
AC_CHECK_PROGS(glibjava_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
AC_SUBST(CXX)
CXX=$glibjava_CXX
test -z "$glibjava_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
AC_PROG_CXX_GNU
if test $ac_cv_prog_gxx = yes; then
GXX=yes
dnl Check whether -g works, even if CXXFLAGS is set, in case the package
dnl plays around with CXXFLAGS (such as to build both debugging and
dnl normal versions of a library), tasteless as that idea is.
ac_test_CXXFLAGS="${CXXFLAGS+set}"
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
AC_PROG_CXX_G
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS="$ac_save_CXXFLAGS"
elif test $ac_cv_prog_cxx_g = yes; then
CXXFLAGS="-g -O2"
else
CXXFLAGS="-O2"
fi
else
GXX=
test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
fi
])
LIB_AC_PROG_CXX
dnl version is pulled out to make it a bit easier to change using sed. dnl version is pulled out to make it a bit easier to change using sed.
version=0.0.7 version=0.0.7
......
libjava/gcj/Makefile.in
...@@ -69,11 +69,13 @@ BACKTRACESPEC = @BACKTRACESPEC@ ...@@ -69,11 +69,13 @@ BACKTRACESPEC = @BACKTRACESPEC@
CAIRO_CFLAGS = @CAIRO_CFLAGS@ CAIRO_CFLAGS = @CAIRO_CFLAGS@
CAIRO_LIBS = @CAIRO_LIBS@ CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@
CHECKREFSPEC = @CHECKREFSPEC@ CHECKREFSPEC = @CHECKREFSPEC@
COMPPATH = @COMPPATH@ COMPPATH = @COMPPATH@
CPP = @CPP@ CPP = @CPP@
CXX = @CXX@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
CXXFLAGS = @CXXFLAGS@
DIRLTDL = @DIRLTDL@ DIRLTDL = @DIRLTDL@
DIVIDESPEC = @DIVIDESPEC@ DIVIDESPEC = @DIVIDESPEC@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
...@@ -101,6 +103,7 @@ IEEESPEC = @IEEESPEC@ ...@@ -101,6 +103,7 @@ IEEESPEC = @IEEESPEC@
INCLTDL = @INCLTDL@ INCLTDL = @INCLTDL@
INTERPRETER = @INTERPRETER@ INTERPRETER = @INTERPRETER@
JC1GCSPEC = @JC1GCSPEC@ JC1GCSPEC = @JC1GCSPEC@
LDFLAGS = @LDFLAGS@
LIBART_CFLAGS = @LIBART_CFLAGS@ LIBART_CFLAGS = @LIBART_CFLAGS@
LIBART_LIBS = @LIBART_LIBS@ LIBART_LIBS = @LIBART_LIBS@
LIBFFI = @LIBFFI@ LIBFFI = @LIBFFI@
...@@ -147,7 +150,6 @@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ ...@@ -147,7 +150,6 @@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
build_subdir = @build_subdir@ build_subdir = @build_subdir@
do_compare = @do_compare@ do_compare = @do_compare@
gcc_version = @gcc_version@ gcc_version = @gcc_version@
glibjava_CXX = @glibjava_CXX@
here = @here@ here = @here@
host_subdir = @host_subdir@ host_subdir = @host_subdir@
libgcj_basedir = @libgcj_basedir@ libgcj_basedir = @libgcj_basedir@
......
libjava/include/Makefile.in
...@@ -69,11 +69,13 @@ BACKTRACESPEC = @BACKTRACESPEC@ ...@@ -69,11 +69,13 @@ BACKTRACESPEC = @BACKTRACESPEC@
CAIRO_CFLAGS = @CAIRO_CFLAGS@ CAIRO_CFLAGS = @CAIRO_CFLAGS@
CAIRO_LIBS = @CAIRO_LIBS@ CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@
CHECKREFSPEC = @CHECKREFSPEC@ CHECKREFSPEC = @CHECKREFSPEC@
COMPPATH = @COMPPATH@ COMPPATH = @COMPPATH@
CPP = @CPP@ CPP = @CPP@
CXX = @CXX@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
CXXFLAGS = @CXXFLAGS@
DIRLTDL = @DIRLTDL@ DIRLTDL = @DIRLTDL@
DIVIDESPEC = @DIVIDESPEC@ DIVIDESPEC = @DIVIDESPEC@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
...@@ -101,6 +103,7 @@ IEEESPEC = @IEEESPEC@ ...@@ -101,6 +103,7 @@ IEEESPEC = @IEEESPEC@
INCLTDL = @INCLTDL@ INCLTDL = @INCLTDL@
INTERPRETER = @INTERPRETER@ INTERPRETER = @INTERPRETER@
JC1GCSPEC = @JC1GCSPEC@ JC1GCSPEC = @JC1GCSPEC@
LDFLAGS = @LDFLAGS@
LIBART_CFLAGS = @LIBART_CFLAGS@ LIBART_CFLAGS = @LIBART_CFLAGS@
LIBART_LIBS = @LIBART_LIBS@ LIBART_LIBS = @LIBART_LIBS@
LIBFFI = @LIBFFI@ LIBFFI = @LIBFFI@
...@@ -147,7 +150,6 @@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ ...@@ -147,7 +150,6 @@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
build_subdir = @build_subdir@ build_subdir = @build_subdir@
do_compare = @do_compare@ do_compare = @do_compare@
gcc_version = @gcc_version@ gcc_version = @gcc_version@
glibjava_CXX = @glibjava_CXX@
here = @here@ here = @here@
host_subdir = @host_subdir@ host_subdir = @host_subdir@
libgcj_basedir = @libgcj_basedir@ libgcj_basedir = @libgcj_basedir@
......
libjava/testsuite/Makefile.in
...@@ -69,11 +69,13 @@ BACKTRACESPEC = @BACKTRACESPEC@ ...@@ -69,11 +69,13 @@ BACKTRACESPEC = @BACKTRACESPEC@
CAIRO_CFLAGS = @CAIRO_CFLAGS@ CAIRO_CFLAGS = @CAIRO_CFLAGS@
CAIRO_LIBS = @CAIRO_LIBS@ CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@
CHECKREFSPEC = @CHECKREFSPEC@ CHECKREFSPEC = @CHECKREFSPEC@
COMPPATH = @COMPPATH@ COMPPATH = @COMPPATH@
CPP = @CPP@ CPP = @CPP@
CXX = @CXX@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
CXXFLAGS = @CXXFLAGS@
DIRLTDL = @DIRLTDL@ DIRLTDL = @DIRLTDL@
DIVIDESPEC = @DIVIDESPEC@ DIVIDESPEC = @DIVIDESPEC@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
...@@ -101,6 +103,7 @@ IEEESPEC = @IEEESPEC@ ...@@ -101,6 +103,7 @@ IEEESPEC = @IEEESPEC@
INCLTDL = @INCLTDL@ INCLTDL = @INCLTDL@
INTERPRETER = @INTERPRETER@ INTERPRETER = @INTERPRETER@
JC1GCSPEC = @JC1GCSPEC@ JC1GCSPEC = @JC1GCSPEC@
LDFLAGS = @LDFLAGS@
LIBART_CFLAGS = @LIBART_CFLAGS@ LIBART_CFLAGS = @LIBART_CFLAGS@
LIBART_LIBS = @LIBART_LIBS@ LIBART_LIBS = @LIBART_LIBS@
LIBFFI = @LIBFFI@ LIBFFI = @LIBFFI@
...@@ -147,7 +150,6 @@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ ...@@ -147,7 +150,6 @@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
build_subdir = @build_subdir@ build_subdir = @build_subdir@
do_compare = @do_compare@ do_compare = @do_compare@
gcc_version = @gcc_version@ gcc_version = @gcc_version@
glibjava_CXX = @glibjava_CXX@
here = @here@ here = @here@
host_subdir = @host_subdir@ host_subdir = @host_subdir@
libgcj_basedir = @libgcj_basedir@ libgcj_basedir = @libgcj_basedir@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment