From 2ed26f6bd11f3e6321338fc6423257f418e1081c Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zack@gcc.gnu.org>
Date: Sun, 31 Aug 2003 06:07:42 +0000
Subject: [PATCH] configure.frag: Delete file.
* configure.frag: Delete file.
* configure.in: Rename the substitution variables
dep_host_xmake_file and dep_tmake_file to xmake_file and
tmake_file respectively. Do not expand $srcdir in the
value of these; leave that for Make. Introduce a new
substitution varaible, all_lang_makefrags, which lists
subdirectory Make-lang.in files; exclude these from
all_lang_makefiles, which is now only for subdirectory
outputs. Do not invoke configure.frag. Do not set nor
AC_SUBST_FILE target_overrides, host_overrides, or
language_fragments. Create build subdirectories in
config.status extra commands.
* configure: Regenerate.
* Makefile.in: Update substitutions to match changes to
configure. Use include directives instead of @-insertions
to read in host, target, and language fragments.
(Makefile rule): Do not invoke configure.frag. Do not copy
config.status to config.run before executing it. Set
CONFIG_HEADERS and CONFIG_FILES so that only Makefile gets
regenerated.
(cstamp-h rule): Set CONFIG_FILES as well as CONFIG_HEADERS.
ada:
* Makefile.in: Update substitutions to match changes to
configure. Use include directives instead of @-insertions
to read in host and target fragments. Add a rule to
regenerate ada/Makefile.
From-SVN: r70957
---
gcc/ChangeLog | 24 +++++++
gcc/Makefile.in | 44 ++++++------
gcc/ada/ChangeLog | 21 ++++--
gcc/ada/Makefile.in | 29 ++++++--
gcc/configure | 165 +++++++++++++++++++++-----------------------
gcc/configure.frag | 77 ---------------------
gcc/configure.in | 40 +++++------
7 files changed, 182 insertions(+), 218 deletions(-)
delete mode 100644 gcc/configure.frag
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4856f1d4d583..16cc8148574b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,27 @@
+2003-08-30 Zack Weinberg <zack@codesourcery.com>
+
+ * configure.frag: Delete file.
+ * configure.in: Rename the substitution variables
+ dep_host_xmake_file and dep_tmake_file to xmake_file and
+ tmake_file respectively. Do not expand $srcdir in the
+ value of these; leave that for Make. Introduce a new
+ substitution varaible, all_lang_makefrags, which lists
+ subdirectory Make-lang.in files; exclude these from
+ all_lang_makefiles, which is now only for subdirectory
+ outputs. Do not invoke configure.frag. Do not set nor
+ AC_SUBST_FILE target_overrides, host_overrides, or
+ language_fragments. Create build subdirectories in
+ config.status extra commands.
+ * configure: Regenerate.
+ * Makefile.in: Update substitutions to match changes to
+ configure. Use include directives instead of @-insertions
+ to read in host, target, and language fragments.
+ (Makefile rule): Do not invoke configure.frag. Do not copy
+ config.status to config.run before executing it. Set
+ CONFIG_HEADERS and CONFIG_FILES so that only Makefile gets
+ regenerated.
+ (cstamp-h rule): Set CONFIG_FILES as well as CONFIG_HEADERS.
+
2003-08-30 Zack Weinberg <zack@codesourcery.com>
* c-tree.h: Delete COMPARE_DIFFERENT_TU from enumeration.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 3ea2c569d748..f71b5fe457ab 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -336,8 +336,8 @@ LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ]
# each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc.
TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
-xmake_file=@dep_host_xmake_file@
-tmake_file=@dep_tmake_file@
+xmake_file=@xmake_file@
+tmake_file=@tmake_file@
out_file=$(srcdir)/config/@out_file@
out_object_file=@out_object_file@
md_file=$(srcdir)/config/@md_file@
@@ -661,12 +661,16 @@ PRETTY_PRINT_H = pretty-print.h input.h $(OBSTACK_H)
DIAGNOSTIC_H = diagnostic.h diagnostic.def $(PRETTY_PRINT_H)
C_PRETTY_PRINT_H = $(PRETTY_PRINT_H) $(C_COMMON_H) $(TREE_H)
-# sed inserts variable overrides after the following line.
-####target overrides
-@target_overrides@
+# target overrides
+ifneq ($(tmake_file),)
+include $(tmake_file)
+endif
+
+# host overrides
+ifneq ($(xmake_file),)
+include $(xmake_file)
+endif
-####host overrides
-@host_overrides@
#
# Now figure out from those variables how to compile and link.
@@ -735,6 +739,7 @@ INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
# Support for additional languages (other than C).
# C can be supported this way too (leave for later).
+LANG_MAKEFRAGS = @all_lang_makefrags@
LANG_MAKEFILES = @all_lang_makefiles@
LANG_STAGESTUFF = @all_stagestuff@
@@ -917,27 +922,24 @@ LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
# targets). The name of each hooked is "lang.${target_name}" (eg: lang.info).
# Configure computes and adds these here.
-####language hooks
+# language hooks, generated by configure
@language_hooks@
-# sed inserts language fragments after the following line.
-####language fragments
-@language_fragments@
+# per-language makefile fragments
+ifneq ($(LANG_MAKEFRAGS),)
+include $(LANG_MAKEFRAGS)
+endif
-# End of language makefile fragments.
#
# -----------------------------
# Rebuilding this configuration
# -----------------------------
-Makefile: $(srcdir)/Makefile.in config.status $(srcdir)/version.c \
- $(xmake_file) $(tmake_file) $(LANG_MAKEFILES)
- $(SHELL) $(srcdir)/configure.frag $(srcdir) "$(SUBDIRS)" \
- "$(xmake_file)" "$(tmake_file)"
- cp config.status config.run
- LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.run
- rm -f config.run
+Makefile: config.status $(srcdir)/Makefile.in $(srcdir)/version.c
+ LANGUAGES="$(CONFIG_LANGUAGES)" \
+ CONFIG_HEADERS= \
+ CONFIG_FILES=$@ $(SHELL) config.status
config.h: cs-config.h ; @true
bconfig.h: cs-bconfig.h ; @true
@@ -1006,7 +1008,9 @@ mkheaders: $(srcdir)/mkheaders.in
@MAINT@ echo timestamp > $(srcdir)/cstamp-h.in
auto-host.h: cstamp-h ; @true
cstamp-h: config.in config.status
- CONFIG_HEADERS=auto-host.h:config.in LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.status
+ CONFIG_HEADERS=auto-host.h:config.in \
+ CONFIG_FILES= \
+ LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.status
# Really, really stupid make features, such as SUN's KEEP_STATE, may force
# a target to build even if it is up-to-date. So we must verify that
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e5764a4b3589..9efeeb85ffbe 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-30 Zack Weinberg <zack@codesourcery.com>
+
+ * Makefile.in: Update substitutions to match changes to
+ configure. Use include directives instead of @-insertions
+ to read in host and target fragments. Add a rule to
+ regenerate ada/Makefile.
+
2003-07-18 Neil Booth <neil@daikokuya.co.uk>
* lang-options.h: Remove.
@@ -142,10 +149,10 @@ Thu Jun 5 18:33:40 CEST 2003 Jan Hubicka <jh@suse.cz>
2003-06-04 Olivier Hainque <hainque@act-europe.fr>
- PR ada/9953:
- * 5hsystem.ads: Remove pragma Linker_Option for pthreads library,
- and turn ZCX_By_Default back to False since the underlying support
- is not quite there yet.
+ PR ada/9953:
+ * 5hsystem.ads: Remove pragma Linker_Option for pthreads library,
+ and turn ZCX_By_Default back to False since the underlying support
+ is not quite there yet.
2003-06-01 Andreas Jaeger <aj@suse.de>
@@ -173,9 +180,9 @@ Thu Jun 5 18:33:40 CEST 2003 Jan Hubicka <jh@suse.cz>
2003-05-01 Laurent Guerby <guerby@acm.org>
- PR ada/10546
- * 5iosinte.ads: Increase pthread_cond_t size to match recent
- LinuxThread and NPTL version, merge from ACT.
+ PR ada/10546
+ * 5iosinte.ads: Increase pthread_cond_t size to match recent
+ LinuxThread and NPTL version, merge from ACT.
2003-04-28 Zack Weinberg <zack@codesourcery.com>
diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index c10bbc4a1034..abed86b7cde7 100644
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -177,8 +177,8 @@ objdir = .
target=@target@
target_alias=@target_alias@
-xmake_file=@dep_host_xmake_file@
-tmake_file=@dep_tmake_file@
+xmake_file = @xmake_file@
+tmake_file = @tmake_file@
host_canonical=@host@
#version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.c`
#mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c`
@@ -217,12 +217,20 @@ all: all.indirect
# This tells GNU Make version 3 not to put all variables in the environment.
.NOEXPORT:
-# sed inserts variable overrides after the following line.
-####target overrides
-@target_overrides@
+# tmake_file and xmake_file expand to lists with entries of the form
+# $(srcdir)/config/... but here $(srcdir) is the ada subdirectory so we
+# need to adjust the paths. There can't be spaces in the subst arguments
+# or we get spurious spaces in the actual list of files to include.
-####host overrides
-@host_overrides@
+# target overrides
+ifneq ($(tmake_file),)
+include $(subst /config,/../config,$(tmake_file))
+endif
+
+# host overrides
+ifneq ($(xmake_file),)
+include $(subst /config,/../config,$(xmake_file))
+endif
# Now figure out from those variables how to compile and link.
@@ -278,6 +286,13 @@ ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)
.ads.o:
$(ADAC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $<
+# how to regenerate this file
+Makefile: ../config.status $(srcdir)/Makefile.in $(srcdir)/../version.c
+ cd ..; \
+ LANGUAGES="$(CONFIG_LANGUAGES)" \
+ CONFIG_HEADERS= \
+ CONFIG_FILES=ada/Makefile $(SHELL) config.status
+
# This tells GNU make version 3 not to export all the variables
# defined in this file into the environment.
.NOEXPORT:
diff --git a/gcc/configure b/gcc/configure
index 9a2c150eab27..9cc650e466df 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -5559,30 +5559,25 @@ topdir=`${PWDCMD-pwd}`
cd $holddir
# Conditionalize the makefile for this host machine.
-# Make-host contains the concatenation of all host makefile fragments
-# [there can be more than one]. This file is built by configure.frag.
-host_overrides=Make-host
-dep_host_xmake_file=
+xmake_file=
for f in .. ${host_xmake_file}
do
if test -f ${srcdir}/config/$f
then
- dep_host_xmake_file="${dep_host_xmake_file} ${srcdir}/config/$f"
+ xmake_file="${xmake_file} \$(srcdir)/config/$f"
fi
done
# Conditionalize the makefile for this target machine.
-# Make-target contains the concatenation of all host makefile fragments
-# [there can be more than one]. This file is built by configure.frag.
-target_overrides=Make-target
-dep_tmake_file=
+tmake_file_=
for f in .. ${tmake_file}
do
if test -f ${srcdir}/config/$f
then
- dep_tmake_file="${dep_tmake_file} ${srcdir}/config/$f"
+ tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
fi
done
+tmake_file="${tmake_file_}"
symbolic_link='ln -s'
@@ -5806,7 +5801,7 @@ esac
# build->target assembler and hope that it will have the same features
# as the host->target assembler we'll be using.
echo $ac_n "checking what assembler to use""... $ac_c" 1>&6
-echo "configure:5810: checking what assembler to use" >&5
+echo "configure:5805: checking what assembler to use" >&5
in_tree_gas=no
gcc_cv_as=
gcc_cv_gas_major_version=
@@ -5930,7 +5925,7 @@ esac
# build->target linker and hope that it will have the same features
# as the host->target linker we'll be using.
echo $ac_n "checking what linker to use""... $ac_c" 1>&6
-echo "configure:5934: checking what linker to use" >&5
+echo "configure:5929: checking what linker to use" >&5
in_tree_ld=no
gcc_cv_ld=
gcc_cv_gld_major_version=
@@ -6038,7 +6033,7 @@ esac
# Figure out what nm we will be using.
gcc_cv_binutils_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/binutils
echo $ac_n "checking what nm to use""... $ac_c" 1>&6
-echo "configure:6042: checking what nm to use" >&5
+echo "configure:6037: checking what nm to use" >&5
in_tree_nm=no
if test -x nm$host_exeext; then
gcc_cv_nm=./nm$host_exeext
@@ -6061,7 +6056,7 @@ esac
# Figure out what objdump we will be using.
echo $ac_n "checking what objdump to use""... $ac_c" 1>&6
-echo "configure:6065: checking what objdump to use" >&5
+echo "configure:6060: checking what objdump to use" >&5
in_tree_objdump=no
if test -x objdump$host_exeext; then
gcc_cv_objdump=./objdump$host_exeext
@@ -6086,7 +6081,7 @@ esac
# Figure out what assembler alignment features are present.
echo $ac_n "checking assembler for .balign and .p2align""... $ac_c" 1>&6
-echo "configure:6090: checking assembler for .balign and .p2align" >&5
+echo "configure:6085: checking assembler for .balign and .p2align" >&5
if eval "test \"`echo '$''{'gcc_cv_as_balign_and_p2align'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6098,7 +6093,7 @@ fi
elif test x$gcc_cv_as != x; then
echo '.balign 4
.p2align 2' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_balign_and_p2align=yes
else
@@ -6118,7 +6113,7 @@ EOF
fi
echo $ac_n "checking assembler for .p2align with maximum skip""... $ac_c" 1>&6
-echo "configure:6122: checking assembler for .p2align with maximum skip" >&5
+echo "configure:6117: checking assembler for .p2align with maximum skip" >&5
if eval "test \"`echo '$''{'gcc_cv_as_max_skip_p2align'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6129,7 +6124,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo '.p2align 4,,7' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_max_skip_p2align=yes
else
@@ -6149,7 +6144,7 @@ EOF
fi
echo $ac_n "checking assembler for working .subsection -1""... $ac_c" 1>&6
-echo "configure:6153: checking assembler for working .subsection -1" >&5
+echo "configure:6148: checking assembler for working .subsection -1" >&5
if eval "test \"`echo '$''{'gcc_cv_as_subsection_m1'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6164,7 +6159,7 @@ fi
.subsection -1
conftest_label2: .word 0
.previous' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
if test x$gcc_cv_nm != x; then
$gcc_cv_nm conftest.o | grep conftest_label1 > conftest.nm1
@@ -6192,7 +6187,7 @@ EOF
fi
echo $ac_n "checking assembler for .weak""... $ac_c" 1>&6
-echo "configure:6196: checking assembler for .weak" >&5
+echo "configure:6191: checking assembler for .weak" >&5
if eval "test \"`echo '$''{'gcc_cv_as_weak'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6203,7 +6198,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo ' .weak foobar' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_weak=yes
else
@@ -6230,7 +6225,7 @@ fi
# to be safe.
# The gcc_GAS_CHECK_FEATURE call just sets a cache variable.
echo $ac_n "checking assembler for .hidden""... $ac_c" 1>&6
-echo "configure:6234: checking assembler for .hidden" >&5
+echo "configure:6229: checking assembler for .hidden" >&5
if eval "test \"`echo '$''{'gcc_cv_as_hidden'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6243,7 +6238,7 @@ fi
elif test x$gcc_cv_as != x; then
echo ' .hidden foobar
foobar:' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_hidden=yes
else
@@ -6258,7 +6253,7 @@ echo "$ac_t""$gcc_cv_as_hidden" 1>&6
echo $ac_n "checking linker for .hidden support""... $ac_c" 1>&6
-echo "configure:6262: checking linker for .hidden support" >&5
+echo "configure:6257: checking linker for .hidden support" >&5
if eval "test \"`echo '$''{'gcc_cv_ld_hidden'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6332,7 +6327,7 @@ fi
# Check if we have .[us]leb128, and support symbol arithmetic with it.
echo $ac_n "checking assembler for .sleb128 and .uleb128""... $ac_c" 1>&6
-echo "configure:6336: checking assembler for .sleb128 and .uleb128" >&5
+echo "configure:6331: checking assembler for .sleb128 and .uleb128" >&5
if eval "test \"`echo '$''{'gcc_cv_as_leb128'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6349,7 +6344,7 @@ L1:
.uleb128 1280
.sleb128 -1010
L2:' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
# GAS versions before 2.11 do not support uleb128,
# despite appearing to.
@@ -6385,7 +6380,7 @@ fi
# GAS versions up to and including 2.11.0 may mis-optimize
# .eh_frame data.
echo $ac_n "checking assembler for eh_frame optimization""... $ac_c" 1>&6
-echo "configure:6389: checking assembler for eh_frame optimization" >&5
+echo "configure:6384: checking assembler for eh_frame optimization" >&5
if eval "test \"`echo '$''{'gcc_cv_as_eh_frame'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6428,7 +6423,7 @@ __FRAME_BEGIN__:
.byte 0x4
.4byte .L1-.LFB1
.LEFDE1:' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
cat > conftest.lit <<EOF
0000 10000000 00000000 017a0001 781a0004 .........z..x...
@@ -6449,7 +6444,7 @@ EOF
|| cmp conftest.big conftest.got > /dev/null 2>&1; }
then
gcc_cv_as_eh_frame=yes
- elif { ac_try='$gcc_cv_as -o conftest.o --traditional-format /dev/null'; { (eval echo configure:6453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+ elif { ac_try='$gcc_cv_as -o conftest.o --traditional-format /dev/null'; { (eval echo configure:6448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
gcc_cv_as_eh_frame=buggy
else
# Uh oh, what do we do now?
@@ -6474,7 +6469,7 @@ EOF
fi
echo $ac_n "checking assembler for section merging support""... $ac_c" 1>&6
-echo "configure:6478: checking assembler for section merging support" >&5
+echo "configure:6473: checking assembler for section merging support" >&5
if eval "test \"`echo '$''{'gcc_cv_as_shf_merge'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6486,7 +6481,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo '.section .rodata.str, "aMS", @progbits, 1' > conftest.s
- if { ac_try='$gcc_cv_as --fatal-warnings -o conftest.o conftest.s >&5'; { (eval echo configure:6490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as --fatal-warnings -o conftest.o conftest.s >&5'; { (eval echo configure:6485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_shf_merge=yes
else
@@ -6685,7 +6680,7 @@ if test -z "$tls_first_major"; then
: # If we don't have a check, assume no support.
else
echo $ac_n "checking assembler for thread-local storage support""... $ac_c" 1>&6
-echo "configure:6689: checking assembler for thread-local storage support" >&5
+echo "configure:6684: checking assembler for thread-local storage support" >&5
if eval "test \"`echo '$''{'gcc_cv_as_tls'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6696,7 +6691,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo "$conftest_s" > conftest.s
- if { ac_try='$gcc_cv_as $tls_as_opt --fatal-warnings -o conftest.o conftest.s >&5'; { (eval echo configure:6700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as $tls_as_opt --fatal-warnings -o conftest.o conftest.s >&5'; { (eval echo configure:6695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_tls=yes
else
@@ -6722,7 +6717,7 @@ case "$target" in
# All TARGET_ABI_OSF targets.
alpha*-*-osf* | alpha*-*-linux* | alpha*-*-*bsd*)
echo $ac_n "checking assembler for explicit relocation support""... $ac_c" 1>&6
-echo "configure:6726: checking assembler for explicit relocation support" >&5
+echo "configure:6721: checking assembler for explicit relocation support" >&5
if eval "test \"`echo '$''{'gcc_cv_as_alpha_explicit_relocs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6745,7 +6740,7 @@ fi
ldah $1, d($29) !gprelhigh
lda $1, d($1) !gprellow
lda $29, 0($29) !gpdisp!3' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_alpha_explicit_relocs=yes
else
@@ -6767,14 +6762,14 @@ fi
sparc*-*-*)
echo $ac_n "checking assembler for .register""... $ac_c" 1>&6
-echo "configure:6771: checking assembler for .register" >&5
+echo "configure:6766: checking assembler for .register" >&5
if eval "test \"`echo '$''{'gcc_cv_as_sparc_register_op'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
gcc_cv_as_sparc_register_op=no
if test x$gcc_cv_as != x; then
echo '.register %g2, #scratch' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_sparc_register_op=yes
else
@@ -6794,14 +6789,14 @@ EOF
fi
echo $ac_n "checking assembler for -relax option""... $ac_c" 1>&6
-echo "configure:6798: checking assembler for -relax option" >&5
+echo "configure:6793: checking assembler for -relax option" >&5
if eval "test \"`echo '$''{'gcc_cv_as_sparc_relax'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
gcc_cv_as_sparc_relax=no
if test x$gcc_cv_as != x; then
echo '.text' > conftest.s
- if { ac_try='$gcc_cv_as -relax -o conftest.o conftest.s >&5'; { (eval echo configure:6805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -relax -o conftest.o conftest.s >&5'; { (eval echo configure:6800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_sparc_relax=yes
else
@@ -6821,7 +6816,7 @@ EOF
fi
echo $ac_n "checking assembler for unaligned pcrel relocs""... $ac_c" 1>&6
-echo "configure:6825: checking assembler for unaligned pcrel relocs" >&5
+echo "configure:6820: checking assembler for unaligned pcrel relocs" >&5
if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6834,7 +6829,7 @@ foo:
.align 4
.byte 0
.uaword %r_disp32(foo)' > conftest.s
- if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
if test x$gcc_cv_ld != x \
&& $gcc_cv_ld -o conftest conftest.o -G > /dev/null 2>&1; then
@@ -6857,7 +6852,7 @@ EOF
echo $ac_n "checking assembler for unaligned pcrel relocs against hidden symbols""... $ac_c" 1>&6
-echo "configure:6861: checking assembler for unaligned pcrel relocs against hidden symbols" >&5
+echo "configure:6856: checking assembler for unaligned pcrel relocs against hidden symbols" >&5
if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel_hidden'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6872,7 +6867,7 @@ else
.hidden foo
foo:
.skip 4' > conftest.s
- if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
if test x$gcc_cv_ld != x && test x$gcc_cv_objdump != x \
&& $gcc_cv_ld -o conftest conftest.o -G > /dev/null 2>&1 \
@@ -6905,7 +6900,7 @@ fi
fi # unaligned pcrel relocs
echo $ac_n "checking assembler for offsetable %lo()""... $ac_c" 1>&6
-echo "configure:6909: checking assembler for offsetable %lo()" >&5
+echo "configure:6904: checking assembler for offsetable %lo()" >&5
if eval "test \"`echo '$''{'gcc_cv_as_sparc_offsetable_lo10'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6914,7 +6909,7 @@ else
echo '.text
or %g1, %lo(ab) + 12, %g1
or %g1, %lo(ab + 12), %g1' > conftest.s
- if { ac_try='$gcc_cv_as -xarch=v9 -o conftest.o conftest.s >&5'; { (eval echo configure:6918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -xarch=v9 -o conftest.o conftest.s >&5'; { (eval echo configure:6913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
if test x$gcc_cv_objdump != x \
&& %gcc_cv_objdump -s -j .text conftest.o 2> /dev/null \
@@ -6940,7 +6935,7 @@ fi
i[34567]86-*-* | x86_64-*-*)
echo $ac_n "checking assembler for filds and fists mnemonics""... $ac_c" 1>&6
-echo "configure:6944: checking assembler for filds and fists mnemonics" >&5
+echo "configure:6939: checking assembler for filds and fists mnemonics" >&5
if eval "test \"`echo '$''{'gcc_cv_as_ix86_filds_fists'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6951,7 +6946,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo 'filds mem; fists mem' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_ix86_filds_fists=yes
else
@@ -6973,7 +6968,7 @@ fi
# This one is used unconditionally by i386.[ch]; it is to be defined
# to 1 if the feature is present, 0 otherwise.
echo $ac_n "checking assembler for GOTOFF in data""... $ac_c" 1>&6
-echo "configure:6977: checking assembler for GOTOFF in data" >&5
+echo "configure:6972: checking assembler for GOTOFF in data" >&5
if eval "test \"`echo '$''{'gcc_cv_as_ix86_gotoff_in_data'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6988,7 +6983,7 @@ fi
nop
.data
.long .L0@GOTOFF' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_ix86_gotoff_in_data=yes
else
@@ -7009,7 +7004,7 @@ EOF
ia64*-*-*)
echo $ac_n "checking assembler for ltoffx and ldxmov relocs""... $ac_c" 1>&6
-echo "configure:7013: checking assembler for ltoffx and ldxmov relocs" >&5
+echo "configure:7008: checking assembler for ltoffx and ldxmov relocs" >&5
if eval "test \"`echo '$''{'gcc_cv_as_ia64_ltoffx_ldxmov_relocs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7023,7 +7018,7 @@ fi
addl r15 = @ltoffx(x#), gp
;;
ld8.mov r16 = [r15], x#' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_ia64_ltoffx_ldxmov_relocs=yes
else
@@ -7053,7 +7048,7 @@ fi
mfcr 3,128"
echo $ac_n "checking assembler for mfcr field support""... $ac_c" 1>&6
-echo "configure:7057: checking assembler for mfcr field support" >&5
+echo "configure:7052: checking assembler for mfcr field support" >&5
if eval "test \"`echo '$''{'gcc_cv_as_powerpc_mfcrf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7064,7 +7059,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo "$conftest_s" > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_powerpc_mfcrf=yes
else
@@ -7086,7 +7081,7 @@ fi
mips*-*-*)
echo $ac_n "checking assembler for explicit relocation support""... $ac_c" 1>&6
-echo "configure:7090: checking assembler for explicit relocation support" >&5
+echo "configure:7085: checking assembler for explicit relocation support" >&5
if eval "test \"`echo '$''{'gcc_cv_as_mips_explicit_relocs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7097,7 +7092,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo ' lw $4,%gp_rel(foo)($4)' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_mips_explicit_relocs=yes
else
@@ -7143,7 +7138,7 @@ if test x"$insn" != x; then
.loc 1 3 0
$insn"
echo $ac_n "checking assembler for dwarf2 debug_line support""... $ac_c" 1>&6
-echo "configure:7147: checking assembler for dwarf2 debug_line support" >&5
+echo "configure:7142: checking assembler for dwarf2 debug_line support" >&5
if eval "test \"`echo '$''{'gcc_cv_as_dwarf2_debug_line'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7155,7 +7150,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo "$conftest_s" > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
# ??? This fails with non-gnu grep. Maybe use objdump?
if grep debug_line conftest.o > /dev/null 2>&1; then
@@ -7177,7 +7172,7 @@ echo "$ac_t""$gcc_cv_as_dwarf2_debug_line" 1>&6
# by DW_AT_decl_file. Approximate this test by testing if
# the assembler bitches if the same index is assigned twice.
echo $ac_n "checking assembler for buggy dwarf2 .file directive""... $ac_c" 1>&6
-echo "configure:7181: checking assembler for buggy dwarf2 .file directive" >&5
+echo "configure:7176: checking assembler for buggy dwarf2 .file directive" >&5
if eval "test \"`echo '$''{'gcc_cv_as_dwarf2_file_buggy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7185,7 +7180,7 @@ else
if test x$gcc_cv_as != x; then
echo ' .file 1 "foo.s"
.file 1 "bar.s"' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_dwarf2_file_buggy=yes
else
@@ -7208,7 +7203,7 @@ EOF
fi
echo $ac_n "checking assembler for --gdwarf2 option""... $ac_c" 1>&6
-echo "configure:7212: checking assembler for --gdwarf2 option" >&5
+echo "configure:7207: checking assembler for --gdwarf2 option" >&5
if eval "test \"`echo '$''{'gcc_cv_as_gdwarf2_flag'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7220,7 +7215,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo "$insn" > conftest.s
- if { ac_try='$gcc_cv_as --gdwarf2 -o conftest.o conftest.s >&5'; { (eval echo configure:7224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as --gdwarf2 -o conftest.o conftest.s >&5'; { (eval echo configure:7219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_gdwarf2_flag=yes
else
@@ -7240,7 +7235,7 @@ EOF
fi
echo $ac_n "checking assembler for --gstabs option""... $ac_c" 1>&6
-echo "configure:7244: checking assembler for --gstabs option" >&5
+echo "configure:7239: checking assembler for --gstabs option" >&5
if eval "test \"`echo '$''{'gcc_cv_as_gstabs_flag'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7252,12 +7247,12 @@ else
fi
elif test x$gcc_cv_as != x; then
echo "$insn" > conftest.s
- if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s >&5'; { (eval echo configure:7256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s >&5'; { (eval echo configure:7251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
# The native Solaris 9/Intel assembler doesn't understand --gstabs
# and warns about it, but still exits successfully. So check for
# this.
- if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s 2>&1 | grep -i warning > /dev/null'; { (eval echo configure:7261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s 2>&1 | grep -i warning > /dev/null'; { (eval echo configure:7256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then :
else gcc_cv_as_gstabs_flag=yes
fi
@@ -7279,7 +7274,7 @@ fi
fi
echo $ac_n "checking linker read-only and read-write section mixing""... $ac_c" 1>&6
-echo "configure:7283: checking linker read-only and read-write section mixing" >&5
+echo "configure:7278: checking linker read-only and read-write section mixing" >&5
gcc_cv_ld_ro_rw_mix=unknown
if test $in_tree_ld = yes ; then
if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 10 -o "$gcc_cv_gld_major_version" -gt 2 \
@@ -7318,7 +7313,7 @@ fi
echo "$ac_t""$gcc_cv_ld_ro_rw_mix" 1>&6
echo $ac_n "checking linker PT_GNU_EH_FRAME support""... $ac_c" 1>&6
-echo "configure:7322: checking linker PT_GNU_EH_FRAME support" >&5
+echo "configure:7317: checking linker PT_GNU_EH_FRAME support" >&5
gcc_cv_ld_eh_frame_hdr=no
if test $in_tree_ld = yes ; then
if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 12 -o "$gcc_cv_gld_major_version" -gt 2 \
@@ -7340,7 +7335,7 @@ fi
echo "$ac_t""$gcc_cv_ld_eh_frame_hdr" 1>&6
echo $ac_n "checking linker position independent executable support""... $ac_c" 1>&6
-echo "configure:7344: checking linker position independent executable support" >&5
+echo "configure:7339: checking linker position independent executable support" >&5
gcc_cv_ld_pie=no
if test $in_tree_ld = yes ; then
if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 15 -o "$gcc_cv_gld_major_version" -gt 2 \
@@ -7365,7 +7360,7 @@ echo "$ac_t""$gcc_cv_ld_pie" 1>&6
case "$target" in
mips*-*-*)
echo $ac_n "checking whether libgloss uses STARTUP directives consistently""... $ac_c" 1>&6
-echo "configure:7369: checking whether libgloss uses STARTUP directives consistently" >&5
+echo "configure:7364: checking whether libgloss uses STARTUP directives consistently" >&5
gcc_cv_mips_libgloss_startup=no
gcc_cv_libgloss_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/libgloss
if test "x$exec_prefix" = xNONE; then
@@ -7570,7 +7565,7 @@ fi
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:7574: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:7569: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -7615,6 +7610,8 @@ all_compilers=
all_stagestuff=
all_outputs='Makefile fixinc/Makefile gccbug mklibgcc mkheaders'
# List of language makefile fragments.
+all_lang_makefrags=
+# List of language subdirectory makefiles. Deprecated.
all_lang_makefiles=
# Files for gengtype
all_gtfiles="$target_gtfiles"
@@ -7629,7 +7626,6 @@ all_gtfiles_files_files=
# The other mechanism is a set of hooks for each of the main targets
# like `clean', `install', etc.
-language_fragments="Make-lang"
language_hooks="Make-hooks"
for s in .. $subdirs
@@ -7648,9 +7644,9 @@ do
echo "${srcdir}/$s/config-lang.in doesn't set \$language." 1>&2
exit 1
fi
- all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Make-lang.in"
+ all_lang_makefrags="$all_lang_makefrags \$(srcdir)/$s/Make-lang.in"
if test -f ${srcdir}/$s/Makefile.in
- then all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Makefile.in"
+ then all_lang_makefiles="$s/Makefile"
fi
all_languages="$all_languages $language"
if test "x$boot_language" = xyes
@@ -7799,9 +7795,6 @@ fi
objdir=`${PWDCMD-pwd}`
-# Process the language and host/target makefile fragments.
-${CONFIG_SHELL-/bin/sh} $srcdir/configure.frag $srcdir "$subdirs" "$dep_host_xmake_file" "$dep_tmake_file"
-
# Substitute configuration variables
@@ -7868,8 +7861,6 @@ ${CONFIG_SHELL-/bin/sh} $srcdir/configure.frag $srcdir "$subdirs" "$dep_host_xma
-
-
@@ -8137,6 +8128,7 @@ s%@all_compilers@%$all_compilers%g
s%@all_gtfiles@%$all_gtfiles%g
s%@all_gtfiles_files_langs@%$all_gtfiles_files_langs%g
s%@all_gtfiles_files_files@%$all_gtfiles_files_files%g
+s%@all_lang_makefrags@%$all_lang_makefrags%g
s%@all_lang_makefiles@%$all_lang_makefiles%g
s%@all_languages@%$all_languages%g
s%@all_stagestuff@%$all_stagestuff%g
@@ -8149,8 +8141,8 @@ s%@check_languages@%$check_languages%g
s%@cc_set_by_configure@%$cc_set_by_configure%g
s%@quoted_cc_set_by_configure@%$quoted_cc_set_by_configure%g
s%@cpp_install_dir@%$cpp_install_dir%g
-s%@dep_host_xmake_file@%$dep_host_xmake_file%g
-s%@dep_tmake_file@%$dep_tmake_file%g
+s%@xmake_file@%$xmake_file%g
+s%@tmake_file@%$tmake_file%g
s%@extra_headers_list@%$extra_headers_list%g
s%@extra_objs@%$extra_objs%g
s%@extra_parts@%$extra_parts%g
@@ -8193,12 +8185,6 @@ s%@xm_defines@%$xm_defines%g
s%@c_target_objs@%$c_target_objs%g
s%@cxx_target_objs@%$cxx_target_objs%g
s%@target_cpu_default@%$target_cpu_default%g
-/@target_overrides@/r $target_overrides
-s%@target_overrides@%%g
-/@host_overrides@/r $host_overrides
-s%@host_overrides@%%g
-/@language_fragments@/r $language_fragments
-s%@language_fragments@%%g
/@language_hooks@/r $language_hooks
s%@language_hooks@%%g
@@ -8415,6 +8401,13 @@ case x$CONFIG_HEADERS in
xauto-host.h:config.in)
echo > cstamp-h ;;
esac
+# Make sure all the subdirs exist.
+for d in .. $subdirs
+do
+ if test $d != ..; then
+ test -d $d || mkdir $d
+ fi
+done
# If the host supports symlinks, point stage[1234] at ../stage[1234] so
# bootstrapping and the installation procedure can still use
# CC="stage1/xgcc -Bstage1/". If the host doesn't support symlinks,
diff --git a/gcc/configure.frag b/gcc/configure.frag
deleted file mode 100644
index 2fdbca8bd41c..000000000000
--- a/gcc/configure.frag
+++ /dev/null
@@ -1,77 +0,0 @@
-# configure.frag for GCC
-# Process the host/target/language Makefile fragments.
-
-# Copyright (C) 1997 Free Software Foundation, Inc.
-
-#This file is part of GCC.
-
-#GCC is free software; you can redistribute it and/or modify it under
-#the terms of the GNU General Public License as published by the Free
-#Software Foundation; either version 2, or (at your option) any later
-#version.
-
-#GCC is distributed in the hope that it will be useful, but WITHOUT
-#ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-#for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with GCC; see the file COPYING. If not, write to the Free
-#Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-#02111-1307, USA.
-
-# First parameter is the source directory, second is list of subdirectories,
-# third is list of host makefile fragments, fourth is list of target makefile
-# fragments.
-
-srcdir=$1
-subdirs=$2
-xmake_files=$3
-tmake_files=$4
-
-# Copy all the host makefile fragments into Make-host.
-
-rm -f Make-host
-touch Make-host
-for f in .. $xmake_files
-do
- if [ -f $f ]
- then
- cat $f >> Make-host
- fi
-done
-
-# Copy all the target makefile fragments into Make-target.
-
-rm -f Make-target
-touch Make-target
-for f in .. $tmake_files
-do
- if [ -f $f ]
- then
- cat $f >> Make-target
- fi
-done
-
-# Ensure the language build subdirectories exist.
-
-for subdir in . $subdirs
-do
- if [ $subdir != . ]
- then
- test -d $subdir || mkdir $subdir
- fi
-done
-
-# Now copy each language's Make-lang.in file to Make-lang.
-
-rm -f Make-lang
-touch Make-lang
-
-for subdir in . $subdirs
-do
- if [ $subdir != . ]
- then
- cat $srcdir/$subdir/Make-lang.in >> Make-lang
- fi
-done
diff --git a/gcc/configure.in b/gcc/configure.in
index 824008e4e69f..01d3e49a50fd 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1264,30 +1264,25 @@ topdir=`${PWDCMD-pwd}`
cd $holddir
# Conditionalize the makefile for this host machine.
-# Make-host contains the concatenation of all host makefile fragments
-# [there can be more than one]. This file is built by configure.frag.
-host_overrides=Make-host
-dep_host_xmake_file=
+xmake_file=
for f in .. ${host_xmake_file}
do
if test -f ${srcdir}/config/$f
then
- dep_host_xmake_file="${dep_host_xmake_file} ${srcdir}/config/$f"
+ xmake_file="${xmake_file} \$(srcdir)/config/$f"
fi
done
# Conditionalize the makefile for this target machine.
-# Make-target contains the concatenation of all host makefile fragments
-# [there can be more than one]. This file is built by configure.frag.
-target_overrides=Make-target
-dep_tmake_file=
+tmake_file_=
for f in .. ${tmake_file}
do
if test -f ${srcdir}/config/$f
then
- dep_tmake_file="${dep_tmake_file} ${srcdir}/config/$f"
+ tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
fi
done
+tmake_file="${tmake_file_}"
symbolic_link='ln -s'
@@ -2726,6 +2721,8 @@ all_compilers=
all_stagestuff=
all_outputs='Makefile fixinc/Makefile gccbug mklibgcc mkheaders'
# List of language makefile fragments.
+all_lang_makefrags=
+# List of language subdirectory makefiles. Deprecated.
all_lang_makefiles=
# Files for gengtype
all_gtfiles="$target_gtfiles"
@@ -2740,7 +2737,6 @@ all_gtfiles_files_files=
# The other mechanism is a set of hooks for each of the main targets
# like `clean', `install', etc.
-language_fragments="Make-lang"
language_hooks="Make-hooks"
for s in .. $subdirs
@@ -2759,9 +2755,9 @@ do
echo "${srcdir}/$s/config-lang.in doesn't set \$language." 1>&2
exit 1
fi
- all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Make-lang.in"
+ all_lang_makefrags="$all_lang_makefrags \$(srcdir)/$s/Make-lang.in"
if test -f ${srcdir}/$s/Makefile.in
- then all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Makefile.in"
+ then all_lang_makefiles="$s/Makefile"
fi
all_languages="$all_languages $language"
if test "x$boot_language" = xyes
@@ -2906,9 +2902,6 @@ AC_SUBST(slibdir)
objdir=`${PWDCMD-pwd}`
AC_SUBST(objdir)
-# Process the language and host/target makefile fragments.
-${CONFIG_SHELL-/bin/sh} $srcdir/configure.frag $srcdir "$subdirs" "$dep_host_xmake_file" "$dep_tmake_file"
-
# Substitute configuration variables
AC_SUBST(subdirs)
AC_SUBST(srcdir)
@@ -2917,6 +2910,7 @@ AC_SUBST(all_compilers)
AC_SUBST(all_gtfiles)
AC_SUBST(all_gtfiles_files_langs)
AC_SUBST(all_gtfiles_files_files)
+AC_SUBST(all_lang_makefrags)
AC_SUBST(all_lang_makefiles)
AC_SUBST(all_languages)
AC_SUBST(all_stagestuff)
@@ -2929,8 +2923,8 @@ AC_SUBST(check_languages)
AC_SUBST(cc_set_by_configure)
AC_SUBST(quoted_cc_set_by_configure)
AC_SUBST(cpp_install_dir)
-AC_SUBST(dep_host_xmake_file)
-AC_SUBST(dep_tmake_file)
+AC_SUBST(xmake_file)
+AC_SUBST(tmake_file)
AC_SUBST(extra_headers_list)
AC_SUBST(extra_objs)
AC_SUBST(extra_parts)
@@ -2975,9 +2969,6 @@ AC_SUBST(c_target_objs)
AC_SUBST(cxx_target_objs)
AC_SUBST(target_cpu_default)
-AC_SUBST_FILE(target_overrides)
-AC_SUBST_FILE(host_overrides)
-AC_SUBST_FILE(language_fragments)
AC_SUBST_FILE(language_hooks)
# Echo that links are built
@@ -3017,6 +3008,13 @@ case x$CONFIG_HEADERS in
xauto-host.h:config.in)
echo > cstamp-h ;;
esac
+# Make sure all the subdirs exist.
+for d in .. $subdirs
+do
+ if test $d != ..; then
+ test -d $d || mkdir $d
+ fi
+done
# If the host supports symlinks, point stage[1234] at ../stage[1234] so
# bootstrapping and the installation procedure can still use
# CC="stage1/xgcc -Bstage1/". If the host doesn't support symlinks,
--
GitLab