svn commit: r235865 - head/contrib/gcc

[David E. O'Brien]

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 },