Skip to content

R
riscv-gcc-1
Commit 4982adbe by Richard Sandiford Committed by Richard Sandiford
Options

config.if: Delete. 

	* config.if: Delete.
	* configure.in: Set libstdcxx_incdir directly.
	* configure: Regenerate.

From-SVN: r91679
parent ad1063d5
Showing with 40 additions and 65 deletions
ChangeLog
2004-12-03 Richard Sandiford <rsandifo@redhat.com>
* config.if: Delete.
* configure.in: Set libstdcxx_incdir directly.
* configure: Regenerate.
2004-12-02 Eric Christopher <echristo@redhat.com> 2004-12-02 Eric Christopher <echristo@redhat.com>
* Makefile.tpl (clean-target-libgcc): Make change in correct place. * Makefile.tpl (clean-target-libgcc): Make change in correct place.
......
config.if deleted 100644 → 0
#! /dev/null
# Don't call it directly. This shell script fragment is called to
# determine:
#
# 1. libstcxx_incdir: the interface name for libstdc++.
#
# Get the top level src dir.
if [ -z "${topsrcdir}" -a -z "${top_srcdir}" ]
then
echo "Undefined top level src dir: topsrcdir and top_srcdir are empty" >&2
exit 1
fi
if [ -n "${topsrcdir}" ]
then
if_topsrcdir=${topsrcdir}
else
if_topsrcdir=${top_srcdir}
fi
# Set libstdcxx_incdir.
# This is the same as gcc/configure.in and libstdc++-v3/acinclude.m4.
if test -z "$gcc_version"; then
if test -z "${gcc_version_trigger}" \
&& test -f ${if_topsrcdir}/gcc/version.c; then
gcc_version_trigger=${if_topsrcdir}/gcc/version.c
fi
if test -f "${gcc_version_trigger}"; then
gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
else
gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
fi
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
fi
libstdcxx_incdir=c++/${gcc_version}
configure
...@@ -3387,7 +3387,7 @@ case "${with_gxx_include_dir}" in ...@@ -3387,7 +3387,7 @@ case "${with_gxx_include_dir}" in
case "${enable_version_specific_runtime_libs}" in case "${enable_version_specific_runtime_libs}" in
yes) gxx_include_dir='${libsubdir}/include/c++' ;; yes) gxx_include_dir='${libsubdir}/include/c++' ;;
*) *)
. ${srcdir}/config.if libstdcxx_incdir=c++/${gcc_version}
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;; gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
esac ;; esac ;;
*) gxx_include_dir=${with_gxx_include_dir} ;; *) gxx_include_dir=${with_gxx_include_dir} ;;
......
configure.in
...@@ -1974,7 +1974,7 @@ case "${with_gxx_include_dir}" in ...@@ -1974,7 +1974,7 @@ case "${with_gxx_include_dir}" in
case "${enable_version_specific_runtime_libs}" in case "${enable_version_specific_runtime_libs}" in
yes) gxx_include_dir='${libsubdir}/include/c++' ;; yes) gxx_include_dir='${libsubdir}/include/c++' ;;
*) *)
. ${srcdir}/config.if libstdcxx_incdir=c++/${gcc_version}
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;; gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
esac ;; esac ;;
*) gxx_include_dir=${with_gxx_include_dir} ;; *) gxx_include_dir=${with_gxx_include_dir} ;;
......
gcc/ChangeLog
2004-12-03 Richard Sandiford <rsandifo@redhat.com>
* configure.ac: Move TL_AC_GCC_VERSION into initialization section.
Set libstdcxx_incdir directly.
* configure: Regenerate.
2004-12-03 Kazu Hirata <kazu@cs.umass.edu> 2004-12-03 Kazu Hirata <kazu@cs.umass.edu>
* tree-ssa-dom.c (record_equivalences_from_phis): Remove an * tree-ssa-dom.c (record_equivalences_from_phis): Remove an
......
gcc/configure
...@@ -309,7 +309,7 @@ ac_includes_default="\ ...@@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP strict1_warn warn_cflags WERROR nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file gcc_version_trigger gcc_version_full gcc_version PACKAGE VERSION USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_boot_languages all_compilers all_gtfiles all_gtfiles_files_langs all_gtfiles_files_files all_lang_makefrags all_lang_makefiles all_languages all_stagestuff build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines check_languages cc_set_by_configure quoted_cc_set_by_configure cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file stage_prefix_set_by_configure quoted_stage_prefix_set_by_configure thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default set_gcc_lib_path GMPLIBS GMPINC LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_subdir host_subdir target_subdir gcc_version_trigger gcc_version_full gcc_version GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP strict1_warn warn_cflags WERROR nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file PACKAGE VERSION USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_boot_languages all_compilers all_gtfiles all_gtfiles_files_langs all_gtfiles_files_files all_lang_makefrags all_lang_makefiles all_languages all_stagestuff build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines check_languages cc_set_by_configure quoted_cc_set_by_configure cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file stage_prefix_set_by_configure quoted_stage_prefix_set_by_configure thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default set_gcc_lib_path GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
ac_subst_files='language_hooks' ac_subst_files='language_hooks'
# Initialize some variables set by options. # Initialize some variables set by options.
...@@ -1601,6 +1601,23 @@ echo "$as_me: error: ...@@ -1601,6 +1601,23 @@ echo "$as_me: error:
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if test "${with_gcc_version_trigger+set}" = set; then
gcc_version_trigger=$with_gcc_version_trigger
else
gcc_version_trigger=$srcdir/../gcc/version.c
fi
if test -f "${gcc_version_trigger}"; then
gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
else
gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
fi
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
# ----------- # -----------
# Directories # Directories
# ----------- # -----------
...@@ -1647,7 +1664,7 @@ if test x${gcc_gxx_include_dir} = x; then ...@@ -1647,7 +1664,7 @@ if test x${gcc_gxx_include_dir} = x; then
if test x${enable_version_specific_runtime_libs} = xyes; then if test x${enable_version_specific_runtime_libs} = xyes; then
gcc_gxx_include_dir='${libsubdir}/include/c++' gcc_gxx_include_dir='${libsubdir}/include/c++'
else else
topsrcdir=${srcdir}/.. . ${srcdir}/../config.if libstdcxx_incdir=c++/${gcc_version}
gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/"${libstdcxx_incdir} gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/"${libstdcxx_incdir}
fi fi
fi fi
...@@ -7372,7 +7389,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then ...@@ -7372,7 +7389,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
else else
ac_prog_version=`$MAKEINFO --version 2>&1 | ac_prog_version=`$MAKEINFO --version 2>&1 |
sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
echo "configure:7375: version of makeinfo is $ac_prog_version" >&5 echo "configure:7392: version of makeinfo is $ac_prog_version" >&5
case $ac_prog_version in case $ac_prog_version in
'') gcc_cv_prog_makeinfo_modern=no;; '') gcc_cv_prog_makeinfo_modern=no;;
4.[2-9]*) 4.[2-9]*)
...@@ -12185,23 +12202,6 @@ xm_file="ansidecl.h ${xm_file}" ...@@ -12185,23 +12202,6 @@ xm_file="ansidecl.h ${xm_file}"
# UNSORTED # UNSORTED
# -------- # --------
if test "${with_gcc_version_trigger+set}" = set; then
gcc_version_trigger=$with_gcc_version_trigger
else
gcc_version_trigger=$srcdir/../gcc/version.c
fi
if test -f "${gcc_version_trigger}"; then
gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
else
gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
fi
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
# Compile in configure arguments. # Compile in configure arguments.
if test -f configargs.h ; then if test -f configargs.h ; then
# Being re-configured. # Being re-configured.
...@@ -15953,6 +15953,9 @@ s,@target_noncanonical@,$target_noncanonical,;t t ...@@ -15953,6 +15953,9 @@ s,@target_noncanonical@,$target_noncanonical,;t t
s,@build_subdir@,$build_subdir,;t t s,@build_subdir@,$build_subdir,;t t
s,@host_subdir@,$host_subdir,;t t s,@host_subdir@,$host_subdir,;t t
s,@target_subdir@,$target_subdir,;t t s,@target_subdir@,$target_subdir,;t t
s,@gcc_version_trigger@,$gcc_version_trigger,;t t
s,@gcc_version_full@,$gcc_version_full,;t t
s,@gcc_version@,$gcc_version,;t t
s,@GENINSRC@,$GENINSRC,;t t s,@GENINSRC@,$GENINSRC,;t t
s,@CC@,$CC,;t t s,@CC@,$CC,;t t
s,@CFLAGS@,$CFLAGS,;t t s,@CFLAGS@,$CFLAGS,;t t
...@@ -16011,9 +16014,6 @@ s,@manext@,$manext,;t t ...@@ -16011,9 +16014,6 @@ s,@manext@,$manext,;t t
s,@objext@,$objext,;t t s,@objext@,$objext,;t t
s,@gthread_flags@,$gthread_flags,;t t s,@gthread_flags@,$gthread_flags,;t t
s,@extra_modes_file@,$extra_modes_file,;t t s,@extra_modes_file@,$extra_modes_file,;t t
s,@gcc_version_trigger@,$gcc_version_trigger,;t t
s,@gcc_version_full@,$gcc_version_full,;t t
s,@gcc_version@,$gcc_version,;t t
s,@PACKAGE@,$PACKAGE,;t t s,@PACKAGE@,$PACKAGE,;t t
s,@VERSION@,$VERSION,;t t s,@VERSION@,$VERSION,;t t
s,@USE_NLS@,$USE_NLS,;t t s,@USE_NLS@,$USE_NLS,;t t
......
gcc/configure.ac
...@@ -100,6 +100,8 @@ AC_MSG_ERROR([ ...@@ -100,6 +100,8 @@ AC_MSG_ERROR([
*** and run configure again.]) *** and run configure again.])
fi fi
TL_AC_GCC_VERSION([$srcdir/..])
# ----------- # -----------
# Directories # Directories
# ----------- # -----------
...@@ -137,7 +139,7 @@ if test x${gcc_gxx_include_dir} = x; then ...@@ -137,7 +139,7 @@ if test x${gcc_gxx_include_dir} = x; then
if test x${enable_version_specific_runtime_libs} = xyes; then if test x${enable_version_specific_runtime_libs} = xyes; then
gcc_gxx_include_dir='${libsubdir}/include/c++' gcc_gxx_include_dir='${libsubdir}/include/c++'
else else
topsrcdir=${srcdir}/.. . ${srcdir}/../config.if libstdcxx_incdir=c++/${gcc_version}
changequote(<<, >>)dnl changequote(<<, >>)dnl
gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/"${libstdcxx_incdir} gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/"${libstdcxx_incdir}
changequote([, ])dnl changequote([, ])dnl
...@@ -1379,8 +1381,6 @@ xm_file="ansidecl.h ${xm_file}" ...@@ -1379,8 +1381,6 @@ xm_file="ansidecl.h ${xm_file}"
# UNSORTED # UNSORTED
# -------- # --------
TL_AC_GCC_VERSION([$srcdir/..])
changequote(,)dnl changequote(,)dnl
# Compile in configure arguments. # Compile in configure arguments.
if test -f configargs.h ; then if test -f configargs.h ; then
......
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