This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
Remove config.if (patch 2/4 for PR 7305)
- From: Richard Sandiford <rsandifo at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: java-patches at gcc dot gnu dot org, libstdc++ at gcc dot gnu dot org, binutils at sources dot redhat dot com, gdb-patches at sources dot redhat dot com
- Date: Thu, 25 Nov 2004 20:49:49 +0000
- Subject: Remove config.if (patch 2/4 for PR 7305)
- References: <87is7tejx4.fsf@redhat.com>
Following up from: http://gcc.gnu.org/ml/gcc-patches/2004-11/msg02185.html
this patch replaces the two uses of config.if with a simple assignment.
It also removes all mention of config.if from src/.
Bootstrapped & regression tested on i686-pc-linux-gnu in combination
with patch 1. I also checked the same things as before. OK to install?
Richard
* config.if: Delete.
* configure.in: Set libstdcxx_incdir directly.
* configure: Regenerate.
* MAINTAINERS: Remove mention of config.if.
* src-release (DEVO_SUPPORT): Remove config.if.
gcc/
* configure.ac: Move TL_AC_GCC_VERSION into initialization section.
Set libstdcxx_incdir directly.
* configure: Regenerate.
binutils/
* MAINTAINERS: Remove mention of config.if.
gdb/
* README: Remove config.if from directory listing.
Index: config.if
===================================================================
RCS file: /cvs/gcc/gcc/config.if,v
retrieving revision 1.10
diff -u -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.10 config.if
--- config.if 16 Jul 2003 06:34:53 -0000 1.10
+++ config.if 25 Nov 2004 16:09:01 -0000
@@ -1,37 +0,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.in.1 Thu Nov 25 15:30:25 2004
+++ configure.in Thu Nov 25 15:36:35 2004
@@ -1972,7 +1972,7 @@ case "${with_gxx_include_dir}" in
case "${enable_version_specific_runtime_libs}" in
yes) gxx_include_dir='${libsubdir}/include/c++' ;;
*)
- . ${srcdir}/config.if
+ libstdcxx_incdir=c++/${gcc_version}
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
esac ;;
*) gxx_include_dir=${with_gxx_include_dir} ;;
--- gcc/configure.ac.1 Thu Nov 25 15:30:25 2004
+++ gcc/configure.ac Thu Nov 25 15:38:39 2004
@@ -100,6 +100,8 @@ AC_MSG_ERROR([
*** and run configure again.])
fi
+TL_AC_GCC_VERSION([$srcdir/..])
+
# -----------
# Directories
# -----------
@@ -137,7 +139,7 @@ if test x${gcc_gxx_include_dir} = x; the
if test x${enable_version_specific_runtime_libs} = xyes; then
gcc_gxx_include_dir='${libsubdir}/include/c++'
else
- topsrcdir=${srcdir}/.. . ${srcdir}/../config.if
+ libstdcxx_incdir=c++/${gcc_version}
changequote(<<, >>)dnl
gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/"${libstdcxx_incdir}
changequote([, ])dnl
@@ -1378,8 +1380,6 @@ xm_file="ansidecl.h ${xm_file}"
# --------
# UNSORTED
# --------
-
-TL_AC_GCC_VERSION([$srcdir/..])
changequote(,)dnl
# Compile in configure arguments.
Index: MAINTAINERS
===================================================================
RCS file: /cvs/src/src/MAINTAINERS,v
retrieving revision 1.26
diff -u -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.26 MAINTAINERS
--- MAINTAINERS 9 Jun 2004 22:48:28 -0000 1.26
+++ MAINTAINERS 25 Nov 2004 16:09:04 -0000
@@ -96,7 +96,7 @@ winsup/
See also winsup/MAINTAINERS.
config-ml.in; setup.com; missing; makefile.vms; utils/; config/;
-config.if; makefile.vms; missing; ylwrap; mkdep; etc/; install-sh; intl/
+makefile.vms; missing; ylwrap; mkdep; etc/; install-sh; intl/
Ask DJ Delorie <dj@redhat.com> after reading the libiberty entry.
modules file
Index: src-release
===================================================================
RCS file: /cvs/src/src/src-release,v
retrieving revision 1.15
diff -u -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.15 src-release
--- src-release 19 Oct 2004 18:52:04 -0000 1.15
+++ src-release 25 Nov 2004 16:09:05 -0000
@@ -44,7 +44,7 @@ PWD = $${PWDCMD-pwd}
# ChangeLog omitted because it may refer to files which are not in this
# distribution (perhaps it would be better to include it anyway).
DEVO_SUPPORT= README Makefile.in configure configure.in \
- config.guess config.if config.sub config move-if-change \
+ config.guess config.sub config move-if-change \
COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
mkinstalldirs ltconfig ltmain.sh missing ylwrap \
libtool.m4 gettext.m4 ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh \
Index: binutils/MAINTAINERS
===================================================================
RCS file: /cvs/src/src/binutils/MAINTAINERS,v
retrieving revision 1.76
diff -u -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.76 MAINTAINERS
--- binutils/MAINTAINERS 2 Sep 2004 08:25:06 -0000 1.76
+++ binutils/MAINTAINERS 25 Nov 2004 16:09:05 -0000
@@ -22,8 +22,8 @@ top level config.guess and config.sub sc
config-patches@gnu.org
and not to the binutils lists. Patches to the other top level
-configure files (configure, configure.in, config-if, config-ml.in)
-should be sent to the binutils lists, and copied to the gcc and gdb
+configure files (configure, configure.in, config-ml.in) should
+be sent to the binutils lists, and copied to the gcc and gdb
lists as well (gcc-patches@gcc.gnu.org and
gdb-patches@sources.redhat.com).
Index: gdb/README
===================================================================
RCS file: /cvs/src/src/gdb/README,v
retrieving revision 1.33
diff -u -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.33 README
--- gdb/README 8 Nov 2004 15:55:49 -0000 1.33
+++ gdb/README 25 Nov 2004 16:09:05 -0000
@@ -32,14 +32,14 @@ order.
When you unpack the gdb-6.3.tar.gz file, you'll find a directory
called `gdb-6.3', which contains:
- COPYING config-ml.in gdb ltcf-gcj.sh readline
- COPYING.LIB config.guess gettext.m4 ltconfig sim
- Makefile.def config.if include ltmain.sh src-release
- Makefile.in config.sub install-sh md5.sum symlink-tree
- Makefile.tpl configure libiberty missing texinfo
- README configure.in libtool.m4 mkinstalldirs ylwrap
- bfd djunpack.bat ltcf-c.sh move-if-change
- config etc ltcf-cxx.sh opcodes
+ COPYING config-ml.in gettext.m4 ltconfig sim
+ COPYING.LIB config.guess include ltmain.sh src-release
+ Makefile.def config.sub install-sh md5.sum symlink-tree
+ Makefile.in configure libiberty missing texinfo
+ Makefile.tpl configure.in libtool.m4 mkinstalldirs ylwrap
+ README djunpack.bat ltcf-c.sh move-if-change
+ bfd etc ltcf-cxx.sh opcodes
+ config gdb ltcf-gcj.sh readline
You can build GDB right in the source directory: