From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6937 invoked by alias); 31 Jan 2005 23:40:43 -0000 Mailing-List: contact binutils-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sources.redhat.com Received: (qmail 6828 invoked from network); 31 Jan 2005 23:40:26 -0000 Received: from unknown (HELO ausmtp02.au.ibm.com) (202.81.18.187) by sourceware.org with SMTP; 31 Jan 2005 23:40:26 -0000 Received: from sd0112e0.au.ibm.com (d23rh903.au.ibm.com [202.81.18.201]) by ausmtp02.au.ibm.com (8.12.10/8.12.10) with ESMTP id j0VNbfot113354 for ; Tue, 1 Feb 2005 10:37:42 +1100 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.250.244]) by sd0112e0.au.ibm.com (8.12.10/NCO/VER6.6) with ESMTP id j0VNgZqj118368 for ; Tue, 1 Feb 2005 10:42:35 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.12.11/8.12.11) with ESMTP id j0VNeOjR021203 for ; Tue, 1 Feb 2005 10:40:24 +1100 Received: from ozlabs.au.ibm.com (haven.au.ibm.com [9.190.164.82]) by d23av03.au.ibm.com (8.12.11/8.12.11) with ESMTP id j0VNeNrH021185 for ; Tue, 1 Feb 2005 10:40:24 +1100 Received: from namadgi.ozlabs.ibm.com (localhost [127.0.0.1]) by ozlabs.au.ibm.com (Postfix) with SMTP id 4E5A117DDC for ; Tue, 1 Feb 2005 10:40:23 +1100 (EST) Received: by namadgi.ozlabs.ibm.com (sSMTP sendmail emulation); Tue, 1 Feb 2005 10:42:05 +1100 From: "Ben Elliston" Date: Mon, 31 Jan 2005 23:40:00 -0000 To: binutils@sources.redhat.com Subject: Last of the gas cleanups Message-ID: <20050131234205.GA4941@namadgi> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ReaqsoxgOBHFXBhH" Content-Disposition: inline User-Agent: Mutt/1.5.6+20040907i X-SW-Source: 2005-01/txt/msg00582.txt.bz2 --ReaqsoxgOBHFXBhH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-length: 5423 This little patch keeps code wrapped in #if 1 and removes any #else cases. Okay for mainline? Ben 2005-02-01 Ben Elliston * config/obj-coff.c, config/obj-ieee.c, config/tc-alpha.c, config/tc-i860.c, config/tc-ia64.c: Keep #if 1 code. Index: config/obj-coff.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/bje/src-cvs/src/gas/config/obj-coff.c,v retrieving revision 1.76 diff -u -p -u -r1.76 obj-coff.c --- config/obj-coff.c 31 Jan 2005 23:18:24 -0000 1.76 +++ config/obj-coff.c 31 Jan 2005 23:39:58 -0000 @@ -4189,8 +4189,6 @@ fixup_mdeps (frags, h, this_segment) } } =20 -#if 1 - #ifndef TC_FORCE_RELOCATION #define TC_FORCE_RELOCATION(fix) 0 #endif @@ -4377,7 +4375,6 @@ fixup_segment (segP, this_segment_type) sub_symbolP =3D 0; fixP->fx_subsy =3D 0; } -#endif else { as_bad_where (fixP->fx_file, fixP->fx_line, Index: config/obj-ieee.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/bje/src-cvs/src/gas/config/obj-ieee.c,v retrieving revision 1.10 diff -u -p -u -r1.10 obj-ieee.c --- config/obj-ieee.c 31 Jan 2005 23:18:24 -0000 1.10 +++ config/obj-ieee.c 31 Jan 2005 23:39:58 -0000 @@ -482,8 +482,6 @@ obj_symbol_new_hook (symbolP) symbolP->sy_symbol.sy.the_bfd =3D abfd; } =20 -#if 1 - #ifndef SUB_SEGMENT_ALIGN #ifdef HANDLE_ALIGN /* The last subsegment gets an alignment corresponding to the alignment @@ -569,8 +567,6 @@ write_object_file () bfd_as_write_hook (); bfd_close (abfd); } - -#endif =20 H_SET_TEXT_SIZE (a, b) { Index: config/tc-alpha.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/bje/src-cvs/src/gas/config/tc-alpha.c,v retrieving revision 1.63 diff -u -p -u -r1.63 tc-alpha.c --- config/tc-alpha.c 31 Jan 2005 23:18:25 -0000 1.63 +++ config/tc-alpha.c 31 Jan 2005 23:39:58 -0000 @@ -159,30 +159,17 @@ struct alpha_macro /* XXX: The non-shift version appears to trigger a compiler bug when cross-assembling from x86 w/ gcc 2.7.2. */ =20 -#if 1 #define range_signed_16(x) \ (((offsetT) (x) >> 15) =3D=3D 0 || ((offsetT) (x) >> 15) =3D=3D -1) #define range_signed_32(x) \ (((offsetT) (x) >> 31) =3D=3D 0 || ((offsetT) (x) >> 31) =3D=3D -1) -#else -#define range_signed_16(x) ((offsetT) (x) >=3D -(offsetT) 0x8000 && \ - (offsetT) (x) <=3D (offsetT) 0x7FFF) -#define range_signed_32(x) ((offsetT) (x) >=3D -(offsetT) 0x80000000 && \ - (offsetT) (x) <=3D (offsetT) 0x7FFFFFFF) -#endif =20 /* Macros for sign extending from 16- and 32-bits. */ /* XXX: The cast macros will work on all the systems that I care about, but really a predicate should be found to use the non-cast forms. */ =20 -#if 1 #define sign_extend_16(x) ((short) (x)) #define sign_extend_32(x) ((int) (x)) -#else -#define sign_extend_16(x) ((offsetT) (((x) & 0xFFFF) ^ 0x8000) - 0x8000) -#define sign_extend_32(x) ((offsetT) (((x) & 0xFFFFFFFF) \ - ^ 0x80000000) - 0x80000000) -#endif =20 /* Macros to build tokens. */ =20 Index: config/tc-i860.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/bje/src-cvs/src/gas/config/tc-i860.c,v retrieving revision 1.27 diff -u -p -u -r1.27 tc-i860.c --- config/tc-i860.c 31 Oct 2003 21:33:59 -0000 1.27 +++ config/tc-i860.c 31 Jan 2005 23:39:58 -0000 @@ -454,21 +454,14 @@ static void i860_process_insn (char *str) { char *s; - const char *args; + const char *args =3D 0; char c; - struct i860_opcode *insn; - char *args_start; - unsigned long opcode; + struct i860_opcode *insn =3D 0; + char *args_start =3D 0; + unsigned long opcode =3D 0; unsigned int mask; int match =3D 0; int comma =3D 0; - -#if 1 /* For compiler warnings. */ - args =3D 0; - insn =3D 0; - args_start =3D 0; - opcode =3D 0; -#endif =20 for (s =3D str; ISLOWER (*s) || *s =3D=3D '.' || *s =3D=3D '3' || *s =3D=3D '2' || *s =3D=3D '1'; ++s) Index: config/tc-ia64.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/bje/src-cvs/src/gas/config/tc-ia64.c,v retrieving revision 1.128 diff -u -p -u -r1.128 tc-ia64.c --- config/tc-ia64.c 31 Jan 2005 23:18:29 -0000 1.128 +++ config/tc-ia64.c 31 Jan 2005 23:39:58 -0000 @@ -11198,16 +11198,11 @@ ia64_handle_align (fragp) if (!bytes && fragp->tc_frag_data) { if (fragp->fr_fix < 16) -#if 1 /* FIXME: It won't work with .align 16 alloc r32=3Dar.pfs,1,2,4,0 */ ; -#else - as_bad_where (fragp->fr_file, fragp->fr_line, - _("Can't add stop bit to mark end of instruction group")); -#endif else /* Bundles are always in little-endian byte order. Make sure the previous bundle has the stop bit. */ --ReaqsoxgOBHFXBhH Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline Content-length: 189 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (GNU/Linux) iD8DBQFB/sJNMGpskFPkywkRAtT+AJ4mE2mSheXqjVwALTdh6FyUsIv11wCgmGkV rCY9UVMU1sm7nikuvNq1+dM= =s4f5 -----END PGP SIGNATURE----- --ReaqsoxgOBHFXBhH--