From owner-svn-src-head@FreeBSD.ORG Wed May 23 23:43:56 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7DA381065670; Wed, 23 May 2012 23:43:56 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 68DAE8FC0A; Wed, 23 May 2012 23:43:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4NNhuVB002237; Wed, 23 May 2012 23:43:56 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4NNhuKp002235; Wed, 23 May 2012 23:43:56 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201205232343.q4NNhuKp002235@svn.freebsd.org> From: "David E. O'Brien" Date: Wed, 23 May 2012 23:43:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235865 - head/contrib/gcc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 May 2012 23:43:56 -0000 Author: obrien Date: Wed May 23 23:43:55 2012 New Revision: 235865 URL: http://svn.freebsd.org/changeset/base/235865 Log: Revert r235797. GCC's mis-assumptions has led to incorrect usage of "%q[diouxX]" within FreeBSD sources. Modified: head/contrib/gcc/c-format.c Modified: head/contrib/gcc/c-format.c ============================================================================== --- head/contrib/gcc/c-format.c Wed May 23 21:48:49 2012 (r235864) +++ head/contrib/gcc/c-format.c Wed May 23 23:43:55 2012 (r235865) @@ -287,11 +287,7 @@ static const format_length_info printf_l { { "h", FMT_LEN_h, STD_C89, "hh", FMT_LEN_hh, STD_C99 }, { "l", FMT_LEN_l, STD_C89, "ll", FMT_LEN_ll, STD_C9L }, -#ifdef __LP64__ - { "q", FMT_LEN_l, STD_EXT, NULL, 0, 0 }, -#else { "q", FMT_LEN_ll, STD_EXT, NULL, 0, 0 }, -#endif { "L", FMT_LEN_L, STD_C89, NULL, 0, 0 }, { "z", FMT_LEN_z, STD_C99, NULL, 0, 0 }, { "Z", FMT_LEN_z, STD_EXT, NULL, 0, 0 },