revert: hwint.h (HOST_WIDE_INT_PRINT_DOUBLE_HEX): Change format string placeholder...

	Revert:
	* hwint.h (HOST_WIDE_INT_PRINT_DOUBLE_HEX): Change format string
	placeholder from 0x%x to %#x.
	(HOST_WIDEST_INT_PRINT_DOUBLE_HEX): Ditto.
	* config/i386/i386.c (output_pic_addr_const): Ditto.

From-SVN: r158972

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ebfcbec2abc1562eea71e03284369a8f56b848ee..306fa8b75f4857b52ae27144a00447edddb2e31c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-02  Uros Bizjak  <ubizjak@gmail.com>
+
+       Revert:
+       * hwint.h (HOST_WIDE_INT_PRINT_DOUBLE_HEX): Change format string
+       placeholder from 0x%x to %#x.
+       (HOST_WIDEST_INT_PRINT_DOUBLE_HEX): Ditto.
+       * config/i386/i386.c (output_pic_addr_const): Ditto.
+
 2010-05-02  Uros Bizjak  <ubizjak@gmail.com>
 
        * vmsdbgout.c (ASM_OUTPUT_DEBUG_DATA1): Change format string

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 61a619bed2a7f1d91a320f4a1b889f30a49c150b..b722c4d832b91b222f887401b244fde8f41ae14e 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -10843,7 +10843,7 @@ output_pic_addr_const (FILE *file, rtx x, int code)
        {
          /* We can use %d if the number is <32 bits and positive.  */
          if (CONST_DOUBLE_HIGH (x) || CONST_DOUBLE_LOW (x) < 0)
-           fprintf (file, "%#lx%08lx",
+           fprintf (file, "0x%lx%08lx",
                     (unsigned long) CONST_DOUBLE_HIGH (x),
                     (unsigned long) CONST_DOUBLE_LOW (x));
          else

diff --git a/gcc/hwint.h b/gcc/hwint.h
index 327a12f03623125371370bf79c70e243878400ec..c7fcd345bec84cc132cf33b9a00f67c81b1a8d2b 100644 (file)
--- a/gcc/hwint.h
+++ b/gcc/hwint.h
@@ -82,17 +82,17 @@ extern char sizeof_long_long_must_be_8[sizeof(long long) == 8 ? 1 : -1];
      must be tweaked accordingly.  */
 # if HOST_BITS_PER_WIDE_INT == 64
 #  define HOST_WIDE_INT_PRINT_DOUBLE_HEX \
-     "%#" HOST_LONG_FORMAT "x%016" HOST_LONG_FORMAT "x"
+     "0x%" HOST_LONG_FORMAT "x%016" HOST_LONG_FORMAT "x"
 # else
 #  define HOST_WIDE_INT_PRINT_DOUBLE_HEX \
-     "%#" HOST_LONG_FORMAT "x%08" HOST_LONG_FORMAT "x"
+     "0x%" HOST_LONG_FORMAT "x%08" HOST_LONG_FORMAT "x"
 # endif
 #else
 # define HOST_WIDE_INT_PRINT HOST_LONG_LONG_FORMAT
 # define HOST_WIDE_INT_PRINT_C "LL"
   /* We can assume that 'long long' is at least 64 bits.  */
 # define HOST_WIDE_INT_PRINT_DOUBLE_HEX \
-    "%#" HOST_LONG_LONG_FORMAT "x%016" HOST_LONG_LONG_FORMAT "x"
+    "0x%" HOST_LONG_LONG_FORMAT "x%016" HOST_LONG_LONG_FORMAT "x"
 #endif /* HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_LONG */
 
 #define HOST_WIDE_INT_PRINT_DEC "%" HOST_WIDE_INT_PRINT "d"
@@ -131,7 +131,7 @@ extern char sizeof_long_long_must_be_8[sizeof(long long) == 8 ? 1 : -1];
 # define HOST_WIDEST_INT_PRINT_UNSIGNED              "%" HOST_LONG_LONG_FORMAT "u"
 # define HOST_WIDEST_INT_PRINT_HEX           "%#" HOST_LONG_LONG_FORMAT "x"
 # define HOST_WIDEST_INT_PRINT_DOUBLE_HEX     \
-    "%#" HOST_LONG_LONG_FORMAT "x%016" HOST_LONG_LONG_FORMAT "x"
+    "0x%" HOST_LONG_LONG_FORMAT "x%016" HOST_LONG_LONG_FORMAT "x"
 #endif
 
 /* Define HOST_WIDEST_FAST_INT to the widest integer type supported