From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17789 invoked by alias); 30 Jan 2003 11:59:02 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 17771 invoked from network); 30 Jan 2003 11:59:00 -0000 Received: from unknown (HELO lacrosse.corp.redhat.com) (172.16.49.200) by 172.16.49.205 with SMTP; 30 Jan 2003 11:59:00 -0000 Received: from free.redhat.lsd.ic.unicamp.br (aoliva.cipe.redhat.com [10.0.1.10]) by lacrosse.corp.redhat.com (8.11.6/8.9.3) with ESMTP id h0UBwwg31093; Thu, 30 Jan 2003 06:58:59 -0500 Received: from free.redhat.lsd.ic.unicamp.br (localhost.localdomain [127.0.0.1]) by free.redhat.lsd.ic.unicamp.br (8.12.7/8.12.7) with ESMTP id h0UBwvUF017741; Thu, 30 Jan 2003 09:58:58 -0200 Received: (from aoliva@localhost) by free.redhat.lsd.ic.unicamp.br (8.12.7/8.12.7/Submit) id h0UBwvHm017737; Thu, 30 Jan 2003 09:58:57 -0200 To: binutils@sources.redhat.com, gdb-patches@sources.redhat.com, dj@redhat.com Subject: unified gcc and src config.if From: Alexandre Oliva Organization: GCC Team, Red Hat Date: Thu, 30 Jan 2003 11:59:00 -0000 Message-ID: User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-SW-Source: 2003-01/txt/msg00811.txt.bz2 --=-=-= Content-length: 280 Now that GCC's config.if no longer sets gcc_version_trigger unconditionally, it is possible to replace src's very outdated version with that from GCC. DJ, you may want to add this file to the list of files you monitor and keep in sync between the two repositories, if you want. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=config.if-from-gcc.patch Content-length: 2362 Index: ChangeLog from Alexandre Oliva * config.if: Copy from GCC. Index: config.if =================================================================== RCS file: /cvs/src/src/config.if,v retrieving revision 1.3 diff -u -p -r1.3 config.if --- config.if 14 May 2001 16:40:49 -0000 1.3 +++ config.if 30 Jan 2003 11:54:46 -0000 @@ -2,9 +2,8 @@ # Don't call it directly. This shell script fragment is called to # determine: # -# 1. libstcxx_interface: the interface name for libstdc++. -# 2. cxx_interface: the interface name for c++. -# 3. libc_interface: the interface name for libc. +# 1. libstcxx_incdir: the interface name for libstdc++. +# 2. libc_interface: the interface name for libc. # # Get the top level src dir. @@ -21,25 +20,21 @@ else if_topsrcdir=${top_srcdir} fi -if [ "${enable_libstdcxx_v3}" = "yes" ] ; then - libstdcxx_srcdir=${if_topsrcdir}/libstdc++-v3 -else - libstdcxx_srcdir=${if_topsrcdir}/libstdc++ -fi - -if [ -f ${libstdcxx_srcdir}/Makefile.in ]; then -# We check libstdc++ for libstdcxx_interface. -libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/Makefile.in | sed 's/INTERFACE[ ]*=[ ]*\(.*\)/\1/'` -else -libstdcxx_interface= -fi - -if [ -f ${if_topsrcdir}/gcc/cp/Makefile.in ]; then -# We check gcc/cp for cxx_interface. -cxx_interface=`grep "^INTERFACE" ${if_topsrcdir}/gcc/cp/Makefile.in | sed 's/INTERFACE[ ]*=[ ]*\(.*\)/\1/'` -else -cxx_interface= +# 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} # The trickiest part is libc_interface. if [ -z "${libc_interface}" ] @@ -82,8 +77,8 @@ EOF exit 1 fi else - # Cross compiling. Assume glibc 2.2. - libc_interface=-libc6.2- + # Cross compiling. Assume glibc 2.1. + libc_interface=-libc6.1- fi ;; *) --=-=-= Content-length: 289 -- Alexandre Oliva Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/ Red Hat GCC Developer aoliva@{redhat.com, gcc.gnu.org} CS PhD student at IC-Unicamp oliva@{lsd.ic.unicamp.br, gnu.org} Free Software Evangelist Professional serial bug killer --=-=-=--