Skip to content

R
riscv-gcc-1
Commit 73458fb7 by Nathanael Nerode
Options

Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES up. 

(toplev)
	* Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES up.  Delete unused
	Make macro.
	* Makefile.in: Regenerate.
	* configure.in: Clean up gxx_include_dir logic.
	* configure: Regenerate.

(gcc)
	* Makefile.in: Eliminate all.indirect.  Update and clean up comments.
	Rearrange.  Reorganize.
	* configure.in: Rearrange.
	* configure: Regenerate.

From-SVN: r64260
parent 00530a21
Showing with 218 additions and 248 deletions
ChangeLog
2003-03-12 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES up. Delete unused
Make macro.
* Makefile.in: Regenerate.
* configure.in: Clean up gxx_include_dir logic.
* configure: Regenerate.
2003-03-12 Ansgar Esztermann <ansgar@thphy.uni-duesseldorf.de> 2003-03-12 Ansgar Esztermann <ansgar@thphy.uni-duesseldorf.de>
* MAINTAINERS (Write After Approval): Add myself. * MAINTAINERS (Write After Approval): Add myself.
......
Makefile.in
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
# Don't pass command-line variables to submakes.
.NOEXPORT:
MAKEOVERRIDES=
# ------------------------------- # -------------------------------
# Standard Autoconf-set variables # Standard Autoconf-set variables
# ------------------------------- # -------------------------------
...@@ -84,7 +88,6 @@ INSTALL_DATA = $(INSTALL) -m 644 ...@@ -84,7 +88,6 @@ INSTALL_DATA = $(INSTALL) -m 644
# ------------------------------------------------- # -------------------------------------------------
links=@configlinks@ links=@configlinks@
enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
# The file containing GCC's version number. # The file containing GCC's version number.
gcc_version_trigger = @gcc_version_trigger@ gcc_version_trigger = @gcc_version_trigger@
gcc_version = @gcc_version@ gcc_version = @gcc_version@
...@@ -638,8 +641,7 @@ CLEAN_X11_MODULES = \ ...@@ -638,8 +641,7 @@ CLEAN_X11_MODULES = \
clean-gdb \ clean-gdb \
clean-expect \ clean-expect \
clean-guile \ clean-guile \
clean-tk \ clean-tk
clean-tix
# The target built for a native build. # The target built for a native build.
# This list only includes modules actually being configured and built. # This list only includes modules actually being configured and built.
...@@ -5402,73 +5404,6 @@ install-tk: installdirs ...@@ -5402,73 +5404,6 @@ install-tk: installdirs
(cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
.PHONY: configure-tix maybe-configure-tix
maybe-configure-tix:
configure-tix:
@test ! -f tix/Makefile || exit 0; \
[ -d tix ] || mkdir tix; \
r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
CC="$(CC)"; export CC; \
CFLAGS="$(CFLAGS)"; export CFLAGS; \
CXX="$(CXX)"; export CXX; \
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
if [ z$(build_canonical) != z$(host_canoncial) ] ; then \
AR="$(AR)"; export AR; \
AS="$(AS)"; export AS; \
CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
LD="$(LD)"; export LD; \
NM="$(NM)"; export NM; \
RANLIB="$(RANLIB)"; export RANLIB; \
WINDRES="$(WINDRES)"; export WINDRES; \
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
fi; \
echo Configuring in tix; \
cd tix || exit 1; \
case $(srcdir) in \
\.) \
srcdiroption="--srcdir=."; \
libsrcdir=".";; \
/* | [A-Za-z]:[\\/]*) \
srcdiroption="--srcdir=$(srcdir)/tix"; \
libsrcdir="$$s/tix";; \
*) \
srcdiroption="--srcdir=../$(srcdir)/tix"; \
libsrcdir="$$s/tix";; \
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
|| exit 1
.PHONY: all-tix maybe-all-tix
maybe-all-tix:
all-tix: configure-tix
@r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
.PHONY: check-tix
check-tix:
@r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
.PHONY: install-tix maybe-install-tix
maybe-install-tix:
install-tix: installdirs
@r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
.PHONY: configure-libtermcap maybe-configure-libtermcap .PHONY: configure-libtermcap maybe-configure-libtermcap
maybe-configure-libtermcap: maybe-configure-libtermcap:
configure-libtermcap: configure-libtermcap:
...@@ -7525,10 +7460,6 @@ config.status: configure $(gcc_version_trigger) ...@@ -7525,10 +7460,6 @@ config.status: configure $(gcc_version_trigger)
AUTOCONF = autoconf AUTOCONF = autoconf
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4 $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
cd $(srcdir) && $(AUTOCONF) cd $(srcdir) && $(AUTOCONF)
#
.NOEXPORT:
MAKEOVERRIDES=
# Tell GNU make 3.79 not to run the top level in parallel. This # Tell GNU make 3.79 not to run the top level in parallel. This
# prevents contention for $builddir/$target/config.cache, as well # prevents contention for $builddir/$target/config.cache, as well
......
Makefile.tpl
...@@ -23,6 +23,10 @@ in ...@@ -23,6 +23,10 @@ in
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
# Don't pass command-line variables to submakes.
.NOEXPORT:
MAKEOVERRIDES=
# ------------------------------- # -------------------------------
# Standard Autoconf-set variables # Standard Autoconf-set variables
# ------------------------------- # -------------------------------
...@@ -87,7 +91,6 @@ INSTALL_DATA = $(INSTALL) -m 644 ...@@ -87,7 +91,6 @@ INSTALL_DATA = $(INSTALL) -m 644
# ------------------------------------------------- # -------------------------------------------------
links=@configlinks@ links=@configlinks@
enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
# The file containing GCC's version number. # The file containing GCC's version number.
gcc_version_trigger = @gcc_version_trigger@ gcc_version_trigger = @gcc_version_trigger@
gcc_version = @gcc_version@ gcc_version = @gcc_version@
...@@ -1450,10 +1453,6 @@ config.status: configure $(gcc_version_trigger) ...@@ -1450,10 +1453,6 @@ config.status: configure $(gcc_version_trigger)
AUTOCONF = autoconf AUTOCONF = autoconf
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4 $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
cd $(srcdir) && $(AUTOCONF) cd $(srcdir) && $(AUTOCONF)
#
.NOEXPORT:
MAKEOVERRIDES=
# Tell GNU make 3.79 not to run the top level in parallel. This # Tell GNU make 3.79 not to run the top level in parallel. This
# prevents contention for $builddir/$target/config.cache, as well # prevents contention for $builddir/$target/config.cache, as well
......
configure.in
...@@ -1541,12 +1541,6 @@ EOF ...@@ -1541,12 +1541,6 @@ EOF
esac esac
fi fi
# record if we want runtime library stuff installed in libsubdir.
# Blank means no.
if test -z "${enable_version_specific_runtime_libs}"; then
enable_version_specific_runtime_libs=no
fi
# Make sure that the compiler is able to generate an executable. If it # Make sure that the compiler is able to generate an executable. If it
# can't, we are probably in trouble. We don't care whether we can run the # can't, we are probably in trouble. We don't care whether we can run the
# executable--we might be using a cross compiler--we only care whether it # executable--we might be using a cross compiler--we only care whether it
...@@ -1816,30 +1810,19 @@ target_configargs="--cache-file=../config.cache --host=${target_alias} --build=$ ...@@ -1816,30 +1810,19 @@ target_configargs="--cache-file=../config.cache --host=${target_alias} --build=$
# Note, if you change the default, make sure to fix both here and in # Note, if you change the default, make sure to fix both here and in
# the gcc and libstdc++-v3 subdirectories. # the gcc and libstdc++-v3 subdirectories.
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given. # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
gxx_include_dir= case "${with_gxx_include_dir}" in
if test -n "${with_gxx_include_dir}"; then yes)
case "${with_gxx_include_dir}" in AC_MSG_ERROR([--with-gxx-include-dir=[[dir]] requires a directory])
yes ) ;;
echo "configure.in: error: bad value ${withval} given for g++ include directory" 1>&2 no | "")
exit 1 case "${enable_version_specific_runtime_libs}" in
;; yes) gxx_include_dir='${libsubdir}/include/c++' ;;
no ) *)
;; . ${srcdir}/config.if
* ) gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
gxx_include_dir=${with_gxx_include_dir} esac ;;
;; *) gxx_include_dir=${with_gxx_include_dir} ;;
esac esac
fi
if test x${gxx_include_dir} = x; then
if test x${enable_version_specific_runtime_libs} = xyes; then
gxx_include_dir='${libsubdir}/include/c++'
else
. ${srcdir}/config.if
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir}
fi
else
gxx_include_dir=${gxx_include_dir}
fi
FLAGS_FOR_TARGET= FLAGS_FOR_TARGET=
case " $target_configdirs " in case " $target_configdirs " in
...@@ -1989,7 +1972,6 @@ AC_SUBST(RPATH_ENVVAR) ...@@ -1989,7 +1972,6 @@ AC_SUBST(RPATH_ENVVAR)
AC_SUBST(BUILD_PREFIX) AC_SUBST(BUILD_PREFIX)
AC_SUBST(BUILD_PREFIX_1) AC_SUBST(BUILD_PREFIX_1)
AC_SUBST(configlinks) AC_SUBST(configlinks)
AC_SUBST(enable_version_specific_runtime_libs)
AC_SUBST(gcc_version_trigger) AC_SUBST(gcc_version_trigger)
AC_SUBST(gcc_version) AC_SUBST(gcc_version)
AC_SUBST(tooldir) AC_SUBST(tooldir)
......
gcc/ChangeLog
2003-03-12 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.in: Eliminate all.indirect. Update and clean up comments.
Rearrange. Reorganize.
* configure.in: Rearrange.
* configure: Regenerate.
2003-03-12 Andreas Jaeger <aj@suse.de> 2003-03-12 Andreas Jaeger <aj@suse.de>
* c-cppbuiltin.c (cb_register_builtins): Define LP64 builtins for * c-cppbuiltin.c (cb_register_builtins): Define LP64 builtins for
......
gcc/configure
This source diff could not be displayed because it is too large. You can view the blob instead.
gcc/configure.in
...@@ -32,6 +32,18 @@ AC_CONFIG_HEADER(auto-host.h:config.in) ...@@ -32,6 +32,18 @@ AC_CONFIG_HEADER(auto-host.h:config.in)
# Determine the host, build, and target systems # Determine the host, build, and target systems
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# Define variables host_canonical and build_canonical
build_canonical=${build}
host_canonical=${host}
AC_SUBST(build_canonical)
AC_SUBST(host_canonical)
target_subdir=
if test "${host}" != "${target}" ; then
target_subdir=${target_alias}/
fi
AC_SUBST(target_subdir)
# Set program_transform_name # Set program_transform_name
AC_ARG_PROGRAM AC_ARG_PROGRAM
...@@ -227,6 +239,10 @@ fi ...@@ -227,6 +239,10 @@ fi
AC_SUBST(NO_MINUS_C_MINUS_O) AC_SUBST(NO_MINUS_C_MINUS_O)
AC_SUBST(OUTPUT_OPTION) AC_SUBST(OUTPUT_OPTION)
# -------------------------
# Check C compiler features
# -------------------------
AC_CACHE_CHECK(whether ${CC-cc} accepts -Wno-long-long, AC_CACHE_CHECK(whether ${CC-cc} accepts -Wno-long-long,
ac_cv_prog_cc_no_long_long, ac_cv_prog_cc_no_long_long,
[save_CFLAGS="$CFLAGS" [save_CFLAGS="$CFLAGS"
...@@ -439,9 +455,9 @@ esac], ...@@ -439,9 +455,9 @@ esac],
[coverage_flags=""]) [coverage_flags=""])
AC_SUBST(coverage_flags) AC_SUBST(coverage_flags)
# -------- # -------------------------------
# UNSORTED # Miscenalleous configure options
# -------- # -------------------------------
# With stabs # With stabs
AC_ARG_WITH(stabs, AC_ARG_WITH(stabs,
...@@ -581,43 +597,12 @@ AC_SUBST(TARGET_SYSTEM_ROOT) ...@@ -581,43 +597,12 @@ AC_SUBST(TARGET_SYSTEM_ROOT)
AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
AC_SUBST(CROSS_SYSTEM_HEADER_DIR) AC_SUBST(CROSS_SYSTEM_HEADER_DIR)
# Stage specific cflags for build. # -------------------------
stage1_cflags= # Checks for other programs
case $build in # -------------------------
vax-*-*)
if test x$GCC = xyes
then
stage1_cflags="-Wa,-J"
else
stage1_cflags="-J"
fi
;;
powerpc-*-darwin*)
# The spiffy cpp-precomp chokes on some legitimate constructs in GCC
# sources; use -no-cpp-precomp to get to GNU cpp.
# Apple's GCC has bugs in designated initializer handling, so disable
# that too.
stage1_cflags="-no-cpp-precomp -DHAVE_DESIGNATED_INITIALIZERS=0"
;;
esac
AC_SUBST(stage1_cflags)
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_MSG_CHECKING(for GNU C library)
AC_CACHE_VAL(gcc_cv_glibc,
[AC_TRY_COMPILE(
[#include <features.h>],[
#if ! (defined __GLIBC__ || defined __GNU_LIBRARY__)
#error Not a GNU C library system
#endif],
[gcc_cv_glibc=yes],
gcc_cv_glibc=no)])
AC_MSG_RESULT($gcc_cv_glibc)
if test $gcc_cv_glibc = yes; then
AC_DEFINE(_GNU_SOURCE, 1, [Always define this when using the GNU C Library])
fi
# Find some useful tools # Find some useful tools
AC_PROG_AWK AC_PROG_AWK
gcc_AC_PROG_LN gcc_AC_PROG_LN
...@@ -625,25 +610,6 @@ gcc_AC_PROG_LN_S ...@@ -625,25 +610,6 @@ gcc_AC_PROG_LN_S
AC_PROG_RANLIB AC_PROG_RANLIB
gcc_AC_PROG_INSTALL gcc_AC_PROG_INSTALL
AC_HEADER_STDC
AC_HEADER_TIME
gcc_AC_HEADER_STDBOOL
gcc_AC_HEADER_STRING
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h \
fcntl.h unistd.h sys/file.h sys/time.h \
sys/resource.h sys/param.h sys/times.h sys/stat.h \
direct.h malloc.h langinfo.h ldfcn.h)
# Check for thread headers.
AC_CHECK_HEADER(thread.h, [have_thread_h=yes], [have_thread_h=])
AC_CHECK_HEADER(pthread.h, [have_pthread_h=yes], [have_pthread_h=])
# These tests can't be done till we know if we have limits.h.
gcc_AC_C_CHAR_BIT
AC_C_BIGENDIAN_CROSS
gcc_AC_C_FLOAT_FORMAT
# See if we have the mktemp command. # See if we have the mktemp command.
AC_CHECK_PROG(have_mktemp_command, mktemp, yes, no) AC_CHECK_PROG(have_mktemp_command, mktemp, yes, no)
...@@ -696,6 +662,68 @@ else ...@@ -696,6 +662,68 @@ else
AC_CHECK_PROG(BISON, bison, bison, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing bison) AC_CHECK_PROG(BISON, bison, bison, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing bison)
fi fi
# --------------------
# Checks for C headers
# --------------------
AC_MSG_CHECKING(for GNU C library)
AC_CACHE_VAL(gcc_cv_glibc,
[AC_TRY_COMPILE(
[#include <features.h>],[
#if ! (defined __GLIBC__ || defined __GNU_LIBRARY__)
#error Not a GNU C library system
#endif],
[gcc_cv_glibc=yes],
gcc_cv_glibc=no)])
AC_MSG_RESULT($gcc_cv_glibc)
if test $gcc_cv_glibc = yes; then
AC_DEFINE(_GNU_SOURCE, 1, [Always define this when using the GNU C Library])
fi
AC_HEADER_STDC
AC_HEADER_TIME
gcc_AC_HEADER_STDBOOL
gcc_AC_HEADER_STRING
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h \
fcntl.h unistd.h sys/file.h sys/time.h \
sys/resource.h sys/param.h sys/times.h sys/stat.h \
direct.h malloc.h langinfo.h ldfcn.h)
# Check for thread headers.
AC_CHECK_HEADER(thread.h, [have_thread_h=yes], [have_thread_h=])
AC_CHECK_HEADER(pthread.h, [have_pthread_h=yes], [have_pthread_h=])
# These tests can't be done till we know if we have limits.h.
gcc_AC_C_CHAR_BIT
AC_C_BIGENDIAN_CROSS
gcc_AC_C_FLOAT_FORMAT
# --------
# UNSORTED
# --------
# Stage specific cflags for build.
stage1_cflags=
case $build in
vax-*-*)
if test x$GCC = xyes
then
stage1_cflags="-Wa,-J"
else
stage1_cflags="-J"
fi
;;
powerpc-*-darwin*)
# The spiffy cpp-precomp chokes on some legitimate constructs in GCC
# sources; use -no-cpp-precomp to get to GNU cpp.
# Apple's GCC has bugs in designated initializer handling, so disable
# that too.
stage1_cflags="-no-cpp-precomp -DHAVE_DESIGNATED_INITIALIZERS=0"
;;
esac
AC_SUBST(stage1_cflags)
# These libraries may be used by collect2. # These libraries may be used by collect2.
# We may need a special search path to get them linked. # We may need a special search path to get them linked.
AC_CACHE_CHECK(for collect2 libraries, gcc_cv_collect2_libs, AC_CACHE_CHECK(for collect2 libraries, gcc_cv_collect2_libs,
...@@ -2857,18 +2885,6 @@ if test "x$subdirs" != x; then ...@@ -2857,18 +2885,6 @@ if test "x$subdirs" != x; then
fi fi
echo "source ${srcdir}/gdbinit.in" >> .gdbinit echo "source ${srcdir}/gdbinit.in" >> .gdbinit
# Define variables host_canonical and build_canonical
# because some Cygnus local changes in the Makefile depend on them.
build_canonical=${build}
host_canonical=${host}
target_subdir=
if test "${host}" != "${target}" ; then
target_subdir=${target_alias}/
fi
AC_SUBST(build_canonical)
AC_SUBST(host_canonical)
AC_SUBST(target_subdir)
# If $(exec_prefix) exists and is not the same as $(prefix), then compute an # If $(exec_prefix) exists and is not the same as $(prefix), then compute an
# absolute path for gcc_tooldir based on inserting the number of up-directory # absolute path for gcc_tooldir based on inserting the number of up-directory
# movements required to get from $(exec_prefix) to $(prefix) into the basic # movements required to get from $(exec_prefix) to $(prefix) into the basic
......
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