From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28855 invoked by alias); 30 Nov 2006 18:52:11 -0000 Received: (qmail 28847 invoked by uid 22791); 30 Nov 2006 18:52:09 -0000 X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 30 Nov 2006 18:51:57 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id kAUIpt2h010810 for ; Thu, 30 Nov 2006 13:51:55 -0500 Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com [172.16.14.4]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id kAUIpsNu014815; Thu, 30 Nov 2006 13:51:54 -0500 Received: from [172.16.14.227] (topaz.toronto.redhat.com [172.16.14.227]) by pobox.toronto.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id kAUIpsI1012985; Thu, 30 Nov 2006 13:51:54 -0500 Message-ID: <456F284A.2070507@redhat.com> Date: Thu, 30 Nov 2006 18:52:00 -0000 From: Dave Brolley User-Agent: Thunderbird 1.5.0.5 (X11/20060719) MIME-Version: 1.0 To: "Frank Ch. Eigler" CC: sid@sources.redhat.com Subject: Re: Fwd: Regarding the sid simulator [patch][commit] References: <20061127130318.GA20323@redhat.com> <20061127235725.GC20323@redhat.com> <456DF9A8.6070002@redhat.com> <20061129212542.GI8910@redhat.com> <456DFBD1.7000406@redhat.com> <20061129213327.GJ8910@redhat.com> In-Reply-To: <20061129213327.GJ8910@redhat.com> Content-Type: multipart/mixed; boundary="------------090903050304040000020304" X-IsSubscribed: yes Mailing-List: contact sid-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: sid-owner@sourceware.org X-SW-Source: 2006-q4/txt/msg00025.txt.bz2 This is a multi-part message in MIME format. --------------090903050304040000020304 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 408 Frank Ch. Eigler wrote: > The costs (compile time / object size) are of a different magnitude. > We don't rip out unconfigured platforms out of configrun-sid.pl either > - they just won't work. Plus, if you add the #if/#endif thing I > mentioned, the costs of including a dummy shCfg.cxx are approximately > zero. > > As requested, I've removed the previous patch and committed this one instead. Dave --------------090903050304040000020304 Content-Type: text/plain; name="sh-config-1.ChangeLog" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="sh-config-1.ChangeLog" Content-length: 407 2006-11-30 Dave Brolley * Makefile.am (TARGETCFGS): Revert previous changes. Add shCfg.cxx unconditionally. * Makefile.in: Regenerated. * aclocal.m4: Regenerated. * configure: Regenerated. * shCfg.cxx: Protect the entire file with preprocessor conditional compilation for sh or sh64. 2006-11-30 Dave Brolley * sidtargets.m4: Revert previous change. --------------090903050304040000020304 Content-Type: text/plain; name="sh-config-1.patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="sh-config-1.patch.txt" Content-length: 1848 Index: sid/main/dynamic/Makefile.am =================================================================== RCS file: /cvs/src/src/sid/main/dynamic/Makefile.am,v retrieving revision 1.14 diff -c -p -r1.14 Makefile.am *** sid/main/dynamic/Makefile.am 29 Nov 2006 21:18:30 -0000 1.14 --- sid/main/dynamic/Makefile.am 30 Nov 2006 18:36:14 -0000 *************** INCLUDES = -I. -I../../include -I$(srcdi *** 7,13 **** LIBIBERTY = -L../../../libiberty/pic -L../../../libiberty -liberty bin_PROGRAMS = sid ! TARGETCFGS = "" TARGETDEFINES = if SIDTARGET_SH --- 7,13 ---- LIBIBERTY = -L../../../libiberty/pic -L../../../libiberty -liberty bin_PROGRAMS = sid ! TARGETCFGS = shCfg.cxx TARGETDEFINES = if SIDTARGET_SH *************** endif *** 16,24 **** if SIDTARGET_SH64 TARGETDEFINES += -DSIDTARGET_SH64 endif - if SIDTARGET_SH_OR_SH64 - TARGETCFGS += shCfg.cxx - endif # If sid is being compiled without shared library support, arrange to # statically link in a bunch of component libraries using libtool's --- 16,21 ---- Index: sid/main/dynamic/shCfg.cxx =================================================================== RCS file: /cvs/src/src/sid/main/dynamic/shCfg.cxx,v retrieving revision 1.1 diff -c -p -r1.1 shCfg.cxx *** sid/main/dynamic/shCfg.cxx 18 Oct 2006 18:46:17 -0000 1.1 --- sid/main/dynamic/shCfg.cxx 30 Nov 2006 18:36:16 -0000 *************** *** 4,9 **** --- 4,10 ---- // This file is part of SID and is licensed under the GPL. // See the file COPYING.SID for conditions for redistribution. + #if defined (SIDTARGET_SH) || defined (SIDTARGET_SH64) #include "shCfg.h" *************** mk_sh5_64media (const string name, Sessi *** 222,224 **** --- 223,227 ---- return board; } #endif // defined (SIDTARGET_SH64) + + #endif // defined (SIDTARGET_SH) || defined (SIDTARGET_SH64) --------------090903050304040000020304--