From 3d416346cfca32e50fc17feea9ba012b3a2730f5 Mon Sep 17 00:00:00 2001
From: Uros Bizjak <uros@gcc.gnu.org>
Date: Sun, 25 Apr 2010 10:11:46 +0200
Subject: [PATCH] gmon-sol2.c (_mcleanup): Change format string placeholder
 from 0x%x to %#x.

	* config/i386/gmon-sol2.c (_mcleanup): Change format string
	placeholder from 0x%x to %#x.
	* config/i386/i386elf.h (ASM_OUTPUT_ASCII): Ditto.
	* config/i386/i386-interix.h (ASM_OUTPUT_ASCII): Ditto.
	* config/i386/att.h (ASM_OUTPUT_ASCII): Ditto.
	* config/i386/sysv4.h (ASM_OUTPUT_ASCII): Ditto.
	* config/i386/i386.c (ix86_target_string): Ditto.
	(output_pic_addr_const): Ditto.
	(print_operand): Ditto.

From-SVN: r158699
---
 gcc/ChangeLog                  | 23 ++++++++++++++++-------
 gcc/config/i386/att.h          |  2 +-
 gcc/config/i386/gmon-sol2.c    |  2 +-
 gcc/config/i386/i386-interix.h |  2 +-
 gcc/config/i386/i386.c         |  8 ++++----
 gcc/config/i386/i386elf.h      |  2 +-
 gcc/config/i386/sysv4.h        |  2 +-
 7 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f1389d84f944..8ee8c2089763 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2010-04-25  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/gmon-sol2.c (_mcleanup): Change format string
+	placeholder from 0x%x to %#x.
+	* config/i386/i386elf.h (ASM_OUTPUT_ASCII): Ditto.
+	* config/i386/i386-interix.h (ASM_OUTPUT_ASCII): Ditto.
+	* config/i386/att.h (ASM_OUTPUT_ASCII): Ditto.
+	* config/i386/sysv4.h (ASM_OUTPUT_ASCII): Ditto.
+	* config/i386/i386.c (ix86_target_string): Ditto.
+	(output_pic_addr_const): Ditto.
+	(print_operand): Ditto.
+
 2010-04-25  Paolo Bonzini  <bonzini@gnu.org>
 
 	* combine.c (find_split_point): Add third argument.  Use it
@@ -16,12 +28,10 @@
 
 2010-04-23  Manuel López-Ibáñez  <manu@gcc.gnu.org>
 
-	* toplev.c (general_init): Set default for
-	fdiagnostics-show-option.
+	* toplev.c (general_init): Set default for fdiagnostics-show-option.
 	* opts.c (common_handle_option): Allow disabling it.
-	* common.opt (fdiagnostics-show-option): Add Var. Enabled by
-	default.
-	
+	* common.opt (fdiagnostics-show-option): Add Var. Enabled by default.
+
 2010-04-23  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* expr.c (expand_expr_real_1) <VIEW_CONVERT_EXPR>: Only use conversion
@@ -208,8 +218,7 @@
 	* tree-ssa-math-opts.c (execute_optimize_widening_mul,
 	gate_optimize_widening_mul): New static functions.
 	(pass_optimize_widening_mul): New.
-	* expr.c (expand_expr_real_2) <case WIDEN_MULT_EXPR>: New
-	case.
+	* expr.c (expand_expr_real_2) <case WIDEN_MULT_EXPR>: New case.
 	<case MULT_EXPR>: Remove support for widening multiplies.
 	* tree.def (WIDEN_MULT_EXPR): Tweak comment.
 	* cfgexpand.c (expand_debug_expr) <case WIDEN_MULT_EXPR>: Use
diff --git a/gcc/config/i386/att.h b/gcc/config/i386/att.h
index 30616904fe2c..5299e787438a 100644
--- a/gcc/config/i386/att.h
+++ b/gcc/config/i386/att.h
@@ -46,7 +46,7 @@ do								\
     { if (i%10 == 0) { if (i!=0) putc ('\n', (FILE));		\
 		       fputs (ASM_BYTE, (FILE)); }		\
       else putc (',', (FILE));					\
-	fprintf ((FILE), "0x%x", ((PTR)[i++] & 0377)) ;}	\
+      fprintf ((FILE), "%#x", ((PTR)[i++] & 0377)) ;}		\
       putc ('\n', (FILE));					\
 } while (0)
 
diff --git a/gcc/config/i386/gmon-sol2.c b/gcc/config/i386/gmon-sol2.c
index fb813a12d25a..dd87d5f72773 100644
--- a/gcc/config/i386/gmon-sol2.c
+++ b/gcc/config/i386/gmon-sol2.c
@@ -223,7 +223,7 @@ _mcleanup (void)
 	return;
     }
 #   ifdef DEBUG
-	fprintf( stderr , "[mcleanup] sbuf 0x%x ssiz %d\n" , sbuf , ssiz );
+	fprintf( stderr , "[mcleanup] sbuf %#x ssiz %d\n" , sbuf , ssiz );
 #   endif /* DEBUG */
 
     write( fd , sbuf , ssiz );
diff --git a/gcc/config/i386/i386-interix.h b/gcc/config/i386/i386-interix.h
index 060b82ca245e..5d7bfac995ba 100644
--- a/gcc/config/i386/i386-interix.h
+++ b/gcc/config/i386/i386-interix.h
@@ -212,7 +212,7 @@ along with GCC; see the file COPYING3.  If not see
 		fputs (ASM_BYTE, (FILE));				\
 	      else							\
 		fputc (',', (FILE));					\
-	      fprintf ((FILE), "0x%02x", *_ascii_bytes);		\
+	      fprintf ((FILE), "%#02x", *_ascii_bytes);			\
 	      bytes_in_chunk += 5;					\
 	    }								\
 	}								\
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index f91410a2d662..3e887f81612b 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -2512,7 +2512,7 @@ ix86_target_string (int isa, int flags, const char *arch, const char *tune,
   if (isa && add_nl_p)
     {
       opts[num++][0] = isa_other;
-      sprintf (isa_other, "(other isa: 0x%x)", isa);
+      sprintf (isa_other, "(other isa: %#x)", isa);
     }
 
   /* Add flag options.  */
@@ -2528,7 +2528,7 @@ ix86_target_string (int isa, int flags, const char *arch, const char *tune,
   if (flags && add_nl_p)
     {
       opts[num++][0] = target_other;
-      sprintf (target_other, "(other flags: 0x%x)", isa);
+      sprintf (target_other, "(other flags: %#x)", isa);
     }
 
   /* Add -fpmath= option.  */
@@ -10841,7 +10841,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, "0x%lx%08lx",
+	    fprintf (file, "%#lx%08lx",
 		     (unsigned long) CONST_DOUBLE_HIGH (x),
 		     (unsigned long) CONST_DOUBLE_LOW (x));
 	  else
@@ -12005,7 +12005,7 @@ print_operand (FILE *file, rtx x, int code)
 
       if (ASSEMBLER_DIALECT == ASM_ATT)
 	putc ('$', file);
-      fprintf (file, "0x%08lx", (long unsigned int) l);
+      fprintf (file, "%#08lx", (long unsigned int) l);
     }
 
   /* These float cases don't actually occur as immediate operands.  */
diff --git a/gcc/config/i386/i386elf.h b/gcc/config/i386/i386elf.h
index 44cf6818f7c5..a55024311149 100644
--- a/gcc/config/i386/i386elf.h
+++ b/gcc/config/i386/i386elf.h
@@ -88,7 +88,7 @@ along with GCC; see the file COPYING3.  If not see
 		fputs (ASM_BYTE, (FILE));				\
 	      else							\
 		fputc (',', (FILE));					\
-	      fprintf ((FILE), "0x%02x", *_ascii_bytes);		\
+	      fprintf ((FILE), "%#02x", *_ascii_bytes);			\
 	      bytes_in_chunk += 5;					\
 	    }								\
 	}								\
diff --git a/gcc/config/i386/sysv4.h b/gcc/config/i386/sysv4.h
index 63c0cbc85a78..1dc0a36fb544 100644
--- a/gcc/config/i386/sysv4.h
+++ b/gcc/config/i386/sysv4.h
@@ -80,7 +80,7 @@ along with GCC; see the file COPYING3.  If not see
 		fputs (ASM_BYTE, (FILE));				\
 	      else							\
 		fputc (',', (FILE));					\
-	      fprintf ((FILE), "0x%02x", *_ascii_bytes);		\
+	      fprintf ((FILE), "%#02x", *_ascii_bytes);			\
 	      bytes_in_chunk += 5;					\
 	    }								\
 	}								\
-- 
GitLab