From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16323 invoked by alias); 7 Mar 2005 18:43:12 -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 16183 invoked from network); 7 Mar 2005 18:43:02 -0000 Received: from unknown (HELO e34.co.us.ibm.com) (32.97.110.132) by sourceware.org with SMTP; 7 Mar 2005 18:43:02 -0000 Received: from westrelay01.boulder.ibm.com (westrelay01.boulder.ibm.com [9.17.195.10]) by e34.co.us.ibm.com (8.12.10/8.12.9) with ESMTP id j27Ih1KN357728 for ; Mon, 7 Mar 2005 13:43:01 -0500 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by westrelay01.boulder.ibm.com (8.12.10/NCO/VER6.6) with ESMTP id j27Ih1WY138708 for ; Mon, 7 Mar 2005 11:43:01 -0700 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.12.11/8.12.11) with ESMTP id j27Ih1FG004823 for ; Mon, 7 Mar 2005 11:43:01 -0700 Received: from dyn319633.beaverton.ibm.com (DYN319633.beaverton.ibm.com [9.47.22.123]) by d03av01.boulder.ibm.com (8.12.11/8.12.11) with ESMTP id j27Ih0qd004805; Mon, 7 Mar 2005 11:43:00 -0700 From: Paul Gilliam Reply-To: pgilliam@us.ibm.com Subject: [PATCH] obvious (I think) correction to compiler.c and compiler.cc Date: Mon, 07 Mar 2005 18:43:00 -0000 User-Agent: KMail/1.6.2 Cc: Daniel Jacobowitz MIME-Version: 1.0 Content-Disposition: inline To: gdb-patches@sources.redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-Id: <200503071039.16604.pgilliam@us.ibm.com> X-SW-Source: 2005-03/txt/msg00077.txt.bz2 This fixes a problem with this committed patch: http://sources.redhat.com/ml/gdb-patches/2005-03/msg00050.htm 'compiler.c' and 'compiler.cc' where doing the right thing, but get_compiler_info was not evaluating the key line because it did not begin with 'set'. Rather then add another case to get_compiler_info, I changed the the line in compiler.c and compiler.cc to be 'set need_a_set [regsub....]' At first I thought this was obvious, but because it could be fixed in compiler.c and compiler.cc or fixed in get_compiler_info, I thought maybe it wasn't so obvious. I fixed it here in compiler.c and compiler.cc because those are compiler dependent and get_compiler_info is more generic. OK to commit? -=# Paul #=- RCS file: /cvs/src/src/gdb/testsuite/lib/compiler.c,v retrieving revision 1.9 diff -c -3 -p -r1.9 compiler.c *** compiler.c 4 Mar 2005 17:35:46 -0000 1.9 --- compiler.c 7 Mar 2005 18:20:38 -0000 *************** set compiler_info [join {hpacc __HP_aCC} *** 68,72 **** #if defined (__xlc__) /* IBM'x xlc compiler. NOTE: __xlc__ expands to a double quoted string of four numbers seperated by '.'s: currently "7.0.0.0" */ ! regsub -all {\.} [join {xlc __xlc__} -] - compiler_info #endif --- 68,72 ---- #if defined (__xlc__) /* IBM'x xlc compiler. NOTE: __xlc__ expands to a double quoted string of four numbers seperated by '.'s: currently "7.0.0.0" */ ! set need_a_set [regsub -all {\.} [join {xlc __xlc__} -] - compiler_info] #endif Index: compiler.cc =================================================================== RCS file: /cvs/src/src/gdb/testsuite/lib/compiler.cc,v retrieving revision 1.11 diff -c -3 -p -r1.11 compiler.cc *** compiler.cc 4 Mar 2005 17:35:46 -0000 1.11 --- compiler.cc 7 Mar 2005 18:20:39 -0000 *************** set compiler_info [join {hpacc __HP_aCC} *** 56,60 **** #if defined (__xlc__) /* IBM'x xlc compiler. NOTE: __xlc__ expands to a double quoted string of four numbers seperated by '.'s: currently "7.0.0.0" */ ! regsub -all {\.} [join {xlc __xlc__} -] - compiler_info #endif --- 56,60 ---- #if defined (__xlc__) /* IBM'x xlc compiler. NOTE: __xlc__ expands to a double quoted string of four numbers seperated by '.'s: currently "7.0.0.0" */ ! set need_a_set [regsub -all {\.} [join {xlc __xlc__} -] - compiler_info] #endif