diff -rup a/bfd/bfd-in.h b/bfd/bfd-in.h --- a/bfd/bfd-in.h 2011-09-15 18:15:18 -0700 +++ b/bfd/bfd-in.h 2012-02-15 14:33:21 -0800 @@ -31,6 +31,7 @@ extern "C" { #include "ansidecl.h" #include "symcat.h" +#include #if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE) #ifndef SABER /* This hack is to avoid a problem with some strict ANSI C preprocessors. @@ -301,8 +302,6 @@ typedef struct bfd_section *sec_ptr; && (sec)->sec_info_type != ELF_INFO_TYPE_MERGE \ && (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS) -/* Forward define. */ -struct stat; typedef enum bfd_print_symbol { diff -rup a/bfd/bfd-in2.h b/bfd/bfd-in2.h --- a/bfd/bfd-in2.h 2011-09-15 18:15:18 -0700 +++ b/bfd/bfd-in2.h 2012-02-15 14:33:48 -0800 @@ -38,6 +38,7 @@ extern "C" { #include "ansidecl.h" #include "symcat.h" +#include #if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE) #ifndef SABER /* This hack is to avoid a problem with some strict ANSI C preprocessors. @@ -308,8 +309,6 @@ typedef struct bfd_section *sec_ptr; && (sec)->sec_info_type != ELF_INFO_TYPE_MERGE \ && (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS) -/* Forward define. */ -struct stat; typedef enum bfd_print_symbol { diff -rup a/binutils/rename.c b/binutils/rename.c --- a/binutils/rename.c 2009-09-02 00:22:32 -0700 +++ b/binutils/rename.c 2012-02-15 00:08:17 -0800 @@ -20,10 +20,11 @@ #include "sysdep.h" #include "bfd.h" -#include "bucomm.h" #include +#include "bucomm.h" + #ifdef HAVE_GOOD_UTIME_H #include #else /* ! HAVE_GOOD_UTIME_H */ diff -rup a/configure b/configure --- a/configure 2011-08-14 05:28:15 -0700 +++ b/configure 2012-02-15 02:13:00 -0800 @@ -5946,8 +5946,8 @@ int main () { #if CLOOG_VERSION_MAJOR != 0 \ - || CLOOG_VERSION_MINOR != 16 \ - || CLOOG_VERSION_REVISION < 1 + || CLOOG_VERSION_MINOR != 17 \ + || CLOOG_VERSION_REVISION < 0 choke me #endif ; diff -rup a/gold/descriptors.cc b/gold/descriptors.cc --- a/gold/descriptors.cc 2011-04-22 16:20:28 -0700 +++ b/gold/descriptors.cc 2012-02-15 18:39:49 -0800 @@ -50,6 +50,8 @@ set_close_on_exec(int fd) // Mingw does not define F_SETFD. #ifdef F_SETFD fcntl(fd, F_SETFD, FD_CLOEXEC); +#else + (void)fd; #endif } diff -rup a/gold/gold.h b/gold/gold.h --- a/gold/gold.h 2011-06-07 21:43:28 -0700 +++ b/gold/gold.h 2012-02-15 18:36:11 -0800 @@ -48,6 +48,10 @@ #ifdef ENABLE_NLS # include +# ifdef setlocale + // Someone in libintl world decided it was a good idea to define a "setlocale" macro. +# undef setlocale +# endif # define _(String) gettext (String) # ifdef gettext_noop # define N_(String) gettext_noop (String) diff -rup a/intl/configure b/intl/configure --- a/intl/configure 2010-09-27 13:22:53 -0700 +++ b/intl/configure 2012-02-15 17:42:16 -0800 @@ -5216,8 +5216,8 @@ fi ;; esac if test "X$additional_includedir" != "X"; then - if test "X$additional_includedir" != "X/usr/include"; then haveit= + if test "X$additional_includedir" != "X/usr/include"; then if test "X$additional_includedir" = "X/usr/local/include"; then if test -n "$GCC"; then case $host_os in @@ -5429,7 +5429,6 @@ done am_save_CPPFLAGS="$CPPFLAGS" - for element in $INCICONV; do haveit= for x in $CPPFLAGS; do @@ -6000,16 +5999,16 @@ fi LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name" fi fi - additional_includedir= - case "$found_dir" in + additional_includedir= + case "$found_dir" in */lib | */lib/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` additional_includedir="$basedir/include" ;; esac if test "X$additional_includedir" != "X"; then - if test "X$additional_includedir" != "X/usr/include"; then haveit= + if test "X$additional_includedir" != "X/usr/include"; then if test "X$additional_includedir" = "X/usr/local/include"; then if test -n "$GCC"; then case $host_os in @@ -6018,7 +6017,7 @@ fi fi fi if test -z "$haveit"; then - for x in $CPPFLAGS $INCINTL; do + for x in $INCINTL; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -6027,14 +6026,13 @@ fi eval x=\"$x\" exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" - if test "X$x" = "X-I$additional_includedir"; then haveit=yes break fi done if test -z "$haveit"; then - if test -d "$additional_includedir"; then + if test -d "$additional_includedir"; then INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir" fi fi @@ -6249,7 +6247,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libintl" >&5 $as_echo "$gt_cv_func_gnugettext1_libintl" >&6; } fi - if test "$gt_cv_func_gnugettext1_libc" = "yes" \ || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ && test "$PACKAGE" != gettext-runtime \ @@ -6261,7 +6258,6 @@ $as_echo "$gt_cv_func_gnugettext1_libint INCINTL= fi - if test "$gt_use_preinstalled_gnugettext" != "yes"; then nls_cv_use_gnu_gettext=yes fi @@ -6566,7 +6562,7 @@ fi LIBINTL_DEP= -INCINTL= +#INCINTL= case $USE_INCLUDED_LIBINTL in yes) LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},&/..,' ` diff -rup a/intl/configure.ac b/intl/configure.ac --- a/intl/configure.ac 2009-08-24 12:12:54 -0700 +++ b/intl/configure.ac 2012-02-15 17:04:37 -0800 @@ -37,7 +37,7 @@ AC_SUBST(LIBINTL_DEP) AC_SUBST(INCINTL) LIBINTL_DEP= -INCINTL= +#INCINTL= case $USE_INCLUDED_LIBINTL in yes) LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},&/..,' `