* vmsdbgout.c (ASM_OUTPUT_DEBUG_DATA1): Change format string

	placeholder from 0x%x to %#x.
	(ASM_OUTPUT_DEBUG_DATA1): Ditto.
	(ASM_OUTPUT_DEBUG_DATA4): Ditto.
	(ASM_OUTPUT_DEBUG_DATA): Ditto.
	(ASM_OUTPUT_DEBUG_ADDR_DATA): Ditto.
	(ASM_OUTPUT_DEBUG_DATA8): Ditto.
	* optc-gen.awk: Ditto.
	* hwint.h (HOST_WIDE_INT_PRINT_DOUBLE_HEX): Ditto.
	(HOST_WIDE_INT_PRINT_HEX): Ditto.
	(HOST_WIDEST_INT_PRINT_HEX): Ditto.
	(HOST_WIDEST_INT_PRINT_DOUBLE_HEX): Ditto.
	* gcov-dump.c (tag_function): Ditto.
	(tag_summary): Ditto.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158971 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 55 insertions, 41 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d0122024500..ebfcbec2abc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,20 @@
+2010-05-02  Uros Bizjak  <ubizjak@gmail.com>
+
+	* vmsdbgout.c (ASM_OUTPUT_DEBUG_DATA1): Change format string
+	placeholder from 0x%x to %#x.
+	(ASM_OUTPUT_DEBUG_DATA1): Ditto.
+	(ASM_OUTPUT_DEBUG_DATA4): Ditto.
+	(ASM_OUTPUT_DEBUG_DATA): Ditto.
+	(ASM_OUTPUT_DEBUG_ADDR_DATA): Ditto.
+	(ASM_OUTPUT_DEBUG_DATA8): Ditto.
+	* optc-gen.awk: Ditto.
+	* hwint.h (HOST_WIDE_INT_PRINT_DOUBLE_HEX): Ditto.
+	(HOST_WIDE_INT_PRINT_HEX): Ditto.
+	(HOST_WIDEST_INT_PRINT_HEX): Ditto.
+	(HOST_WIDEST_INT_PRINT_DOUBLE_HEX): Ditto.
+	* gcov-dump.c (tag_function): Ditto.
+	(tag_summary): Ditto.
+
 2010-05-01  Anatoly Sokolov  <aesok@post.ru>
 
 	* target.h (struct calls): Add function_value_regno_p field.
@@ -148,11 +165,9 @@
 	simplify cgraph tags and document.
 	(lto_output_node): Use only LTO_cgraph_unavail_node and
 	LTO_cgraph_analyzed_node; Do not save analzed, reachable,
-	for_functions_valid, global info, process and output
-	flags.
+	for_functions_valid, global info, process and output flags.
 	(input_overwrite_node): Initialize estimated stack size and
-	estimated growth.
-	Do not read flags we no longer store.
+	estimated growth.  Do not read flags we no longer store.
 	(input_node): Likewise do not read info no longer stored.
 	* ipa-inline.c (cgraph_mark_inline_edge): Do not set global.inlined
 	flag.
@@ -179,7 +194,8 @@
 	* lto-section-in.c: Include ggc.h
 	(lto_new_in_decl_state): Alloc in GGC.
 	(lto_delete_in_decl_state): Likewise.
-	* ipa.c (pass_ipa_function_visibility, pass_ipa_whole_program): Collect.
+	* ipa.c (pass_ipa_function_visibility, pass_ipa_whole_program):
+	Collect.
 
 2010-04-29  Bernd Schmidt  <bernds@codesourcery.com>
 
@@ -192,23 +208,21 @@
 	account only if HONOR_REG_ALLOC_ORDER is not defined.
 	* config/arm/arm.h (HONOR_REG_ALLOC_ORDER): Define.
 	* system.h (ORDER_REGS_FOR_LOCAL_ALLOC): Poison.
-	
-2010-04-29  Jon Grant <04@jguk.org>
-	
+
+2010-04-29  Jon Grant  <04@jguk.org>
+
 	* collect2.c (vflag): Change type from int to bool.
 	(debug): Likewise.
 	(helpflag): New global bool.
-	(main): Set vflag and debug with boolean, not integer truth
-	values.  Accept new "--help" option and output usage text if
-	found.
+	(main): Set vflag and debug with boolean, not integer truth values.
+	Accept new "--help" option and output usage text if found.
 	* collect2.h (vflag): Update prototype.
 	(debug): Likewise.
-	
+
 2010-04-29  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR bootstrap/43936
-	* plugin.h (flag_plugin_added): Moved out of
-	invoke_plugin_callbacks.
+	* plugin.h (flag_plugin_added): Moved out of invoke_plugin_callbacks.
 
 2010-04-29  Richard Guenther  <rguenther@suse.de>
 
@@ -231,7 +245,7 @@
 	* ifcvt.c (dead_or_predicable): Use df_simulate_find_defs to compute
 	test_set.
 
-2010-04-29  Brian Hackett   <bhackett1024@gmail.com>
+2010-04-29  Brian Hackett  <bhackett1024@gmail.com>
 
 	* plugin.h (invoke_plugin_callbacks): New inline function.
 	* plugin.c (flag_plugin_added): New global flag.
@@ -279,7 +293,8 @@
 	(output_alias_pair_p): Handle variables.
 	(output_unreferenced_globals): Output only needed partition of varpool.
 	* ipa-inline.c (inline_write_summary): Update.
-	* lto-streamer-in.c (lto_input_tree_ref, lto_input_tree): Do not build cgraph.
+	* lto-streamer-in.c (lto_input_tree_ref, lto_input_tree): Do not build
+	cgraph.
 	* lto-section-in.c (lto_section_name): Add varpool and jump funcs.
 	* ipa.c (hash_varpool_node_set_element, eq_varpool_node_set_element,
 	varpool_node_set_new, varpool_node_set_add,
@@ -511,8 +526,7 @@
 2010-04-28  Richard Guenther  <rguenther@suse.de>
 
 	PR c++/43880
-	* tree-inline.c (copy_bind_expr): Also copy bind expr vars
-	value-exprs.
+	* tree-inline.c (copy_bind_expr): Also copy bind expr vars value-exprs.
 
 2010-04-27  Manuel López-Ibáñez  <manu@gcc.gnu.org>
 	    Jan Hubicka <hubicka@ucw.cz>
diff --git a/gcc/config/i386/gmon-sol2.c b/gcc/config/i386/gmon-sol2.c
index dd87d5f7277..44bbb44488f 100644
--- a/gcc/config/i386/gmon-sol2.c
+++ b/gcc/config/i386/gmon-sol2.c
@@ -236,7 +236,7 @@ _mcleanup (void)
 	for (toindex=froms[fromindex]; toindex!=0; toindex=tos[toindex].link) {
 #	    ifdef DEBUG
 		fprintf( stderr ,
-			"[mcleanup] frompc 0x%x selfpc 0x%x count %d\n" ,
+			"[mcleanup] frompc %#x selfpc %#x count %d\n" ,
 			frompc , tos[toindex].selfpc , tos[toindex].count );
 #	    endif /* DEBUG */
 	    rawarc.raw_frompc = (unsigned long) frompc;
diff --git a/gcc/gcov-dump.c b/gcc/gcov-dump.c
index 6b06d959294..8aa6368de3e 100644
--- a/gcc/gcov-dump.c
+++ b/gcc/gcov-dump.c
@@ -267,7 +267,7 @@ tag_function (const char *filename ATTRIBUTE_UNUSED,
   unsigned long pos = gcov_position ();
 
   printf (" ident=%u", gcov_read_unsigned ());
-  printf (", checksum=0x%08x", gcov_read_unsigned ());
+  printf (", checksum=%#08x", gcov_read_unsigned ());
 
   if (gcov_position () - pos < length)
     {
@@ -418,7 +418,7 @@ tag_summary (const char *filename ATTRIBUTE_UNUSED,
   unsigned ix;
 
   gcov_read_summary (&summary);
-  printf (" checksum=0x%08x", summary.checksum);
+  printf (" checksum=%#08x", summary.checksum);
 
   for (ix = 0; ix != GCOV_COUNTERS_SUMMABLE; ix++)
     {
diff --git a/gcc/hwint.h b/gcc/hwint.h
index 7dec86080dc..327a12f0362 100644
--- a/gcc/hwint.h
+++ b/gcc/hwint.h
@@ -82,23 +82,23 @@ 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 \
-     "0x%" HOST_LONG_FORMAT "x%016" HOST_LONG_FORMAT "x"
+     "%#" HOST_LONG_FORMAT "x%016" HOST_LONG_FORMAT "x"
 # else
 #  define HOST_WIDE_INT_PRINT_DOUBLE_HEX \
-     "0x%" HOST_LONG_FORMAT "x%08" HOST_LONG_FORMAT "x"
+     "%#" 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 \
-    "0x%" HOST_LONG_LONG_FORMAT "x%016" HOST_LONG_LONG_FORMAT "x"
+    "%#" 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"
 #define HOST_WIDE_INT_PRINT_DEC_C HOST_WIDE_INT_PRINT_DEC HOST_WIDE_INT_PRINT_C
 #define HOST_WIDE_INT_PRINT_UNSIGNED "%" HOST_WIDE_INT_PRINT "u"
-#define HOST_WIDE_INT_PRINT_HEX "0x%" HOST_WIDE_INT_PRINT "x"
+#define HOST_WIDE_INT_PRINT_HEX "%#" HOST_WIDE_INT_PRINT "x"
 
 /* Set HOST_WIDEST_INT.  This is a 64-bit type unless the compiler
    in use has no 64-bit type at all; in that case it's 32 bits.  */
@@ -129,9 +129,9 @@ extern char sizeof_long_long_must_be_8[sizeof(long long) == 8 ? 1 : -1];
 # define HOST_WIDEST_INT_PRINT_DEC	      "%" HOST_LONG_LONG_FORMAT "d"
 # define HOST_WIDEST_INT_PRINT_DEC_C	      "%" HOST_LONG_LONG_FORMAT "dLL"
 # define HOST_WIDEST_INT_PRINT_UNSIGNED	      "%" HOST_LONG_LONG_FORMAT "u"
-# define HOST_WIDEST_INT_PRINT_HEX	      "0x%" HOST_LONG_LONG_FORMAT "x"
+# define HOST_WIDEST_INT_PRINT_HEX	      "%#" HOST_LONG_LONG_FORMAT "x"
 # define HOST_WIDEST_INT_PRINT_DOUBLE_HEX     \
-    "0x%" HOST_LONG_LONG_FORMAT "x%016" HOST_LONG_LONG_FORMAT "x"
+    "%#" HOST_LONG_LONG_FORMAT "x%016" HOST_LONG_LONG_FORMAT "x"
 #endif
 
 /* Define HOST_WIDEST_FAST_INT to the widest integer type supported
diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk
index da595e94bc0..60211df2de1 100644
--- a/gcc/optc-gen.awk
+++ b/gcc/optc-gen.awk
@@ -339,7 +339,7 @@ print "{";
 print "  fputs (\"\\n\", file);";
 for (i = 0; i < n_opt_other; i++) {
 	print "  if (ptr->" var_opt_other[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%lx)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#lx)\\n\",";
 	print "             indent_to, \"\",";
 	print "             \"" var_opt_other[i] "\",";
 	print "             (unsigned long)ptr->" var_opt_other[i] ");";
@@ -348,7 +348,7 @@ for (i = 0; i < n_opt_other; i++) {
 
 for (i = 0; i < n_opt_int; i++) {
 	print "  if (ptr->" var_opt_int[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%x)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#x)\\n\",";
 	print "             indent_to, \"\",";
 	print "             \"" var_opt_int[i] "\",";
 	print "             ptr->" var_opt_int[i] ");";
@@ -357,7 +357,7 @@ for (i = 0; i < n_opt_int; i++) {
 
 for (i = 0; i < n_opt_short; i++) {
 	print "  if (ptr->" var_opt_short[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%x)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#x)\\n\",";
 	print "             indent_to, \"\",";
 	print "             \"" var_opt_short[i] "\",";
 	print "             ptr->" var_opt_short[i] ");";
@@ -366,7 +366,7 @@ for (i = 0; i < n_opt_short; i++) {
 
 for (i = 0; i < n_opt_char; i++) {
 	print "  if (ptr->" var_opt_char[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%x)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#x)\\n\",";
 	print "             indent_to, \"\",";
 	print "             \"" var_opt_char[i] "\",";
 	print "             ptr->" var_opt_char[i] ");";
@@ -494,7 +494,7 @@ print "{";
 print "  fputs (\"\\n\", file);";
 for (i = 0; i < n_target_other; i++) {
 	print "  if (ptr->" var_target_other[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%lx)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#lx)\\n\",";
 	print "             indent, \"\",";
 	print "             \"" var_target_other[i] "\",";
 	print "             (unsigned long)ptr->" var_target_other[i] ");";
@@ -503,7 +503,7 @@ for (i = 0; i < n_target_other; i++) {
 
 for (i = 0; i < n_target_int; i++) {
 	print "  if (ptr->" var_target_int[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%x)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#x)\\n\",";
 	print "             indent, \"\",";
 	print "             \"" var_target_int[i] "\",";
 	print "             ptr->" var_target_int[i] ");";
@@ -512,7 +512,7 @@ for (i = 0; i < n_target_int; i++) {
 
 for (i = 0; i < n_target_short; i++) {
 	print "  if (ptr->" var_target_short[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%x)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#x)\\n\",";
 	print "             indent, \"\",";
 	print "             \"" var_target_short[i] "\",";
 	print "             ptr->" var_target_short[i] ");";
@@ -521,7 +521,7 @@ for (i = 0; i < n_target_short; i++) {
 
 for (i = 0; i < n_target_char; i++) {
 	print "  if (ptr->" var_target_char[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%x)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#x)\\n\",";
 	print "             indent, \"\",";
 	print "             \"" var_target_char[i] "\",";
 	print "             ptr->" var_target_char[i] ");";
diff --git a/gcc/vmsdbgout.c b/gcc/vmsdbgout.c
index 2ad6ed23e99..44e4dc8cb90 100644
--- a/gcc/vmsdbgout.c
+++ b/gcc/vmsdbgout.c
@@ -351,34 +351,34 @@ static char text_end_label[MAX_ARTIFICIAL_LABEL_BYTES];
 
 #ifndef ASM_OUTPUT_DEBUG_DATA1
 #define ASM_OUTPUT_DEBUG_DATA1(FILE,VALUE) \
-  fprintf ((FILE), "\t%s\t0x%x", ASM_BYTE_OP, (unsigned char) VALUE)
+  fprintf ((FILE), "\t%s\t%#x", ASM_BYTE_OP, (unsigned char) VALUE)
 #endif
 
 #ifndef ASM_OUTPUT_DEBUG_DATA2
 #define ASM_OUTPUT_DEBUG_DATA2(FILE,VALUE) \
-  fprintf ((FILE), "\t%s\t0x%x", UNALIGNED_SHORT_ASM_OP, \
+  fprintf ((FILE), "\t%s\t%#x", UNALIGNED_SHORT_ASM_OP, \
 	   (unsigned short) VALUE)
 #endif
 
 #ifndef ASM_OUTPUT_DEBUG_DATA4
 #define ASM_OUTPUT_DEBUG_DATA4(FILE,VALUE) \
-  fprintf ((FILE), "\t%s\t0x%lx", UNALIGNED_INT_ASM_OP, (unsigned long) VALUE)
+  fprintf ((FILE), "\t%s\t%#lx", UNALIGNED_INT_ASM_OP, (unsigned long) VALUE)
 #endif
 
 #ifndef ASM_OUTPUT_DEBUG_DATA
 #define ASM_OUTPUT_DEBUG_DATA(FILE,VALUE) \
-  fprintf ((FILE), "\t%s\t0x%lx", UNALIGNED_OFFSET_ASM_OP(VALUE), VALUE)
+  fprintf ((FILE), "\t%s\t%#lx", UNALIGNED_OFFSET_ASM_OP(VALUE), VALUE)
 #endif
 
 #ifndef ASM_OUTPUT_DEBUG_ADDR_DATA
 #define ASM_OUTPUT_DEBUG_ADDR_DATA(FILE,VALUE) \
-  fprintf ((FILE), "\t%s\t0x%lx", UNALIGNED_PTR_ASM_OP, \
+  fprintf ((FILE), "\t%s\t%#lx", UNALIGNED_PTR_ASM_OP, \
 	   (unsigned long) VALUE)
 #endif
 
 #ifndef ASM_OUTPUT_DEBUG_DATA8
 #define ASM_OUTPUT_DEBUG_DATA8(FILE,VALUE) \
-  fprintf ((FILE), "\t%s\t0x%llx", UNALIGNED_DOUBLE_INT_ASM_OP, \
+  fprintf ((FILE), "\t%s\t%#llx", UNALIGNED_DOUBLE_INT_ASM_OP, \
                                  (unsigned long long) VALUE)
 #endif