* peXXigen.c: Include wchar.h if available.

Include safe-ctype.h.
	(HighBitSet, SetHighBit, WithoutHighBit): New macros.
	(pe_print_resource_entries): Rename to
	rsrc_print_resource_entries.  Handle names that are not RVAs.
	(pe_print_resource_directory): Rename to
	rsrc_print_resource_directory.
	(pe_print_rsrc): Rename to rsrc_print_section.  Corrupt
	computation of RVA bias.
	(rsrc_count_entries): New function.
	(rsrc_count_directory): New function.
	(rsrc_parse_entry): New function.
	(rsrc_parse_entries): New function.
	(rsrc_parse_directory): New function.
	(rsrc_write_string): New function.
	(rsrc_compute_rva): New function.
	(rsrc_write_leaf): New function.
	(rsrc_write_entry): New function.
	(rsrc_write_directory): New function.
	(u16_mbtouc): New function.
	(rsrc_cmp): New function.
	(rsrc_print_name): New function.
	(rsrc_resource_name): New function.
	(rsrc_merge_string_entries): New function.
	(rsrc_sort_entries): New function.
	(rsrc_attach_chain): New function.
	(rsrc_merge): New function.
	(rsrc_process_section): New function - merges the contents of a
	.rsrc section.
	(_bfd_XXi_final_link_postscript): Call rsrc_process_section.
	* configure.in (AC_CHECK_HEADERS): Add wchar.h
	* config.in: Regenerate.
	* configure: Regenerate.

bfd/ChangeLog

@@ -1,3 +1,39 @@
+2013-12-17  Nick Clifton  <nickc@redhat.com>
+
+	* peXXigen.c: Include wchar.h if available.
+	Include safe-ctype.h.
+	(HighBitSet, SetHighBit, WithoutHighBit): New macros.
+	(pe_print_resource_entries): Rename to
+	rsrc_print_resource_entries.  Handle names that are not RVAs.
+	(pe_print_resource_directory): Rename to
+	rsrc_print_resource_directory.
+	(pe_print_rsrc): Rename to rsrc_print_section.  Corrupt
+	computation of RVA bias.
+	(rsrc_count_entries): New function.
+	(rsrc_count_directory): New function.
+	(rsrc_parse_entry): New function.
+	(rsrc_parse_entries): New function.
+	(rsrc_parse_directory): New function.
+	(rsrc_write_string): New function.
+	(rsrc_compute_rva): New function.
+	(rsrc_write_leaf): New function.
+	(rsrc_write_entry): New function.
+	(rsrc_write_directory): New function.
+	(u16_mbtouc): New function.
+	(rsrc_cmp): New function.
+	(rsrc_print_name): New function.
+	(rsrc_resource_name): New function.
+	(rsrc_merge_string_entries): New function.
+	(rsrc_sort_entries): New function.
+	(rsrc_attach_chain): New function.
+	(rsrc_merge): New function.
+	(rsrc_process_section): New function - merges the contents of a
+	.rsrc section.
+	(_bfd_XXi_final_link_postscript): Call rsrc_process_section.
+	* configure.in (AC_CHECK_HEADERS): Add wchar.h
+	* config.in: Regenerate.
+	* configure: Regenerate.
+
 2013-12-16  Andreas Schwab  <schwab@suse.de>
 
 	* elf64-ppc.c (ppc64_elf_relocate_section): Add newline to error

bfd/config.in

@@ -255,6 +255,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
 /* Define if <sys/procfs.h> has win32_pstatus_t. */
 #undef HAVE_WIN32_PSTATUS_T
 

bfd/configure

@@ -12900,7 +12900,7 @@ $as_echo "$bfd_cv_build_exeext" >&6; }
 fi
 
 
-for ac_header in alloca.h stddef.h string.h strings.h stdlib.h time.h unistd.h
+for ac_header in alloca.h stddef.h string.h strings.h stdlib.h time.h unistd.h wchar.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

bfd/configure.in

@@ -210,7 +210,7 @@ AC_SUBST(BFD_HOSTPTR_T)
 
 BFD_CC_FOR_BUILD
 
-AC_CHECK_HEADERS(alloca.h stddef.h string.h strings.h stdlib.h time.h unistd.h)
+AC_CHECK_HEADERS(alloca.h stddef.h string.h strings.h stdlib.h time.h unistd.h wchar.h)
 AC_CHECK_HEADERS(fcntl.h sys/file.h sys/time.h sys/stat.h sys/resource.h)
 GCC_HEADER_STDINT(bfd_stdint.h)
 AC_HEADER_TIME