From 4dcab8b77f30502fc545530fc52474304e959b19 Mon Sep 17 00:00:00 2001 From: zack Date: Thu, 14 Aug 2003 20:25:14 +0000 Subject: * Makefile.in (tm_file): Rename tm_include_list. (tm_p_file): Rename tm_p_include_list. (build_xm_file): Rename build_xm_include_list. (host_xm_file): Rename host_xm_include_list. (xm_file): Rename xm_include_list. (xm_file_list): Add to be substituted. (cs-config.h, cs-bconfig.h, cs-tconfig.h, cs-tm.h, cs-tm_p.h): Update to match. (bt-load.o): Add missing dependency on $(TM_H). * configure.in: Prefix value of EXTRA_MODES_FILE with config/. For each of tm_file, tm_p_file, xm_file, host_xm_file, and build_xm_file, generate both *_file_list and *_include_list values from it. (xm_file_list was formerly not being generated.) In *_include_list, prefix the names of all headers found in $(srcdir)/config with config/. In each loop, consider only the special case files that can actually appear in that list. AC_SUBST all *_file_list and all *_include_list variables; do not AC_SUBST the plain *_file variables. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70449 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/configure.in | 84 +++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 22 deletions(-) (limited to 'gcc/configure.in') diff --git a/gcc/configure.in b/gcc/configure.in index 91b97783e39..3e4e8f33c42 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -1109,7 +1109,7 @@ fi if test -n "$extra_modes" && test -f $srcdir/config/$extra_modes; then extra_modes_file='$(srcdir)'/config/${extra_modes} AC_SUBST(extra_modes_file) - AC_DEFINE_UNQUOTED(EXTRA_MODES_FILE, "$extra_modes", + AC_DEFINE_UNQUOTED(EXTRA_MODES_FILE, "config/$extra_modes", [Define to the name of a file containing a list of extra machine modes for this architecture.]) AC_DEFINE(EXTRA_CC_MODES, 1, @@ -1319,35 +1319,69 @@ rm -f symtest.tem out_object_file=`basename $out_file .c`.o tm_file_list= +tm_include_list= for f in $tm_file; do case $f in - ansidecl.h ) - tm_file_list="${tm_file_list} \$(srcdir)/../include/ansidecl.h" ;; defaults.h ) - tm_file_list="${tm_file_list} \$(srcdir)/$f" ;; - *) tm_file_list="${tm_file_list} \$(srcdir)/config/$f" ;; + tm_file_list="${tm_file_list} \$(srcdir)/$f" + tm_include_list="${tm_include_list} $f" + ;; + * ) + tm_file_list="${tm_file_list} \$(srcdir)/config/$f" + tm_include_list="${tm_include_list} config/$f" + ;; esac done tm_p_file_list= +tm_p_include_list= for f in $tm_p_file; do case $f in tm-preds.h ) - tm_p_file_list="${tm_p_file_list} $f" ;; - *) tm_p_file_list="${tm_p_file_list} \$(srcdir)/config/$f" ;; + tm_p_file_list="${tm_p_file_list} $f" + tm_p_include_list="${tm_p_include_list} $f" + ;; + * ) + tm_p_file_list="${tm_p_file_list} \$(srcdir)/config/$f" + tm_p_include_list="${tm_p_include_list} config/$f" + esac +done + +xm_file_list= +xm_include_list= +for f in $xm_file; do + case $f in + ansidecl.h ) + xm_file_list="${xm_file_list} \$(srcdir)/../include/$f" + xm_include_list="${xm_include_list} $f" + ;; + auto-host.h ) + xm_file_list="${xm_file_list} $f" + xm_include_list="${xm_include_list} $f" + ;; + * ) + xm_file_list="${xm_file_list} \$(srcdir)/config/$f" + xm_include_list="${xm_include_list} config/$f" + ;; esac done host_xm_file_list= +host_xm_include_list= for f in $host_xm_file; do case $f in ansidecl.h ) - host_xm_file_list="${host_xm_file_list} \$(srcdir)/../include/ansidecl.h" ;; + host_xm_file_list="${host_xm_file_list} \$(srcdir)/../include/$f" + host_xm_include_list="${host_xm_include_list} $f" + ;; auto-host.h ) - host_xm_file_list="${host_xm_file_list} $f" ;; - defaults.h ) - host_xm_file_list="${host_xm_file_list} \$(srcdir)/$f" ;; - *) host_xm_file_list="${host_xm_file_list} \$(srcdir)/config/$f" ;; + host_xm_file_list="${host_xm_file_list} $f" + host_xm_include_list="${host_xm_include_list} $f" + ;; + * ) + host_xm_file_list="${host_xm_file_list} \$(srcdir)/config/$f" + host_xm_include_list="${host_xm_include_list} config/$f" + ;; esac done @@ -1355,12 +1389,17 @@ build_xm_file_list= for f in $build_xm_file; do case $f in ansidecl.h ) - build_xm_file_list="${build_xm_file_list} \$(srcdir)/../include/ansidecl.h" ;; + build_xm_file_list="${build_xm_file_list} \$(srcdir)/../include/$f" + build_xm_include_list="${build_xm_include_list} $f" + ;; auto-build.h | auto-host.h ) - build_xm_file_list="${build_xm_file_list} $f" ;; - defaults.h ) - host_xm_file_list="${host_xm_file_list} \$(srcdir)/$f" ;; - *) build_xm_file_list="${build_xm_file_list} \$(srcdir)/config/$f" ;; + build_xm_file_list="${build_xm_file_list} $f" + build_xm_include_list="${build_xm_include_list} $f" + ;; + * ) + build_xm_file_list="${build_xm_file_list} \$(srcdir)/config/$f" + build_xm_include_list="${build_xm_include_list} config/$f" + ;; esac done @@ -2869,7 +2908,7 @@ AC_SUBST(all_stagestuff) AC_SUBST(build_exeext) AC_SUBST(build_install_headers_dir) AC_SUBST(build_xm_file_list) -AC_SUBST(build_xm_file) +AC_SUBST(build_xm_include_list) AC_SUBST(build_xm_defines) AC_SUBST(check_languages) AC_SUBST(cc_set_by_configure) @@ -2892,7 +2931,7 @@ AC_SUBST(gcc_version_trigger) AC_SUBST(host_exeext) AC_SUBST(host_extra_gcc_objs) AC_SUBST(host_xm_file_list) -AC_SUBST(host_xm_file) +AC_SUBST(host_xm_include_list) AC_SUBST(host_xm_defines) AC_SUBST(out_host_hook_obj) AC_SUBST(install) @@ -2909,11 +2948,12 @@ AC_SUBST(quoted_stage_prefix_set_by_configure) AC_SUBST(symbolic_link) AC_SUBST(thread_file) AC_SUBST(tm_file_list) -AC_SUBST(tm_file) +AC_SUBST(tm_include_list) AC_SUBST(tm_defines) AC_SUBST(tm_p_file_list) -AC_SUBST(tm_p_file) -AC_SUBST(xm_file) +AC_SUBST(tm_p_include_list) +AC_SUBST(xm_file_list) +AC_SUBST(xm_include_list) AC_SUBST(xm_defines) AC_SUBST(target_alias) AC_SUBST(c_target_objs) -- cgit v1.2.1