From owner-p4-projects@FreeBSD.ORG Fri Aug 20 00:13:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BFEF16A4D0; Fri, 20 Aug 2004 00:13:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E216E16A4CE for ; Fri, 20 Aug 2004 00:13:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C796A43D2F for ; Fri, 20 Aug 2004 00:13:25 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7K0DPH8093620 for ; Fri, 20 Aug 2004 00:13:25 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7K0DPMs093617 for perforce@freebsd.org; Fri, 20 Aug 2004 00:13:25 GMT (envelope-from marcel@freebsd.org) Date: Fri, 20 Aug 2004 00:13:25 GMT Message-Id: <200408200013.i7K0DPMs093617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 60098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Aug 2004 00:13:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=60098 Change 60098 by marcel@marcel_nfs on 2004/08/20 00:12:43 Diff reduction. The IFC already partially removed the GCC mods on this branch. Affected files ... .. //depot/projects/ia64/contrib/amd/conf/trap/trap_default.h#3 edit .. //depot/projects/ia64/contrib/gcc/c-common.c#11 edit .. //depot/projects/ia64/contrib/gcc/c-common.h#9 edit .. //depot/projects/ia64/contrib/gcc/c-typeck.c#12 edit Differences ... ==== //depot/projects/ia64/contrib/amd/conf/trap/trap_default.h#3 (text+ko) ==== @@ -1,2 +1,3 @@ +/* $FreeBSD: src/contrib/amd/conf/trap/trap_default.h,v 1.3 2004/07/06 14:14:26 mbr Exp $ */ /* $srcdir/conf/trap/trap_default.h */ #define MOUNT_TRAP(type, mnt, flags, mnt_data) mount(type, mnt->mnt_dir, flags, mnt_data) ==== //depot/projects/ia64/contrib/gcc/c-common.c#11 (text+ko) ==== @@ -372,11 +372,6 @@ /* C/ObjC language option variables. */ -/* Nonzero means message about casts with integer/pointer size mismatches; - 1 means warning; 2 means error. */ - -int mesg_bad_pointer_cast = 1; - /* Nonzero means message about use of implicit function declarations; 1 means warning; 2 means error. */ ==== //depot/projects/ia64/contrib/gcc/c-common.h#9 (text+ko) ==== @@ -535,10 +535,6 @@ /* C/ObjC language option variables. */ -/* Warn about bad pointer casts. 1 = warning, 2 = error. */ - -extern int mesg_bad_pointer_cast; - /* Nonzero means message about use of implicit function declarations; 1 means warning; 2 means error. */ ==== //depot/projects/ia64/contrib/gcc/c-typeck.c#12 (text+ko) ==== @@ -3128,16 +3128,7 @@ && TREE_CODE (otype) == POINTER_TYPE && TYPE_PRECISION (type) != TYPE_PRECISION (otype) && !TREE_CONSTANT (value)) -#if 1 /* mostly harmless */ warning ("cast from pointer to integer of different size"); -#else - { - if (mesg_bad_pointer_cast == 2) - error ("cast from pointer to integer of different size"); - else if (mesg_bad_pointer_cast == 1) - warning ("cast from pointer to integer of different size"); - } -#endif if (warn_bad_function_cast && TREE_CODE (value) == CALL_EXPR @@ -3149,12 +3140,7 @@ && TYPE_PRECISION (type) != TYPE_PRECISION (otype) /* Don't warn about converting any constant. */ && !TREE_CONSTANT (value)) - { - if (mesg_bad_pointer_cast == 2) - error ("cast to pointer from integer of different size"); - else if (mesg_bad_pointer_cast == 1) - warning ("cast to pointer from integer of different size"); - } + warning ("cast to pointer from integer of different size"); if (TREE_CODE (type) == POINTER_TYPE && TREE_CODE (otype) == POINTER_TYPE @@ -3676,11 +3662,8 @@ && TREE_CODE (TREE_TYPE (rhs)) == INTEGER_TYPE && TREE_CODE (TREE_OPERAND (rhs, 0)) == INTEGER_CST && integer_zerop (TREE_OPERAND (rhs, 0)))) - if (mesg_bad_pointer_cast == 2) - error ("%s makes pointer from integer without a cast", errtype); - else - warn_for_assignment ("%s makes pointer from integer without a cast", - errtype, funname, parmnum); + warn_for_assignment ("%s makes pointer from integer without a cast", + errtype, funname, parmnum); return convert (type, rhs); }