Index: bfd/ChangeLog
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/bfd/ChangeLog,v
retrieving revision 1.1.1.18
diff -u -r1.1.1.18 ChangeLog
--- bfd/ChangeLog	16 Jun 2004 05:44:33 -0000	1.1.1.18
+++ bfd/ChangeLog	12 Dec 2004 01:27:42 -0000
@@ -1,3 +1,41 @@
+2004-10-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_link_add_object_symbols): Also clear
+	_cooked_size for warning sections.
+
+2004-09-07  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	Merge from mainline:
+	2004-08-31  Eric Botcazou  <ebotcazou@libertysurf.fr>
+	* elf.c (special_sections): Add .gnu.linkonce.b modelled on .bss.
+
+	2004-06-09  Alexandre Oliva  <aoliva@redhat.com>
+	* elflink.c (elf_sort_symbol): Compare section id, not pointers.
+	(elf_link_add_object_symbols): Likewise.
+
+2004-08-10  Daniel Jacobowitz  <dan@debian.org>
+
+	* elf.c (assign_file_positions_except_relocs): Revert unintended
+	change from 2004-04-08.
+
+2004-05-28  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config.bfd (hppa*-*-netbsd*): Set targ_defvec to
+	bfd_elf32_hppa_nbsd_vec.  Add bfd_elf32_hppa_linux_vec
+	to targ_selvecs.
+	* configure.in (bfd_elf32_hppa_nbsd_vec): Add case.
+	* configure: Regenerate.
+	* elf32-hppa.c (elf32_hppa_object_p): Add "elf32-hppa-netbsd"
+	case that accepts OSABI=NetBSD and OSABI=SysV.
+	(elf32_hppa_set_gp): For "elf32-hppa-netbsd", set the GP to
+	the base of .got or .data (if .got does not exist).
+	(elf32_hppa_post_process_headers): For elf32-hppa-netbsd,
+	set OSABI=NetBSD.
+	(TARGET_BIG_SYM): Add bfd_elf32_hppa_nbsd_vec case.
+	(TARGET_BIG_NAME): Add "elf32-hppa-netbsd" case.
+	* targets.c (bfd_elf32_hppa_nbsd_vec): Add extern declaration.
+	(_bfd_target_vector): Add bfd_elf32_hppa_nbsd_vec.
+
 2004-05-17  Daniel Jacobowitz  <dan@debian.org>
 
 	* configure.in: Mark unreleased for post-2.15 snapshots.
Index: bfd/config.bfd
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/bfd/config.bfd,v
retrieving revision 1.1.1.13
diff -u -r1.1.1.13 config.bfd
--- bfd/config.bfd	16 Jun 2004 05:44:29 -0000	1.1.1.13
+++ bfd/config.bfd	12 Dec 2004 01:27:42 -0000
@@ -371,10 +371,14 @@
     ;;
 #endif
 
-  hppa*-*-linux-gnu* | hppa*-*-netbsd*)
+  hppa*-*-linux-gnu*)
     targ_defvec=bfd_elf32_hppa_linux_vec
     targ_selvecs=bfd_elf32_hppa_vec
     ;;
+  hppa*-*-netbsd*)
+    targ_defvec=bfd_elf32_hppa_nbsd_vec
+    targ_selvecs="bfd_elf32_hppa_vec bfd_elf32_hppa_linux_vec"
+    ;;
   hppa*-*-*elf* | hppa*-*-lites* | hppa*-*-sysv4* | hppa*-*-rtems* | hppa*-*-openbsd*)
     targ_defvec=bfd_elf32_hppa_vec
     targ_selvecs=bfd_elf32_hppa_linux_vec
Index: bfd/configure
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/bfd/configure,v
retrieving revision 1.1.1.15
diff -u -r1.1.1.15 configure
--- bfd/configure	16 Jun 2004 05:44:29 -0000	1.1.1.15
+++ bfd/configure	12 Dec 2004 01:27:43 -0000
@@ -3327,7 +3327,7 @@
 
 fi
 
-for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
+for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -3459,24 +3459,11 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 /* This mess was copied from the GNU getpagesize.h.  */
 #ifndef HAVE_GETPAGESIZE
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
 
 /* Assume that all systems that can run configure have sys/param.h.  */
 # ifndef HAVE_SYS_PARAM_H
@@ -3584,7 +3571,7 @@
 }
 
 EOF
-if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -3612,17 +3599,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3616: checking for $ac_hdr" >&5
+echo "configure:3603: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3621 "configure"
+#line 3608 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3652,12 +3639,12 @@
 __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3656: checking for $ac_func" >&5
+echo "configure:3643: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3661 "configure"
+#line 3648 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3680,7 +3667,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3709,12 +3696,12 @@
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3713: checking for $ac_func" >&5
+echo "configure:3700: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3718 "configure"
+#line 3705 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3737,7 +3724,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3771,19 +3758,19 @@
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3775: checking for LC_MESSAGES" >&5
+echo "configure:3762: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3780 "configure"
+#line 3767 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:3787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -3804,7 +3791,7 @@
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3808: checking whether NLS is requested" >&5
+echo "configure:3795: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -3824,7 +3811,7 @@
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3828: checking whether included gettext is requested" >&5
+echo "configure:3815: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
@@ -3843,17 +3830,17 @@
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3847: checking for libintl.h" >&5
+echo "configure:3834: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3852 "configure"
+#line 3839 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3870,19 +3857,19 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:3874: checking for gettext in libc" >&5
+echo "configure:3861: checking for gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3879 "configure"
+#line 3866 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:3886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -3898,7 +3885,7 @@
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:3902: checking for bindtextdomain in -lintl" >&5
+echo "configure:3889: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3906,7 +3893,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3910 "configure"
+#line 3897 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3917,7 +3904,7 @@
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:3921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3933,19 +3920,19 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:3937: checking for gettext in libintl" >&5
+echo "configure:3924: checking for gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3942 "configure"
+#line 3929 "configure"
 #include "confdefs.h"
 
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:3949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libintl=yes
 else
@@ -3973,7 +3960,7 @@
 	      # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3977: checking for $ac_word" >&5
+echo "configure:3964: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4007,12 +3994,12 @@
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4011: checking for $ac_func" >&5
+echo "configure:3998: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4016 "configure"
+#line 4003 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4035,7 +4022,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4062,7 +4049,7 @@
 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4066: checking for $ac_word" >&5
+echo "configure:4053: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4098,7 +4085,7 @@
 		# Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4102: checking for $ac_word" >&5
+echo "configure:4089: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4130,7 +4117,7 @@
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 4134 "configure"
+#line 4121 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4138,7 +4125,7 @@
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:4142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -4170,7 +4157,7 @@
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4174: checking for $ac_word" >&5
+echo "configure:4161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4204,7 +4191,7 @@
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4208: checking for $ac_word" >&5
+echo "configure:4195: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4240,7 +4227,7 @@
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4244: checking for $ac_word" >&5
+echo "configure:4231: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4330,7 +4317,7 @@
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4334: checking for catalogs to be installed" >&5
+echo "configure:4321: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -4358,17 +4345,17 @@
       if test "$CATOBJEXT" = ".cat"; then
 	 ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:4362: checking for linux/version.h" >&5
+echo "configure:4349: checking for linux/version.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4367 "configure"
+#line 4354 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4446,7 +4433,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:4450: checking for a BSD compatible install" >&5
+echo "configure:4437: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4506,19 +4493,19 @@
 BFD_HOST_U_64_BIT=
 
 echo $ac_n "checking for long long""... $ac_c" 1>&6
-echo "configure:4510: checking for long long" >&5
+echo "configure:4497: checking for long long" >&5
 if eval "test \"`echo '$''{'bfd_cv_has_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4515 "configure"
+#line 4502 "configure"
 #include "confdefs.h"
 
 int main() {
 unsigned long long ll = 18446744073709551615ULL;
 ; return 0; }
 EOF
-if { (eval echo configure:4522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_has_long_long=yes
 else
@@ -4534,13 +4521,13 @@
 if test $bfd_cv_has_long_long = yes; then
   BFD_HOST_LONG_LONG=1
   echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4538: checking size of long long" >&5
+echo "configure:4525: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   for ac_size in 4 8 1 2 16 12  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 4544 "configure"
+#line 4531 "configure"
 #include "confdefs.h"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -4550,7 +4537,7 @@
 switch (0) case 0: case (sizeof (long long) == $ac_size):;
 ; return 0; }
 EOF
-if { (eval echo configure:4554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sizeof_long_long=$ac_size
 else
@@ -4575,13 +4562,13 @@
 fi
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4579: checking size of long" >&5
+echo "configure:4566: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   for ac_size in 4 8 1 2 16 12  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 4585 "configure"
+#line 4572 "configure"
 #include "confdefs.h"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -4591,7 +4578,7 @@
 switch (0) case 0: case (sizeof (long) == $ac_size):;
 ; return 0; }
 EOF
-if { (eval echo configure:4595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sizeof_long=$ac_size
 else
@@ -4649,7 +4636,7 @@
   EXEEXT_FOR_BUILD='$(EXEEXT)'
 else
   echo $ac_n "checking for build system executable suffix""... $ac_c" 1>&6
-echo "configure:4653: checking for build system executable suffix" >&5
+echo "configure:4640: checking for build system executable suffix" >&5
 if eval "test \"`echo '$''{'bfd_cv_build_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4677,17 +4664,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4681: checking for $ac_hdr" >&5
+echo "configure:4668: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4686 "configure"
+#line 4673 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4717,17 +4704,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4721: checking for $ac_hdr" >&5
+echo "configure:4708: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4726 "configure"
+#line 4713 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4754,12 +4741,12 @@
 done
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4758: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:4745: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4763 "configure"
+#line 4750 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4768,7 +4755,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:4772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -4793,12 +4780,12 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:4797: checking for $ac_hdr that defines DIR" >&5
+echo "configure:4784: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4802 "configure"
+#line 4789 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -4806,7 +4793,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:4810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -4831,7 +4818,7 @@
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:4835: checking for opendir in -ldir" >&5
+echo "configure:4822: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4839,7 +4826,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4843 "configure"
+#line 4830 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4850,7 +4837,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:4854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4872,7 +4859,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:4876: checking for opendir in -lx" >&5
+echo "configure:4863: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4880,7 +4867,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4884 "configure"
+#line 4871 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4891,7 +4878,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:4895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4916,12 +4903,12 @@
 for ac_func in fcntl getpagesize setitimer sysconf fdopen getuid getgid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4920: checking for $ac_func" >&5
+echo "configure:4907: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4925 "configure"
+#line 4912 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4944,7 +4931,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4971,12 +4958,12 @@
 for ac_func in strtoull
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4975: checking for $ac_func" >&5
+echo "configure:4962: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4980 "configure"
+#line 4967 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4999,7 +4986,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5034,12 +5021,12 @@
 esac
 
 echo $ac_n "checking whether strstr must be declared""... $ac_c" 1>&6
-echo "configure:5038: checking whether strstr must be declared" >&5
+echo "configure:5025: checking whether strstr must be declared" >&5
 if eval "test \"`echo '$''{'bfd_cv_decl_needed_strstr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5043 "configure"
+#line 5030 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5060,7 +5047,7 @@
 char *(*pfn) = (char *(*)) strstr
 ; return 0; }
 EOF
-if { (eval echo configure:5064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_decl_needed_strstr=no
 else
@@ -5081,12 +5068,12 @@
 fi
 
 echo $ac_n "checking whether malloc must be declared""... $ac_c" 1>&6
-echo "configure:5085: checking whether malloc must be declared" >&5
+echo "configure:5072: checking whether malloc must be declared" >&5
 if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5090 "configure"
+#line 5077 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5107,7 +5094,7 @@
 char *(*pfn) = (char *(*)) malloc
 ; return 0; }
 EOF
-if { (eval echo configure:5111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_decl_needed_malloc=no
 else
@@ -5128,12 +5115,12 @@
 fi
 
 echo $ac_n "checking whether realloc must be declared""... $ac_c" 1>&6
-echo "configure:5132: checking whether realloc must be declared" >&5
+echo "configure:5119: checking whether realloc must be declared" >&5
 if eval "test \"`echo '$''{'bfd_cv_decl_needed_realloc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5137 "configure"
+#line 5124 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5154,7 +5141,7 @@
 char *(*pfn) = (char *(*)) realloc
 ; return 0; }
 EOF
-if { (eval echo configure:5158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_decl_needed_realloc=no
 else
@@ -5175,12 +5162,12 @@
 fi
 
 echo $ac_n "checking whether free must be declared""... $ac_c" 1>&6
-echo "configure:5179: checking whether free must be declared" >&5
+echo "configure:5166: checking whether free must be declared" >&5
 if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5184 "configure"
+#line 5171 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5201,7 +5188,7 @@
 char *(*pfn) = (char *(*)) free
 ; return 0; }
 EOF
-if { (eval echo configure:5205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_decl_needed_free=no
 else
@@ -5222,12 +5209,12 @@
 fi
 
 echo $ac_n "checking whether getenv must be declared""... $ac_c" 1>&6
-echo "configure:5226: checking whether getenv must be declared" >&5
+echo "configure:5213: checking whether getenv must be declared" >&5
 if eval "test \"`echo '$''{'bfd_cv_decl_needed_getenv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5231 "configure"
+#line 5218 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5248,7 +5235,7 @@
 char *(*pfn) = (char *(*)) getenv
 ; return 0; }
 EOF
-if { (eval echo configure:5252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_decl_needed_getenv=no
 else
@@ -5424,16 +5411,16 @@
 	# Not all versions of AIX with -DAIX_CORE_DUMPX_CORE
 	# have c_impl as a member of struct core_dumpx
 	echo $ac_n "checking for c_impl in struct core_dumpx""... $ac_c" 1>&6
-echo "configure:5428: checking for c_impl in struct core_dumpx" >&5
+echo "configure:5415: checking for c_impl in struct core_dumpx" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 5430 "configure"
+#line 5417 "configure"
 #include "confdefs.h"
 #include <core.h>
 int main() {
 struct core_dumpx c; c.c_impl = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:5437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_ST_C_IMPL 1
@@ -5510,17 +5497,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5514: checking for $ac_hdr" >&5
+echo "configure:5501: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5519 "configure"
+#line 5506 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5548,12 +5535,12 @@
 
   if test "$ac_cv_header_sys_procfs_h" = yes; then
     echo $ac_n "checking for prstatus_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:5552: checking for prstatus_t in sys/procfs.h" >&5
+echo "configure:5539: checking for prstatus_t in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prstatus_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5557 "configure"
+#line 5544 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -5562,7 +5549,7 @@
 prstatus_t avar
 ; return 0; }
 EOF
-if { (eval echo configure:5566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_prstatus_t=yes
 else
@@ -5584,12 +5571,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prstatus_t" 1>&6
 
     echo $ac_n "checking for prstatus32_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:5588: checking for prstatus32_t in sys/procfs.h" >&5
+echo "configure:5575: checking for prstatus32_t in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prstatus32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5593 "configure"
+#line 5580 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -5598,7 +5585,7 @@
 prstatus32_t avar
 ; return 0; }
 EOF
-if { (eval echo configure:5602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_prstatus32_t=yes
 else
@@ -5620,12 +5607,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prstatus32_t" 1>&6
 
     echo $ac_n "checking for prstatus_t.pr_who in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:5624: checking for prstatus_t.pr_who in sys/procfs.h" >&5
+echo "configure:5611: checking for prstatus_t.pr_who in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5629 "configure"
+#line 5616 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -5634,7 +5621,7 @@
 prstatus_t avar; void* aref = (void*) &avar.pr_who
 ; return 0; }
 EOF
-if { (eval echo configure:5638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who=yes
 else
@@ -5656,12 +5643,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who" 1>&6
 
     echo $ac_n "checking for prstatus32_t.pr_who in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:5660: checking for prstatus32_t.pr_who in sys/procfs.h" >&5
+echo "configure:5647: checking for prstatus32_t.pr_who in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5665 "configure"
+#line 5652 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -5670,7 +5657,7 @@
 prstatus32_t avar; void* aref = (void*) &avar.pr_who
 ; return 0; }
 EOF
-if { (eval echo configure:5674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who=yes
 else
@@ -5692,12 +5679,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who" 1>&6
 
     echo $ac_n "checking for pstatus_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:5696: checking for pstatus_t in sys/procfs.h" >&5
+echo "configure:5683: checking for pstatus_t in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pstatus_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5701 "configure"
+#line 5688 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -5706,7 +5693,7 @@
 pstatus_t avar
 ; return 0; }
 EOF
-if { (eval echo configure:5710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_pstatus_t=yes
 else
@@ -5728,12 +5715,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_pstatus_t" 1>&6
 
     echo $ac_n "checking for pxstatus_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:5732: checking for pxstatus_t in sys/procfs.h" >&5
+echo "configure:5719: checking for pxstatus_t in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pxstatus_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5737 "configure"
+#line 5724 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -5742,7 +5729,7 @@
 pxstatus_t avar
 ; return 0; }
 EOF
-if { (eval echo configure:5746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_pxstatus_t=yes
 else
@@ -5764,12 +5751,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_pxstatus_t" 1>&6
 
     echo $ac_n "checking for pstatus32_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:5768: checking for pstatus32_t in sys/procfs.h" >&5
+echo "configure:5755: checking for pstatus32_t in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pstatus32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5773 "configure"
+#line 5760 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -5778,7 +5765,7 @@
 pstatus32_t avar
 ; return 0; }
 EOF
-if { (eval echo configure:5782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_pstatus32_t=yes
 else
@@ -5800,12 +5787,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_pstatus32_t" 1>&6
 
     echo $ac_n "checking for prpsinfo_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:5804: checking for prpsinfo_t in sys/procfs.h" >&5
+echo "configure:5791: checking for prpsinfo_t in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prpsinfo_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5809 "configure"
+#line 5796 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -5814,7 +5801,7 @@
 prpsinfo_t avar
 ; return 0; }
 EOF
-if { (eval echo configure:5818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_prpsinfo_t=yes
 else
@@ -5836,12 +5823,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prpsinfo_t" 1>&6
 
     echo $ac_n "checking for prpsinfo32_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:5840: checking for prpsinfo32_t in sys/procfs.h" >&5
+echo "configure:5827: checking for prpsinfo32_t in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prpsinfo32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5845 "configure"
+#line 5832 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -5850,7 +5837,7 @@
 prpsinfo32_t avar
 ; return 0; }
 EOF
-if { (eval echo configure:5854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_prpsinfo32_t=yes
 else
@@ -5872,12 +5859,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prpsinfo32_t" 1>&6
 
     echo $ac_n "checking for psinfo_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:5876: checking for psinfo_t in sys/procfs.h" >&5
+echo "configure:5863: checking for psinfo_t in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_psinfo_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5881 "configure"
+#line 5868 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -5886,7 +5873,7 @@
 psinfo_t avar
 ; return 0; }
 EOF
-if { (eval echo configure:5890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_psinfo_t=yes
 else
@@ -5908,12 +5895,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_psinfo_t" 1>&6
 
     echo $ac_n "checking for psinfo32_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:5912: checking for psinfo32_t in sys/procfs.h" >&5
+echo "configure:5899: checking for psinfo32_t in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_psinfo32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5917 "configure"
+#line 5904 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -5922,7 +5909,7 @@
 psinfo32_t avar
 ; return 0; }
 EOF
-if { (eval echo configure:5926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_psinfo32_t=yes
 else
@@ -5944,12 +5931,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_psinfo32_t" 1>&6
 
     echo $ac_n "checking for lwpstatus_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:5948: checking for lwpstatus_t in sys/procfs.h" >&5
+echo "configure:5935: checking for lwpstatus_t in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_lwpstatus_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5953 "configure"
+#line 5940 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -5958,7 +5945,7 @@
 lwpstatus_t avar
 ; return 0; }
 EOF
-if { (eval echo configure:5962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_lwpstatus_t=yes
 else
@@ -5980,12 +5967,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_lwpstatus_t" 1>&6
 
     echo $ac_n "checking for lwpxstatus_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:5984: checking for lwpxstatus_t in sys/procfs.h" >&5
+echo "configure:5971: checking for lwpxstatus_t in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_lwpxstatus_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5989 "configure"
+#line 5976 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -5994,7 +5981,7 @@
 lwpxstatus_t avar
 ; return 0; }
 EOF
-if { (eval echo configure:5998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_lwpxstatus_t=yes
 else
@@ -6016,12 +6003,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_lwpxstatus_t" 1>&6
 
     echo $ac_n "checking for lwpstatus_t.pr_context in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:6020: checking for lwpstatus_t.pr_context in sys/procfs.h" >&5
+echo "configure:6007: checking for lwpstatus_t.pr_context in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6025 "configure"
+#line 6012 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -6030,7 +6017,7 @@
 lwpstatus_t avar; void* aref = (void*) &avar.pr_context
 ; return 0; }
 EOF
-if { (eval echo configure:6034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context=yes
 else
@@ -6052,12 +6039,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context" 1>&6
 
     echo $ac_n "checking for lwpstatus_t.pr_reg in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:6056: checking for lwpstatus_t.pr_reg in sys/procfs.h" >&5
+echo "configure:6043: checking for lwpstatus_t.pr_reg in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6061 "configure"
+#line 6048 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -6066,7 +6053,7 @@
 lwpstatus_t avar; void* aref = (void*) &avar.pr_reg
 ; return 0; }
 EOF
-if { (eval echo configure:6070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg=yes
 else
@@ -6088,12 +6075,12 @@
  echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg" 1>&6
 
     echo $ac_n "checking for win32_pstatus_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:6092: checking for win32_pstatus_t in sys/procfs.h" >&5
+echo "configure:6079: checking for win32_pstatus_t in sys/procfs.h" >&5
  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_win32_pstatus_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6097 "configure"
+#line 6084 "configure"
 #include "confdefs.h"
 
 #define _SYSCALL32
@@ -6102,7 +6089,7 @@
 win32_pstatus_t avar
 ; return 0; }
 EOF
-if { (eval echo configure:6106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bfd_cv_have_sys_procfs_type_win32_pstatus_t=yes
 else
@@ -6294,6 +6281,7 @@
     bfd_elf32_frvfdpic_vec)	tb="$tb elf32-frv.lo elf32.lo $elf" ;;
     bfd_elf32_h8300_vec)	tb="$tb elf32-h8300.lo elf32.lo $elf" ;;
     bfd_elf32_hppa_linux_vec)	tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    bfd_elf32_hppa_nbsd_vec)	tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
     bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
     bfd_elf32_i370_vec)		tb="$tb elf32-i370.lo elf32.lo $elf" ;;
     bfd_elf32_i386_freebsd_vec)	tb="$tb elf32-i386.lo elf32.lo $elf" ;;
@@ -6573,10 +6561,10 @@
     if test -n "$GCC" ; then
        bad_64bit_gcc=no;
        echo $ac_n "checking for gcc version with buggy 64-bit support""... $ac_c" 1>&6
-echo "configure:6577: checking for gcc version with buggy 64-bit support" >&5
+echo "configure:6565: checking for gcc version with buggy 64-bit support" >&5
        # Add more tests for gcc versions with non-working 64-bit support here.
        cat > conftest.$ac_ext <<EOF
-#line 6580 "configure"
+#line 6568 "configure"
 #include "confdefs.h"
 :__GNUC__:__GNUC_MINOR__:__i386__:
 EOF
@@ -6618,12 +6606,12 @@
 for ac_func in ftello ftello64 fseeko fseeko64
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6622: checking for $ac_func" >&5
+echo "configure:6610: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6627 "configure"
+#line 6615 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6646,7 +6634,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6672,13 +6660,13 @@
 
 if test x"$ac_cv_func_ftello" = xyes -a x"$ac_cv_func_fseeko" = xyes; then
     echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-echo "configure:6676: checking size of off_t" >&5
+echo "configure:6664: checking size of off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   for ac_size in 4 8 1 2 16 12  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 6682 "configure"
+#line 6670 "configure"
 #include "confdefs.h"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -6688,7 +6676,7 @@
 switch (0) case 0: case (sizeof (off_t) == $ac_size):;
 ; return 0; }
 EOF
-if { (eval echo configure:6692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sizeof_off_t=$ac_size
 else
@@ -6712,7 +6700,7 @@
 
 fi
 echo $ac_n "checking file_ptr type""... $ac_c" 1>&6
-echo "configure:6716: checking file_ptr type" >&5
+echo "configure:6704: checking file_ptr type" >&5
 bfd_file_ptr="long"
 bfd_ufile_ptr="unsigned long"
 if test x"$ac_cv_func_ftello64" = xyes -a x"$ac_cv_func_fseeko64" = xyes \
@@ -6733,21 +6721,21 @@
 test -n "${havevecs}" && tdefaults="${tdefaults} ${havevecs}"
 
 
-for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
+for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6741: checking for $ac_hdr" >&5
+echo "configure:6729: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6746 "configure"
+#line 6734 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6739: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6776,12 +6764,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6780: checking for $ac_func" >&5
+echo "configure:6768: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6785 "configure"
+#line 6773 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6804,7 +6792,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6829,7 +6817,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:6833: checking for working mmap" >&5
+echo "configure:6821: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6837,7 +6825,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6841 "configure"
+#line 6829 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6865,24 +6853,11 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 /* This mess was copied from the GNU getpagesize.h.  */
 #ifndef HAVE_GETPAGESIZE
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
 
 /* Assume that all systems that can run configure have sys/param.h.  */
 # ifndef HAVE_SYS_PARAM_H
@@ -6990,7 +6965,7 @@
 }
 
 EOF
-if { (eval echo configure:6994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -7015,12 +6990,12 @@
 for ac_func in madvise mprotect
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7019: checking for $ac_func" >&5
+echo "configure:6994: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7024 "configure"
+#line 6999 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7043,7 +7018,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
Index: bfd/configure.in
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/bfd/configure.in,v
retrieving revision 1.1.1.15
diff -u -r1.1.1.15 configure.in
--- bfd/configure.in	16 Jun 2004 05:44:29 -0000	1.1.1.15
+++ bfd/configure.in	12 Dec 2004 01:27:43 -0000
@@ -603,6 +603,7 @@
     bfd_elf32_frvfdpic_vec)	tb="$tb elf32-frv.lo elf32.lo $elf" ;;
     bfd_elf32_h8300_vec)	tb="$tb elf32-h8300.lo elf32.lo $elf" ;;
     bfd_elf32_hppa_linux_vec)	tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    bfd_elf32_hppa_nbsd_vec)	tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
     bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
     bfd_elf32_i370_vec)		tb="$tb elf32-i370.lo elf32.lo $elf" ;;
     bfd_elf32_i386_freebsd_vec)	tb="$tb elf32-i386.lo elf32.lo $elf" ;;
Index: bfd/elf.c
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/bfd/elf.c,v
retrieving revision 1.19
diff -u -r1.19 elf.c
--- bfd/elf.c	16 Jun 2004 06:02:14 -0000	1.19
+++ bfd/elf.c	12 Dec 2004 01:27:43 -0000
@@ -19,10 +19,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-
-/* $FreeBSD: src/contrib/binutils/bfd/elf.c,v 1.19 2004/06/16 06:02:14 obrien Exp $ */
-
-
 /*  SECTION
 
 	ELF backends
@@ -2026,6 +2022,7 @@
 static struct bfd_elf_special_section const special_sections[] =
 {
   { ".bss",            4, -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
+  { ".gnu.linkonce.b",15, -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
   { ".comment",        8,  0, SHT_PROGBITS, 0 },
   { ".data",           5, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
   { ".data1",          6,  0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
@@ -4269,7 +4266,9 @@
 	      off = _bfd_elf_assign_file_position_for_section (hdr, off,
 							       FALSE);
 	    }
-	  else if (hdr == i_shdrpp[tdata->symtab_section]
+	  else if (hdr->sh_type == SHT_REL
+		   || hdr->sh_type == SHT_RELA
+		   || hdr == i_shdrpp[tdata->symtab_section]
 		   || hdr == i_shdrpp[tdata->symtab_shndx_section]
 		   || hdr == i_shdrpp[tdata->strtab_section])
 	    hdr->sh_offset = -1;
@@ -4322,8 +4321,6 @@
     bfd_big_endian (abfd) ? ELFDATA2MSB : ELFDATA2LSB;
   i_ehdrp->e_ident[EI_VERSION] = bed->s->ev_current;
 
-  i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD;
-
   if ((abfd->flags & DYNAMIC) != 0)
     i_ehdrp->e_type = ET_DYN;
   else if ((abfd->flags & EXEC_P) != 0)
Index: bfd/elflink.c
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/bfd/elflink.c,v
retrieving revision 1.1.1.11
diff -u -r1.1.1.11 elflink.c
--- bfd/elflink.c	16 Jun 2004 05:44:45 -0000	1.1.1.11
+++ bfd/elflink.c	12 Dec 2004 01:27:44 -0000
@@ -2700,7 +2700,7 @@
     return vdiff > 0 ? 1 : -1;
   else
     {
-      long sdiff = h1->root.u.def.section - h2->root.u.def.section;
+      long sdiff = h1->root.u.def.section->id - h2->root.u.def.section->id;
       if (sdiff != 0)
 	return sdiff > 0 ? 1 : -1;
     }
@@ -2948,6 +2948,7 @@
 			 the section size so that the warning does not
 			 get copied into the output file.  */
 		      s->_raw_size = 0;
+		      s->_cooked_size = 0;
 		      continue;
 		    }
 		}
@@ -2974,6 +2975,7 @@
 		  /* Clobber the section size so that the warning does
 		     not get copied into the output file.  */
 		  s->_raw_size = 0;
+		  s->_cooked_size = 0;
 		}
 	    }
 	}
@@ -3954,7 +3956,7 @@
 		i = idx + 1;
 	      else
 		{
-		  long sdiff = slook - h->root.u.def.section;
+		  long sdiff = slook->id - h->root.u.def.section->id;
 		  if (sdiff < 0)
 		    j = idx;
 		  else if (sdiff > 0)
Index: bfd/freebsd.h
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/bfd/freebsd.h,v
retrieving revision 1.5
diff -u -r1.5 freebsd.h
--- bfd/freebsd.h	16 Jun 2004 06:13:06 -0000	1.5
+++ bfd/freebsd.h	25 Apr 2003 16:50:36 -0000
@@ -19,35 +19,26 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-/* $FreeBSD: src/contrib/binutils/bfd/freebsd.h,v 1.5 2004/06/16 06:13:06 obrien Exp $ */
+/* FreeBSD ZMAGIC files never have the header in the text. */
+#define	N_HEADER_IN_TEXT(x)	0
 
-/* FreeBSD QMAGIC files have the header in the text. */
-#define	N_HEADER_IN_TEXT(x)	1
-#define MY_text_includes_header 1
-
-#define TEXT_START_ADDR		(TARGET_PAGE_SIZE + 0x20)
-
-/*
- * FreeBSD uses a weird mix of byte orderings for its a_info field.
- * Its assembler emits NetBSD style object files, with a big-endian
- * a_info.  Its linker seems to accept either byte ordering, but
- * emits a little-endian a_info.
- *
- * Here, we accept either byte ordering, but always produce
- * little-endian.
- *
- * FIXME - Probably we should always produce the _native_ byte
- * ordering.  I.e., it should be in the architecture-specific
- * file, not here.  But in reality, there is no chance
- * that FreeBSD will ever use a.out in a new port.
- */
+/* ZMAGIC files start at offset 0.  Does not apply to QMAGIC files. */
+#define TEXT_START_ADDR		0
+
+#define N_GETMAGIC_NET(exec) \
+	((exec).a_info & 0xffff)
+#define N_GETMID_NET(exec) \
+	(((exec).a_info >> 16) & 0x3ff)
+#define N_GETFLAG_NET(ex) \
+	(((exec).a_info >> 26) & 0x3f)
 
 #define N_MACHTYPE(exec) \
 	((enum machine_type) \
-	 ((freebsd_swap_magic(&(exec).a_info) >> 16) & 0x3ff))
+	 ((N_GETMAGIC_NET (exec) == ZMAGIC) ? N_GETMID_NET (exec) : \
+	  ((exec).a_info >> 16) & 0x3ff))
 #define N_FLAGS(exec) \
-	((enum machine_type) \
-	 ((freebsd_swap_magic(&(exec).a_info) >> 26) & 0x3f))
+	((N_GETMAGIC_NET (exec) == ZMAGIC) ? N_GETFLAG_NET (exec) : \
+	 ((exec).a_info >> 26) & 0x3f)
 
 #define N_SET_INFO(exec, magic, type, flags) \
 	((exec).a_info = ((magic) & 0xffff) \
@@ -65,44 +56,15 @@
 #include "libbfd.h"
 #include "libaout.h"
 
-#define SWAP_MAGIC(ext)			(freebsd_swap_magic(ext))
+/* On FreeBSD, the magic number is always in i386 (little-endian)
+   format.  I think.  */
+#define SWAP_MAGIC(ext) bfd_getl32 (ext)
 
-#define MY_bfd_final_link MY(bfd_final_link)
 #define MY_write_object_contents MY(write_object_contents)
-
-static bfd_boolean MY(bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *));
 static bfd_boolean MY(write_object_contents) PARAMS ((bfd *abfd));
-static long freebsd_swap_magic PARAMS ((void *ext));
 
 #include "aout-target.h"
 
-static bfd_boolean
-MY(bfd_final_link) (abfd, info)
-  bfd *abfd;
-  struct bfd_link_info *info;
-{
-  obj_aout_subformat (abfd) = q_magic_format;
-  return NAME(aout,final_link) (abfd, info, MY_final_link_callback);
-}
-
-/* Swap a magic number.  We accept either endian, whichever looks valid. */
-
-static long
-freebsd_swap_magic (ext)
-  void *ext;
-{
-  long linfo = bfd_getl32(ext);
-  long binfo = bfd_getb32(ext);
-  int lmagic = linfo & 0xffff;
-  int bmagic = binfo & 0xffff;
-  int lmagic_ok = lmagic == OMAGIC || lmagic == NMAGIC ||
-    lmagic == ZMAGIC || lmagic == QMAGIC;
-  int bmagic_ok = bmagic == OMAGIC || bmagic == NMAGIC ||
-    bmagic == ZMAGIC || bmagic == QMAGIC;
-
-  return bmagic_ok && !lmagic_ok ? binfo : linfo;
-}
-
 /* Write an object file.
    Section contents have already been written.  We write the
    file header, symbols, and relocation.  */
Index: bfd/targets.c
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/bfd/targets.c,v
retrieving revision 1.1.1.10
diff -u -r1.1.1.10 targets.c
--- bfd/targets.c	16 Jun 2004 05:44:30 -0000	1.1.1.10
+++ bfd/targets.c	12 Dec 2004 01:27:45 -0000
@@ -526,6 +526,7 @@
 extern const bfd_target bfd_elf32_frvfdpic_vec;
 extern const bfd_target bfd_elf32_h8300_vec;
 extern const bfd_target bfd_elf32_hppa_linux_vec;
+extern const bfd_target bfd_elf32_hppa_nbsd_vec;
 extern const bfd_target bfd_elf32_hppa_vec;
 extern const bfd_target bfd_elf32_i370_vec;
 extern const bfd_target bfd_elf32_i386_freebsd_vec;
@@ -817,6 +818,7 @@
 	&bfd_elf32_frvfdpic_vec,
 	&bfd_elf32_h8300_vec,
 	&bfd_elf32_hppa_linux_vec,
+	&bfd_elf32_hppa_nbsd_vec,
 	&bfd_elf32_hppa_vec,
 	&bfd_elf32_i370_vec,
 	&bfd_elf32_i386_freebsd_vec,
Index: bfd/version.h
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/bfd/version.h,v
retrieving revision 1.1.1.8
diff -u -r1.1.1.8 version.h
--- bfd/version.h	16 Jun 2004 05:44:23 -0000	1.1.1.8
+++ bfd/version.h	12 Dec 2004 01:27:45 -0000
@@ -1,3 +1,3 @@
-#define BFD_VERSION_DATE 20040523
+#define BFD_VERSION_DATE 20041212
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING @bfd_version_string@
Index: binutils/defparse.c
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/binutils/defparse.c,v
retrieving revision 1.1.1.5
diff -u -r1.1.1.5 defparse.c
--- binutils/defparse.c	11 Oct 2002 05:59:35 -0000	1.1.1.5
+++ binutils/defparse.c	5 Jul 2004 22:21:28 -0000
@@ -22,41 +22,43 @@
 # define	SHARED	273
 # define	NONSHARED	274
 # define	NONAME	275
-# define	SINGLE	276
-# define	MULTIPLE	277
-# define	INITINSTANCE	278
-# define	INITGLOBAL	279
-# define	TERMINSTANCE	280
-# define	TERMGLOBAL	281
-# define	ID	282
-# define	NUMBER	283
+# define	PRIVATE	276
+# define	SINGLE	277
+# define	MULTIPLE	278
+# define	INITINSTANCE	279
+# define	INITGLOBAL	280
+# define	TERMINSTANCE	281
+# define	TERMGLOBAL	282
+# define	ID	283
+# define	NUMBER	284
 
 #line 1 "defparse.y"
  /* defparse.y - parser for .def files */
 
-/*   Copyright 1995, 1997, 1998, 1999 Free Software Foundation, Inc.
+/*  Copyright 1995, 1997, 1998, 1999, 2004
+    Free Software Foundation, Inc.
 
-This file is part of GNU Binutils.
+    This file is part of GNU Binutils.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "bfd.h"
 #include "bucomm.h"
 #include "dlltool.h"
 
-#line 26 "defparse.y"
+#line 27 "defparse.y"
 #ifndef YYSTYPE
 typedef union {
   char *id;
@@ -71,12 +73,12 @@
 
 
 
-#define	YYFINAL		96
+#define	YYFINAL		98
 #define	YYFLAG		-32768
-#define	YYNTBASE	34
+#define	YYNTBASE	35
 
 /* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
-#define YYTRANSLATE(x) ((unsigned)(x) <= 283 ? yytranslate[x] : 55)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 57)
 
 /* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
 static const char yytranslate[] =
@@ -85,9 +87,9 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,    32,     2,    30,     2,     2,     2,
+       2,     2,     2,     2,    33,     2,    31,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    31,     2,     2,    33,     2,     2,     2,     2,     2,
+       2,    32,     2,     2,    34,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -109,42 +111,42 @@
        2,     2,     2,     2,     2,     2,     1,     3,     4,     5,
        6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29
+      26,    27,    28,    29,    30
 };
 
 #if YYDEBUG
 static const short yyprhs[] =
 {
        0,     0,     3,     5,     9,    14,    17,    20,    24,    28,
-      31,    34,    37,    40,    43,    48,    49,    52,    59,    62,
-      64,    72,    80,    86,    92,    98,   104,   108,   112,   115,
-     117,   120,   124,   126,   128,   129,   132,   133,   135,   137,
-     139,   141,   143,   145,   147,   149,   150,   152,   153,   155,
-     156,   158,   162,   163,   166,   167,   170,   175,   176,   180,
-     181,   182,   186,   188,   190,   192
+      31,    34,    37,    40,    43,    48,    49,    52,    60,    63,
+      65,    73,    81,    87,    93,    99,   105,   109,   113,   116,
+     118,   121,   125,   127,   129,   130,   133,   134,   136,   138,
+     140,   142,   144,   146,   148,   150,   151,   153,   154,   156,
+     157,   159,   160,   162,   166,   167,   170,   171,   174,   179,
+     180,   184,   185,   186,   190,   192,   194,   196
 };
 static const short yyrhs[] =
 {
-      34,    35,     0,    35,     0,     3,    49,    52,     0,     4,
-      49,    52,    53,     0,    11,    36,     0,     5,    28,     0,
-       6,    29,    44,     0,     7,    29,    44,     0,     8,    42,
-       0,     9,    42,     0,    10,    40,     0,    12,    38,     0,
-      13,    29,     0,    13,    29,    30,    29,     0,     0,    36,
-      37,     0,    28,    51,    50,    47,    46,    48,     0,    38,
-      39,     0,    39,     0,    28,    31,    28,    30,    28,    30,
-      28,     0,    28,    31,    28,    30,    28,    30,    29,     0,
-      28,    31,    28,    30,    28,     0,    28,    31,    28,    30,
-      29,     0,    28,    30,    28,    30,    28,     0,    28,    30,
-      28,    30,    29,     0,    28,    30,    28,     0,    28,    30,
-      29,     0,    40,    41,     0,    41,     0,    28,    42,     0,
-      42,    43,    45,     0,    45,     0,    32,     0,     0,    32,
-      29,     0,     0,    16,     0,    17,     0,    18,     0,    19,
-       0,    20,     0,    22,     0,    23,     0,    15,     0,     0,
-      21,     0,     0,     9,     0,     0,    28,     0,    28,    30,
-      28,     0,     0,    33,    29,     0,     0,    31,    28,     0,
-      31,    28,    30,    28,     0,     0,    14,    31,    29,     0,
-       0,     0,    53,    43,    54,     0,    24,     0,    25,     0,
-      26,     0,    27,     0
+      35,    36,     0,    36,     0,     3,    51,    54,     0,     4,
+      51,    54,    55,     0,    11,    37,     0,     5,    29,     0,
+       6,    30,    45,     0,     7,    30,    45,     0,     8,    43,
+       0,     9,    43,     0,    10,    41,     0,    12,    39,     0,
+      13,    30,     0,    13,    30,    31,    30,     0,     0,    37,
+      38,     0,    29,    53,    52,    48,    47,    49,    50,     0,
+      39,    40,     0,    40,     0,    29,    32,    29,    31,    29,
+      31,    29,     0,    29,    32,    29,    31,    29,    31,    30,
+       0,    29,    32,    29,    31,    29,     0,    29,    32,    29,
+      31,    30,     0,    29,    31,    29,    31,    29,     0,    29,
+      31,    29,    31,    30,     0,    29,    31,    29,     0,    29,
+      31,    30,     0,    41,    42,     0,    42,     0,    29,    43,
+       0,    43,    44,    46,     0,    46,     0,    33,     0,     0,
+      33,    30,     0,     0,    16,     0,    17,     0,    18,     0,
+      19,     0,    20,     0,    23,     0,    24,     0,    15,     0,
+       0,    21,     0,     0,     9,     0,     0,    22,     0,     0,
+      29,     0,    29,    31,    29,     0,     0,    34,    30,     0,
+       0,    32,    29,     0,    32,    29,    31,    29,     0,     0,
+      14,    32,    30,     0,     0,     0,    55,    44,    56,     0,
+      25,     0,    26,     0,    27,     0,    28,     0
 };
 
 #endif
@@ -153,13 +155,13 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
 static const short yyrline[] =
 {
-       0,    43,    44,    47,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    63,    65,    68,    72,    74,
-      77,    79,    80,    81,    82,    83,    84,    85,    88,    90,
-      93,    97,    99,   102,   104,   106,   107,   110,   112,   113,
-     114,   115,   116,   117,   120,   122,   125,   127,   130,   132,
-     135,   136,   142,   145,   147,   150,   152,   158,   161,   162,
-     165,   167,   170,   172,   173,   174
+       0,    44,    45,    48,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    64,    66,    69,    73,    75,
+      78,    80,    81,    82,    83,    84,    85,    86,    89,    91,
+      94,    98,   100,   103,   105,   107,   108,   111,   113,   114,
+     115,   116,   117,   118,   121,   123,   126,   128,   131,   133,
+     136,   138,   141,   142,   148,   151,   153,   156,   158,   164,
+     167,   168,   171,   173,   176,   178,   179,   180
 };
 #endif
 
@@ -172,38 +174,38 @@
   "$", "error", "$undefined.", "NAME", "LIBRARY", "DESCRIPTION", 
   "STACKSIZE", "HEAPSIZE", "CODE", "DATA", "SECTIONS", "EXPORTS", 
   "IMPORTS", "VERSIONK", "BASE", "CONSTANT", "READ", "WRITE", "EXECUTE", 
-  "SHARED", "NONSHARED", "NONAME", "SINGLE", "MULTIPLE", "INITINSTANCE", 
-  "INITGLOBAL", "TERMINSTANCE", "TERMGLOBAL", "ID", "NUMBER", "'.'", 
-  "'='", "','", "'@'", "start", "command", "explist", "expline", 
-  "implist", "impline", "seclist", "secline", "attr_list", "opt_comma", 
-  "opt_number", "attr", "opt_CONSTANT", "opt_NONAME", "opt_DATA", 
-  "opt_name", "opt_ordinal", "opt_equal_name", "opt_base", "option_list", 
-  "option", 0
+  "SHARED", "NONSHARED", "NONAME", "PRIVATE", "SINGLE", "MULTIPLE", 
+  "INITINSTANCE", "INITGLOBAL", "TERMINSTANCE", "TERMGLOBAL", "ID", 
+  "NUMBER", "'.'", "'='", "','", "'@'", "start", "command", "explist", 
+  "expline", "implist", "impline", "seclist", "secline", "attr_list", 
+  "opt_comma", "opt_number", "attr", "opt_CONSTANT", "opt_NONAME", 
+  "opt_DATA", "opt_PRIVATE", "opt_name", "opt_ordinal", "opt_equal_name", 
+  "opt_base", "option_list", "option", 0
 };
 #endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
 static const short yyr1[] =
 {
-       0,    34,    34,    35,    35,    35,    35,    35,    35,    35,
-      35,    35,    35,    35,    35,    36,    36,    37,    38,    38,
-      39,    39,    39,    39,    39,    39,    39,    39,    40,    40,
-      41,    42,    42,    43,    43,    44,    44,    45,    45,    45,
-      45,    45,    45,    45,    46,    46,    47,    47,    48,    48,
-      49,    49,    49,    50,    50,    51,    51,    51,    52,    52,
-      53,    53,    54,    54,    54,    54
+       0,    35,    35,    36,    36,    36,    36,    36,    36,    36,
+      36,    36,    36,    36,    36,    37,    37,    38,    39,    39,
+      40,    40,    40,    40,    40,    40,    40,    40,    41,    41,
+      42,    43,    43,    44,    44,    45,    45,    46,    46,    46,
+      46,    46,    46,    46,    47,    47,    48,    48,    49,    49,
+      50,    50,    51,    51,    51,    52,    52,    53,    53,    53,
+      54,    54,    55,    55,    56,    56,    56,    56
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
 static const short yyr2[] =
 {
        0,     2,     1,     3,     4,     2,     2,     3,     3,     2,
-       2,     2,     2,     2,     4,     0,     2,     6,     2,     1,
+       2,     2,     2,     2,     4,     0,     2,     7,     2,     1,
        7,     7,     5,     5,     5,     5,     3,     3,     2,     1,
        2,     3,     1,     1,     0,     2,     0,     1,     1,     1,
        1,     1,     1,     1,     1,     0,     1,     0,     1,     0,
-       1,     3,     0,     2,     0,     2,     4,     0,     3,     0,
-       0,     3,     1,     1,     1,     1
+       1,     0,     1,     3,     0,     2,     0,     2,     4,     0,
+       3,     0,     0,     3,     1,     1,     1,     1
 };
 
 /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
@@ -211,81 +213,83 @@
    error. */
 static const short yydefact[] =
 {
-       0,    52,    52,     0,     0,     0,     0,     0,     0,    15,
-       0,     0,     0,     2,    50,    59,    59,     6,    36,    36,
+       0,    54,    54,     0,     0,     0,     0,     0,     0,    15,
+       0,     0,     0,     2,    52,    61,    61,     6,    36,    36,
       37,    38,    39,    40,    41,    42,    43,     9,    32,    10,
        0,    11,    29,     5,     0,    12,    19,    13,     1,     0,
-       0,     3,    60,     0,     7,     8,    33,     0,    30,    28,
-      57,    16,     0,     0,    18,     0,    51,     0,     4,    35,
-      31,     0,    54,    26,    27,     0,    14,    58,     0,    55,
-       0,    47,     0,     0,    62,    63,    64,    65,    61,     0,
-      53,    46,    45,    24,    25,    22,    23,    56,    44,    49,
-       0,    48,    17,    20,    21,     0,     0
+       0,     3,    62,     0,     7,     8,    33,     0,    30,    28,
+      59,    16,     0,     0,    18,     0,    53,     0,     4,    35,
+      31,     0,    56,    26,    27,     0,    14,    60,     0,    57,
+       0,    47,     0,     0,    64,    65,    66,    67,    63,     0,
+      55,    46,    45,    24,    25,    22,    23,    58,    44,    49,
+       0,    48,    51,    20,    21,    50,    17,     0,     0
 };
 
 static const short yydefgoto[] =
 {
       12,    13,    33,    51,    35,    36,    31,    32,    27,    47,
-      44,    28,    89,    82,    92,    15,    71,    62,    41,    58,
-      78
+      44,    28,    89,    82,    92,    96,    15,    71,    62,    41,
+      58,    78
 };
 
 static const short yypact[] =
 {
-      32,   -22,   -22,   -19,   -13,    22,    30,    30,    -6,-32768,
-      26,    38,    21,-32768,    29,    46,    46,-32768,    36,    36,
+      32,   -12,   -12,    17,    -8,    33,    -4,    -4,    35,-32768,
+      36,    37,    21,-32768,    38,    48,    48,-32768,    39,    39,
   -32768,-32768,-32768,-32768,-32768,-32768,-32768,   -15,-32768,   -15,
-      30,    -6,-32768,    41,   -16,    26,-32768,    40,-32768,    43,
-      42,-32768,-32768,    45,-32768,-32768,-32768,    30,   -15,-32768,
-      44,-32768,    -9,    48,-32768,    49,-32768,    50,   -14,-32768,
-  -32768,    52,    39,    47,-32768,    51,-32768,-32768,    31,    53,
-      55,    61,    33,    35,-32768,-32768,-32768,-32768,-32768,    57,
-  -32768,-32768,    71,-32768,-32768,    58,-32768,-32768,-32768,    78,
-      37,-32768,-32768,-32768,-32768,    89,-32768
+      -4,    35,-32768,    41,   -25,    36,-32768,    40,-32768,    44,
+      34,-32768,-32768,    45,-32768,-32768,-32768,    -4,   -15,-32768,
+      42,-32768,   -19,    47,-32768,    49,-32768,    50,    22,-32768,
+  -32768,    52,    43,    51,-32768,    53,-32768,-32768,    26,    54,
+      56,    57,    27,    29,-32768,-32768,-32768,-32768,-32768,    58,
+  -32768,-32768,    68,-32768,-32768,    59,-32768,-32768,-32768,    79,
+      31,-32768,    46,-32768,-32768,-32768,-32768,    89,-32768
 };
 
 static const short yypgoto[] =
 {
-  -32768,    79,-32768,-32768,-32768,    59,-32768,    62,    -7,    34,
-      76,    54,-32768,-32768,-32768,    88,-32768,-32768,    80,-32768,
-  -32768
+  -32768,    80,-32768,-32768,-32768,    60,-32768,    62,    -7,    55,
+      72,    61,-32768,-32768,-32768,-32768,    92,-32768,-32768,    81,
+  -32768,-32768
 };
 
 
-#define	YYLAST		101
+#define	YYLAST		113
 
 
 static const short yytable[] =
 {
-      29,   -34,   -34,   -34,   -34,   -34,    14,   -34,   -34,    17,
-     -34,   -34,   -34,   -34,    52,    53,    18,    46,    46,    63,
-      64,    95,    30,    48,     1,     2,     3,     4,     5,     6,
+      29,   -34,   -34,   -34,   -34,   -34,    52,    53,   -34,   -34,
+      63,    64,    20,    21,    22,    23,    24,    14,    46,    25,
+      26,    97,    18,    48,     1,     2,     3,     4,     5,     6,
        7,     8,     9,    10,    11,     1,     2,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    20,    21,    22,    23,
-      24,    19,    25,    26,    34,    74,    75,    76,    77,    39,
-      40,    83,    84,    85,    86,    93,    94,    37,    43,    50,
-      55,    56,    70,    57,    59,    61,    65,    72,    66,    67,
-      69,    73,    81,    79,    80,    87,    88,    91,    90,    96,
-      16,    38,    68,    49,    54,    45,    42,     0,     0,     0,
-       0,    60
+       6,     7,     8,     9,    10,    11,    17,   -34,   -34,   -34,
+     -34,    74,    75,    76,    77,    46,    83,    84,    85,    86,
+      93,    94,    40,    19,    30,    34,    57,    37,    95,    39,
+      50,    55,    43,    56,    61,    59,    65,    70,    81,    66,
+      67,    69,    72,    88,    73,    79,    80,    87,    91,    98,
+      90,    45,    38,    49,    16,    54,     0,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    60,     0,
+       0,     0,     0,    68
 };
 
 static const short yycheck[] =
 {
-       7,    16,    17,    18,    19,    20,    28,    22,    23,    28,
-      24,    25,    26,    27,    30,    31,    29,    32,    32,    28,
-      29,     0,    28,    30,     3,     4,     5,     6,     7,     8,
+       7,    16,    17,    18,    19,    20,    31,    32,    23,    24,
+      29,    30,    16,    17,    18,    19,    20,    29,    33,    23,
+      24,     0,    30,    30,     3,     4,     5,     6,     7,     8,
        9,    10,    11,    12,    13,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    16,    17,    18,    19,
-      20,    29,    22,    23,    28,    24,    25,    26,    27,    30,
-      14,    28,    29,    28,    29,    28,    29,    29,    32,    28,
-      30,    28,    33,    31,    29,    31,    28,    30,    29,    29,
-      28,    30,    21,    30,    29,    28,    15,     9,    30,     0,
-       2,    12,    58,    31,    35,    19,    16,    -1,    -1,    -1,
-      -1,    47
+       8,     9,    10,    11,    12,    13,    29,    25,    26,    27,
+      28,    25,    26,    27,    28,    33,    29,    30,    29,    30,
+      29,    30,    14,    30,    29,    29,    32,    30,    22,    31,
+      29,    31,    33,    29,    32,    30,    29,    34,    21,    30,
+      30,    29,    31,    15,    31,    31,    30,    29,     9,     0,
+      31,    19,    12,    31,     2,    35,    -1,    16,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    47,    -1,
+      -1,    -1,    -1,    58
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison/bison.simple"
+#line 3 "/usr/share/bison-1.35/bison.simple"
 
 /* Skeleton output parser for bison,
 
@@ -598,7 +602,7 @@
 # endif
 #endif
 
-#line 315 "/usr/share/bison/bison.simple"
+#line 315 "/usr/share/bison-1.35/bison.simple"
 
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
@@ -992,192 +996,200 @@
   switch (yyn) {
 
 case 3:
-#line 48 "defparse.y"
+#line 49 "defparse.y"
 { def_name (yyvsp[-1].id, yyvsp[0].number); }
     break;
 case 4:
-#line 49 "defparse.y"
+#line 50 "defparse.y"
 { def_library (yyvsp[-2].id, yyvsp[-1].number); }
     break;
 case 6:
-#line 51 "defparse.y"
+#line 52 "defparse.y"
 { def_description (yyvsp[0].id);}
     break;
 case 7:
-#line 52 "defparse.y"
+#line 53 "defparse.y"
 { def_stacksize (yyvsp[-1].number, yyvsp[0].number);}
     break;
 case 8:
-#line 53 "defparse.y"
+#line 54 "defparse.y"
 { def_heapsize (yyvsp[-1].number, yyvsp[0].number);}
     break;
 case 9:
-#line 54 "defparse.y"
+#line 55 "defparse.y"
 { def_code (yyvsp[0].number);}
     break;
 case 10:
-#line 55 "defparse.y"
+#line 56 "defparse.y"
 { def_data (yyvsp[0].number);}
     break;
 case 13:
-#line 58 "defparse.y"
+#line 59 "defparse.y"
 { def_version (yyvsp[0].number,0);}
     break;
 case 14:
-#line 59 "defparse.y"
+#line 60 "defparse.y"
 { def_version (yyvsp[-2].number,yyvsp[0].number);}
     break;
 case 17:
-#line 70 "defparse.y"
-{ def_exports (yyvsp[-5].id, yyvsp[-4].id, yyvsp[-3].number, yyvsp[-2].number, yyvsp[-1].number, yyvsp[0].number);}
+#line 71 "defparse.y"
+{ def_exports (yyvsp[-6].id, yyvsp[-5].id, yyvsp[-4].number, yyvsp[-3].number, yyvsp[-2].number, yyvsp[-1].number, yyvsp[0].number);}
     break;
 case 20:
-#line 78 "defparse.y"
+#line 79 "defparse.y"
 { def_import (yyvsp[-6].id,yyvsp[-4].id,yyvsp[-2].id,yyvsp[0].id, 0); }
     break;
 case 21:
-#line 79 "defparse.y"
+#line 80 "defparse.y"
 { def_import (yyvsp[-6].id,yyvsp[-4].id,yyvsp[-2].id, 0,yyvsp[0].number); }
     break;
 case 22:
-#line 80 "defparse.y"
+#line 81 "defparse.y"
 { def_import (yyvsp[-4].id,yyvsp[-2].id, 0,yyvsp[0].id, 0); }
     break;
 case 23:
-#line 81 "defparse.y"
+#line 82 "defparse.y"
 { def_import (yyvsp[-4].id,yyvsp[-2].id, 0, 0,yyvsp[0].number); }
     break;
 case 24:
-#line 82 "defparse.y"
+#line 83 "defparse.y"
 { def_import ( 0,yyvsp[-4].id,yyvsp[-2].id,yyvsp[0].id, 0); }
     break;
 case 25:
-#line 83 "defparse.y"
+#line 84 "defparse.y"
 { def_import ( 0,yyvsp[-4].id,yyvsp[-2].id, 0,yyvsp[0].number); }
     break;
 case 26:
-#line 84 "defparse.y"
+#line 85 "defparse.y"
 { def_import ( 0,yyvsp[-2].id, 0,yyvsp[0].id, 0); }
     break;
 case 27:
-#line 85 "defparse.y"
+#line 86 "defparse.y"
 { def_import ( 0,yyvsp[-2].id, 0, 0,yyvsp[0].number); }
     break;
 case 30:
-#line 94 "defparse.y"
+#line 95 "defparse.y"
 { def_section (yyvsp[-1].id,yyvsp[0].number);}
     break;
 case 35:
-#line 106 "defparse.y"
+#line 107 "defparse.y"
 { yyval.number=yyvsp[0].number;}
     break;
 case 36:
-#line 107 "defparse.y"
+#line 108 "defparse.y"
 { yyval.number=-1;}
     break;
 case 37:
-#line 111 "defparse.y"
+#line 112 "defparse.y"
 { yyval.number = 1; }
     break;
 case 38:
-#line 112 "defparse.y"
+#line 113 "defparse.y"
 { yyval.number = 2; }
     break;
 case 39:
-#line 113 "defparse.y"
+#line 114 "defparse.y"
 { yyval.number = 4; }
     break;
 case 40:
-#line 114 "defparse.y"
+#line 115 "defparse.y"
 { yyval.number = 8; }
     break;
 case 41:
-#line 115 "defparse.y"
+#line 116 "defparse.y"
 { yyval.number = 0; }
     break;
 case 42:
-#line 116 "defparse.y"
+#line 117 "defparse.y"
 { yyval.number = 0; }
     break;
 case 43:
-#line 117 "defparse.y"
+#line 118 "defparse.y"
 { yyval.number = 0; }
     break;
 case 44:
-#line 121 "defparse.y"
+#line 122 "defparse.y"
 {yyval.number=1;}
     break;
 case 45:
-#line 122 "defparse.y"
+#line 123 "defparse.y"
 {yyval.number=0;}
     break;
 case 46:
-#line 126 "defparse.y"
+#line 127 "defparse.y"
 {yyval.number=1;}
     break;
 case 47:
-#line 127 "defparse.y"
+#line 128 "defparse.y"
 {yyval.number=0;}
     break;
 case 48:
-#line 131 "defparse.y"
+#line 132 "defparse.y"
 { yyval.number = 1; }
     break;
 case 49:
-#line 132 "defparse.y"
+#line 133 "defparse.y"
 { yyval.number = 0; }
     break;
 case 50:
-#line 135 "defparse.y"
-{ yyval.id =yyvsp[0].id; }
+#line 137 "defparse.y"
+{ yyval.number = 1; }
     break;
 case 51:
-#line 137 "defparse.y"
+#line 138 "defparse.y"
+{ yyval.number = 0; }
+    break;
+case 52:
+#line 141 "defparse.y"
+{ yyval.id =yyvsp[0].id; }
+    break;
+case 53:
+#line 143 "defparse.y"
 { 
 	    char *name = xmalloc (strlen (yyvsp[-2].id) + 1 + strlen (yyvsp[0].id) + 1);
 	    sprintf (name, "%s.%s", yyvsp[-2].id, yyvsp[0].id);
 	    yyval.id = name;
 	  }
     break;
-case 52:
-#line 142 "defparse.y"
+case 54:
+#line 148 "defparse.y"
 { yyval.id=""; }
     break;
-case 53:
-#line 146 "defparse.y"
+case 55:
+#line 152 "defparse.y"
 { yyval.number=yyvsp[0].number;}
     break;
-case 54:
-#line 147 "defparse.y"
+case 56:
+#line 153 "defparse.y"
 { yyval.number=-1;}
     break;
-case 55:
-#line 151 "defparse.y"
+case 57:
+#line 157 "defparse.y"
 { yyval.id = yyvsp[0].id; }
     break;
-case 56:
-#line 153 "defparse.y"
+case 58:
+#line 159 "defparse.y"
 { 
 	    char *name = xmalloc (strlen (yyvsp[-2].id) + 1 + strlen (yyvsp[0].id) + 1);
 	    sprintf (name, "%s.%s", yyvsp[-2].id, yyvsp[0].id);
 	    yyval.id = name;
 	  }
     break;
-case 57:
-#line 158 "defparse.y"
+case 59:
+#line 164 "defparse.y"
 { yyval.id =  0; }
     break;
-case 58:
-#line 161 "defparse.y"
+case 60:
+#line 167 "defparse.y"
 { yyval.number= yyvsp[0].number;}
     break;
-case 59:
-#line 162 "defparse.y"
+case 61:
+#line 168 "defparse.y"
 { yyval.number=-1;}
     break;
 }
 
-#line 705 "/usr/share/bison/bison.simple"
+#line 705 "/usr/share/bison-1.35/bison.simple"
 
 
   yyvsp -= yylen;
@@ -1408,4 +1420,4 @@
 #endif
   return yyresult;
 }
-#line 176 "defparse.y"
+#line 182 "defparse.y"
Index: binutils/defparse.h
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/binutils/defparse.h,v
retrieving revision 1.1.1.4
diff -u -r1.1.1.4 defparse.h
--- binutils/defparse.h	11 Oct 2002 05:59:35 -0000	1.1.1.4
+++ binutils/defparse.h	5 Jul 2004 22:21:28 -0000
@@ -28,14 +28,15 @@
 # define	SHARED	273
 # define	NONSHARED	274
 # define	NONAME	275
-# define	SINGLE	276
-# define	MULTIPLE	277
-# define	INITINSTANCE	278
-# define	INITGLOBAL	279
-# define	TERMINSTANCE	280
-# define	TERMGLOBAL	281
-# define	ID	282
-# define	NUMBER	283
+# define	PRIVATE	276
+# define	SINGLE	277
+# define	MULTIPLE	278
+# define	INITINSTANCE	279
+# define	INITGLOBAL	280
+# define	TERMINSTANCE	281
+# define	TERMGLOBAL	282
+# define	ID	283
+# define	NUMBER	284
 
 
 extern YYSTYPE yylval;
Index: binutils/defparse.y
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/binutils/defparse.y,v
retrieving revision 1.1.1.5
diff -u -r1.1.1.5 defparse.y
--- binutils/defparse.y	27 Jan 2002 11:58:26 -0000	1.1.1.5
+++ binutils/defparse.y	5 Jul 2004 22:21:28 -0000
@@ -1,22 +1,23 @@
 %{ /* defparse.y - parser for .def files */
 
-/*   Copyright 1995, 1997, 1998, 1999 Free Software Foundation, Inc.
+/*  Copyright 1995, 1997, 1998, 1999, 2004
+    Free Software Foundation, Inc.
 
-This file is part of GNU Binutils.
+    This file is part of GNU Binutils.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "bfd.h"
 #include "bucomm.h"
@@ -30,11 +31,11 @@
 
 %token NAME, LIBRARY, DESCRIPTION, STACKSIZE, HEAPSIZE, CODE, DATA
 %token SECTIONS, EXPORTS, IMPORTS, VERSIONK, BASE, CONSTANT
-%token READ WRITE EXECUTE SHARED NONSHARED NONAME
+%token READ WRITE EXECUTE SHARED NONSHARED NONAME PRIVATE
 %token SINGLE MULTIPLE INITINSTANCE INITGLOBAL TERMINSTANCE TERMGLOBAL
 %token <id> ID
 %token <number> NUMBER
-%type  <number> opt_base opt_ordinal opt_NONAME opt_CONSTANT opt_DATA
+%type  <number> opt_base opt_ordinal opt_NONAME opt_CONSTANT opt_DATA opt_PRIVATE
 %type  <number> attr attr_list opt_number
 %type  <id> opt_name opt_equal_name 
 
@@ -66,8 +67,8 @@
 	;
 
 expline:
-		ID opt_equal_name opt_ordinal opt_NONAME opt_CONSTANT opt_DATA
-			{ def_exports ($1, $2, $3, $4, $5, $6);}
+		ID opt_equal_name opt_ordinal opt_NONAME opt_CONSTANT opt_DATA opt_PRIVATE
+			{ def_exports ($1, $2, $3, $4, $5, $6, $7);}
 	;
 implist:	
 		implist impline
@@ -132,6 +133,11 @@
 	|	     { $$ = 0; }
 	;
 
+opt_PRIVATE:
+		PRIVATE { $$ = 1; }
+	|		{ $$ = 0; }
+	;
+
 opt_name: ID		{ $$ =$1; }
 	| ID '.' ID	
 	  { 
Index: binutils/rcparse.y
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/binutils/rcparse.y,v
retrieving revision 1.1.1.7
diff -u -r1.1.1.7 rcparse.y
--- binutils/rcparse.y	11 Oct 2002 05:59:40 -0000	1.1.1.7
+++ binutils/rcparse.y	5 Jul 2004 22:21:29 -0000
@@ -1,5 +1,5 @@
 %{ /* rcparse.y -- parser for Windows rc files
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
 
    This file is part of GNU Binutils.
@@ -52,6 +52,11 @@
 static unsigned long base_style;
 static unsigned long default_style;
 static unsigned long class;
+static struct res_id res_text_field;
+
+/* This is used for COMBOBOX, LISTBOX and EDITTEXT which
+   do not allow resource 'text' field in control definition. */
+static const struct res_id res_null_text = { 1, {{0, L""}}};
 
 %}
 
@@ -135,11 +140,11 @@
 %type <vervar> vertrans
 %type <res_info> suboptions memflags_move_discard memflags_move
 %type <memflags> memflag
-%type <id> id resref
+%type <id> id optresidc resref
 %type <il> exstyle parennumber
 %type <il> numexpr posnumexpr cnumexpr optcnumexpr cposnumexpr
 %type <is> acc_options acc_option menuitem_flags menuitem_flag
-%type <s> optstringc file_name resname
+%type <s> file_name resname
 %type <i> sizednumexpr sizedposnumexpr
 
 %left '|'
@@ -533,70 +538,78 @@
 	;
 
 control:
-	  AUTO3STATE
+	  AUTO3STATE optresidc
 	    {
 	      default_style = BS_AUTO3STATE | WS_TABSTOP;
 	      base_style = BS_AUTO3STATE;
 	      class = CTL_BUTTON;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	  }
-	| AUTOCHECKBOX
+	| AUTOCHECKBOX optresidc
 	    {
 	      default_style = BS_AUTOCHECKBOX | WS_TABSTOP;
 	      base_style = BS_AUTOCHECKBOX;
 	      class = CTL_BUTTON;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	  }
-	| AUTORADIOBUTTON
+	| AUTORADIOBUTTON optresidc
 	    {
 	      default_style = BS_AUTORADIOBUTTON | WS_TABSTOP;
 	      base_style = BS_AUTORADIOBUTTON;
 	      class = CTL_BUTTON;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	  }
-	| BEDIT
+	| BEDIT optresidc
 	    {
 	      default_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
 	      base_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
 	      class = CTL_EDIT;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	    if (dialog.ex == NULL)
 	      rcparse_warning (_("BEDIT requires DIALOGEX"));
 	    res_string_to_id (&$$->class, "BEDIT");
 	  }
-	| CHECKBOX
+	| CHECKBOX optresidc
 	    {
 	      default_style = BS_CHECKBOX | WS_TABSTOP;
 	      base_style = BS_CHECKBOX | WS_TABSTOP;
 	      class = CTL_BUTTON;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	  }
 	| COMBOBOX
 	    {
+	      /* This is as per MSDN documentation.  With some (???)
+		 versions of MS rc.exe their is no default style.  */
 	      default_style = CBS_SIMPLE | WS_TABSTOP;
 	      base_style = 0;
 	      class = CTL_COMBOBOX;
+	      res_text_field = res_null_text;	
 	    }
 	    control_params
 	  {
 	    $$ = $3;
 	  }
-	| CONTROL optstringc numexpr cnumexpr control_styleexpr cnumexpr
+	| CONTROL optresidc numexpr cnumexpr control_styleexpr cnumexpr
 	    cnumexpr cnumexpr cnumexpr optcnumexpr opt_control_data
 	  {
 	    $$ = define_control ($2, $3, $6, $7, $8, $9, $4, style, $10);
@@ -607,7 +620,7 @@
 		$$->data = $11;
 	      }
 	  }
-	| CONTROL optstringc numexpr cnumexpr control_styleexpr cnumexpr
+	| CONTROL optresidc numexpr cnumexpr control_styleexpr cnumexpr
 	    cnumexpr cnumexpr cnumexpr cnumexpr cnumexpr opt_control_data
 	  {
 	    $$ = define_control ($2, $3, $6, $7, $8, $9, $4, style, $10);
@@ -616,7 +629,7 @@
 	    $$->help = $11;
 	    $$->data = $12;
 	  }
-	| CONTROL optstringc numexpr ',' QUOTEDSTRING control_styleexpr
+	| CONTROL optresidc numexpr ',' QUOTEDSTRING control_styleexpr
 	    cnumexpr cnumexpr cnumexpr cnumexpr optcnumexpr opt_control_data
 	  {
 	    $$ = define_control ($2, $3, $7, $8, $9, $10, 0, style, $11);
@@ -629,7 +642,7 @@
 	    $$->class.named = 1;
   	    unicode_from_ascii (&$$->class.u.n.length, &$$->class.u.n.name, $5);
 	  }
-	| CONTROL optstringc numexpr ',' QUOTEDSTRING control_styleexpr
+	| CONTROL optresidc numexpr ',' QUOTEDSTRING control_styleexpr
 	    cnumexpr cnumexpr cnumexpr cnumexpr cnumexpr cnumexpr opt_control_data
 	  {
 	    $$ = define_control ($2, $3, $7, $8, $9, $10, 0, style, $11);
@@ -640,55 +653,60 @@
 	    $$->class.named = 1;
   	    unicode_from_ascii (&$$->class.u.n.length, &$$->class.u.n.name, $5);
 	  }
-	| CTEXT
+	| CTEXT optresidc
 	    {
 	      default_style = SS_CENTER | WS_GROUP;
 	      base_style = SS_CENTER;
 	      class = CTL_STATIC;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	  }
-	| DEFPUSHBUTTON
+	| DEFPUSHBUTTON optresidc
 	    {
 	      default_style = BS_DEFPUSHBUTTON | WS_TABSTOP;
 	      base_style = BS_DEFPUSHBUTTON | WS_TABSTOP;
 	      class = CTL_BUTTON;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	  }
 	| EDITTEXT
 	    {
 	      default_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
 	      base_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
 	      class = CTL_EDIT;
+	      res_text_field = res_null_text;	
 	    }
 	    control_params
 	  {
 	    $$ = $3;
 	  }
-	| GROUPBOX
+	| GROUPBOX optresidc
 	    {
 	      default_style = BS_GROUPBOX;
 	      base_style = BS_GROUPBOX;
 	      class = CTL_BUTTON;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	  }
-	| HEDIT
+	| HEDIT optresidc
 	    {
 	      default_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
 	      base_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
 	      class = CTL_EDIT;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	    if (dialog.ex == NULL)
 	      rcparse_warning (_("IEDIT requires DIALOGEX"));
 	    res_string_to_id (&$$->class, "HEDIT");
@@ -716,15 +734,16 @@
 	    $$ = define_icon_control ($2, $3, $4, $5, style, $9, $10, $11,
 				      dialog.ex);
           }
-	| IEDIT
+	| IEDIT optresidc
 	    {
 	      default_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
 	      base_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
 	      class = CTL_EDIT;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	    if (dialog.ex == NULL)
 	      rcparse_warning (_("IEDIT requires DIALOGEX"));
 	    res_string_to_id (&$$->class, "IEDIT");
@@ -734,22 +753,24 @@
 	      default_style = LBS_NOTIFY | WS_BORDER;
 	      base_style = LBS_NOTIFY | WS_BORDER;
 	      class = CTL_LISTBOX;
+	      res_text_field = res_null_text;	
 	    }
 	    control_params
 	  {
 	    $$ = $3;
 	  }
-	| LTEXT
+	| LTEXT optresidc
 	    {
 	      default_style = SS_LEFT | WS_GROUP;
 	      base_style = SS_LEFT;
 	      class = CTL_STATIC;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	  }
-	| PUSHBOX
+	| PUSHBOX optresidc
 	    {
 	      default_style = BS_PUSHBOX | WS_TABSTOP;
 	      base_style = BS_PUSHBOX;
@@ -757,65 +778,70 @@
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	  }
-	| PUSHBUTTON
+	| PUSHBUTTON optresidc
 	    {
 	      default_style = BS_PUSHBUTTON | WS_TABSTOP;
 	      base_style = BS_PUSHBUTTON | WS_TABSTOP;
 	      class = CTL_BUTTON;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	  }
-	| RADIOBUTTON
+	| RADIOBUTTON optresidc
 	    {
 	      default_style = BS_RADIOBUTTON | WS_TABSTOP;
 	      base_style = BS_RADIOBUTTON;
 	      class = CTL_BUTTON;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	  }
-	| RTEXT
+	| RTEXT optresidc
 	    {
 	      default_style = SS_RIGHT | WS_GROUP;
 	      base_style = SS_RIGHT;
 	      class = CTL_STATIC;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	  }
 	| SCROLLBAR
 	    {
 	      default_style = SBS_HORZ;
 	      base_style = 0;
 	      class = CTL_SCROLLBAR;
+	      res_text_field = res_null_text;	
 	    }
 	    control_params
 	  {
 	    $$ = $3;
 	  }
-	| STATE3
+	| STATE3 optresidc
 	    {
 	      default_style = BS_3STATE | WS_TABSTOP;
 	      base_style = BS_3STATE;
 	      class = CTL_BUTTON;
+	      res_text_field = $2;	
 	    }
 	    control_params
 	  {
-	    $$ = $3;
+	    $$ = $4;
 	  }
-	| USERBUTTON QUOTEDSTRING ',' numexpr ',' numexpr ',' numexpr ','
+	| USERBUTTON resref numexpr ',' numexpr ',' numexpr ','
 	    numexpr ',' numexpr ',' 
 	    { style = WS_CHILD | WS_VISIBLE; }
 	    styleexpr optcnumexpr
 	  {
-	    $$ = define_control ($2, $4, $6, $8, $10, $12, CTL_BUTTON,
-				 style, $16);
+	    $$ = define_control ($2, $3, $5, $7, $9, $11, CTL_BUTTON,
+				 style, $15);
 	  }
 	;
 
@@ -827,52 +853,56 @@
    style.  CLASS is the class of the control.  */
 
 control_params:
-	  optstringc numexpr cnumexpr cnumexpr cnumexpr cnumexpr
-	    opt_control_data
+	  numexpr cnumexpr cnumexpr cnumexpr cnumexpr opt_control_data
 	  {
-	    $$ = define_control ($1, $2, $3, $4, $5, $6, class,
+	    $$ = define_control (res_text_field, $1, $2, $3, $4, $5, class,
 				 default_style | WS_CHILD | WS_VISIBLE, 0);
-	    if ($7 != NULL)
+	    if ($6 != NULL)
 	      {
 		if (dialog.ex == NULL)
 		  rcparse_warning (_("control data requires DIALOGEX"));
-		$$->data = $7;
+		$$->data = $6;
 	      }
 	  }
-	| optstringc numexpr cnumexpr cnumexpr cnumexpr cnumexpr
+	| numexpr cnumexpr cnumexpr cnumexpr cnumexpr
 	    control_params_styleexpr optcnumexpr opt_control_data
 	  {
-	    $$ = define_control ($1, $2, $3, $4, $5, $6, class, style, $8);
-	    if ($9 != NULL)
+	    $$ = define_control (res_text_field, $1, $2, $3, $4, $5, class, style, $7);
+	    if ($8 != NULL)
 	      {
 		if (dialog.ex == NULL)
 		  rcparse_warning (_("control data requires DIALOGEX"));
-		$$->data = $9;
+		$$->data = $8;
 	      }
 	  }
-	| optstringc numexpr cnumexpr cnumexpr cnumexpr cnumexpr
+	| numexpr cnumexpr cnumexpr cnumexpr cnumexpr
 	    control_params_styleexpr cnumexpr cnumexpr opt_control_data
 	  {
-	    $$ = define_control ($1, $2, $3, $4, $5, $6, class, style, $8);
+	    $$ = define_control (res_text_field, $1, $2, $3, $4, $5, class, style, $7);
 	    if (dialog.ex == NULL)
 	      rcparse_warning (_("help ID requires DIALOGEX"));
-	    $$->help = $9;
-	    $$->data = $10;
+	    $$->help = $8;
+	    $$->data = $9;
 	  }
 	;
 
-optstringc:
+optresidc:
 	  /* empty */
 	  {
-	    $$ = NULL;
+	    res_string_to_id (&$$, "");
+	  }
+	| posnumexpr ','
+	  {
+	    $$.named = 0;
+	    $$.u.id = $1;
 	  }
 	| QUOTEDSTRING
 	  {
-	    $$ = $1;
+	    res_string_to_id (&$$, $1);
 	  }
 	| QUOTEDSTRING ','
 	  {
-	    $$ = $1;
+	    res_string_to_id (&$$, $1);
 	  }
 	;
 
@@ -1732,8 +1762,7 @@
 /* Set the language from the command line.  */
 
 void
-rcparse_set_language (lang)
-     int lang;
+rcparse_set_language (int lang)
 {
   language = lang;
 }
Index: binutils/sysinfo.y
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/binutils/sysinfo.y,v
retrieving revision 1.1.1.4
diff -u -r1.1.1.4 sysinfo.y
--- binutils/sysinfo.y	27 Jan 2002 11:58:35 -0000	1.1.1.4
+++ binutils/sysinfo.y	5 Jul 2004 22:21:29 -0000
@@ -1,4 +1,4 @@
-/* Copyright 2001 Free Software Foundation, Inc.
+/* Copyright 2001, 2003 Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support (steve@cygnus.com).
 
 This file is part of GNU binutils.
@@ -406,7 +406,7 @@
 %%
 /* four modes
 
-   -d write structure defintions for sysroff in host format
+   -d write structure definitions for sysroff in host format
    -i write functions to swap into sysroff format in
    -o write functions to swap into sysroff format out
    -c write code to print info in human form */
@@ -415,9 +415,7 @@
 char writecode;
 
 int 
-main(ac,av)
-int ac;
-char **av;
+main (int ac, char **av)
 {
   yydebug=0;
   if (ac > 1)
@@ -434,8 +432,7 @@
 }
 
 int
-yyerror(s)
-     char *s;
+yyerror (char *s)
 {
   fprintf(stderr, "%s\n" , s);
   return 0;
Index: binutils/syslex.l
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/binutils/syslex.l,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 syslex.l
--- binutils/syslex.l	26 Jun 2001 16:56:06 -0000	1.1.1.2
+++ binutils/syslex.l	5 Jul 2004 22:21:29 -0000
@@ -1,5 +1,5 @@
 %{
-/* Copyright 2001 Free Software Foundation, Inc.
+/* Copyright 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
 
@@ -24,7 +24,7 @@
 int unit;
 
 #ifndef yywrap
-static int yywrap () { return 1; }
+static int yywrap (void) { return 1; }
 #endif
 %}
 %%
Index: config/ChangeLog
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/config/ChangeLog,v
retrieving revision 1.1.1.6
diff -u -r1.1.1.6 ChangeLog
--- config/ChangeLog	11 Oct 2002 05:59:52 -0000	1.1.1.6
+++ config/ChangeLog	14 Jan 2004 13:41:37 -0000
@@ -1,3 +1,82 @@
+2004-01-14  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* acinclude.m4: Quote names of macros to be defined by AC_DEFUN
+	throughout.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2003-10-14  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* gettext.m4: Properly quote arguments to AC_DEFUN.
+
+2003-09-24  Daniel Jacobowitz  <drow@mvista.com>
+
+	* acx.m4 (AC_PROG_CPP_WERROR): New.
+
+2003-08-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* no-executables.m4: New file.
+
+2003-07-07  Zack Weinberg  <zack@codesourcery.com>
+
+	* gettext.m4: Delete all former contents.
+	(ZW_GNU_GETTEXT_SISTER_DIR): New macro.
+	* progtest.m4: New file.
+
+2003-07-04  Zack Weinberg  <zack@codesourcery.com>
+
+	* gettext.m4: New file - copy of gettext.m4 from binutils
+	CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
+
+2003-05-14  Kelley Cook  <kelleycook@wideopenwest.com>
+
+	* acinclude.m4: Accept i[3456789]86 for machine type.
+
+2003-05-18  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* acx.m4: Introduce _GCC_TOPLEV_NONCANONICAL_BUILD,
+	_GCC_TOPLEV_NONCANOICAL_HOST, _GCC_TOPLEV_NONCANONICAL_TARGET,
+	GCC_TOPLEV_SUBDIRS.
+
+2003-03-04  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* mh-dgux: Delete.
+
+2002-12-28  Alexandre Oliva  <aoliva@redhat.com>
+
+	* acx.m4: Name cache variables properly.
+	(NCN_STRICT_CHECK_TOOL): If program is not found and
+	value-if-not-found is empty, use ${ncn_tool_prefix}$2 or $2,
+	depending on whether build != host or not.
+	(NCN_STRICT_CHECK_TARGET_TOOL): Ditto, with the target prefix.
+
+2002-12-28  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* acx.m4: New.
+	* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
+	mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
+	mh-riscos, mh-sysv: Delete.
+	* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
+	mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
+
+2002-12-16  Christopher Faylor  <cgf@redhat.com>
+
+	* mh-cygwin: Don't build libtermcap if it doesn't exist.
+
+2002-12-22  Geoffrey Keating  <geoffk@apple.com>
+
+	* mt-aix43: Delete.
+
+2002-11-23  H.J. Lu <hjl@gnu.org>
+
+	* accross.m4: New.
+
+2002-11-10  Stan Shebs  <shebs@apple.com>
+
+	Retire common MPW configury bits.
+	* mpw-mh-mpw: Remove.
+	* mpw: Remove directory along with all of its files.
+
 2002-05-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	* acinclude.m4: Allow for PWDCMD to override hardcoded pwd.
@@ -10,33 +89,33 @@
 
 2002-04-29  Nathanael Nerode  <neroden@twcny.rr.com>
 
-	* config/mh-cxux: remove dead code
-	* config/mh-dgux386: remove dead code
-	* config/mh-hp300: remove dead code
-	* config/mh-hpux: remove dead code
-	* config/mh-hpux8: remove dead code
-	* config/mh-irix5: remove dead code
-	* config/mh-irix6: remove dead code
-	* config/mh-ncr3000: remove dead code
-	* config/mh-ncrsvr43: remove dead code
-	* config/mh-necv4: remove dead code
-	* config/mh-sco: remove dead code
-	* config/mh-solaris: remove dead code
-	* config/mh-sysv: remove dead code
-	* config/mh-sysv4: remove dead code
-	* config/mh-sysv5: remove dead code
-	* config/mh-irix4: remove, contains only dead code
-
-	* config/mt-armpic: Delete.
-	* config/mt-elfalphapic: Delete.
-	* config/mt-i370pic: Delete.
-	* config/mt-ia64pic: Delete.
-	* config/mt-m68kpic: Delete.
-	* config/mt-papic: Delete.
-	* config/mt-ppcpic: Delete.
-	* config/mt-s390pic: Delete.
-	* config/mt-sparcpic: Delete.
-	* config/mt-x86pic: Delete.
+	* mh-cxux: remove dead code
+	* mh-dgux386: remove dead code
+	* mh-hp300: remove dead code
+	* mh-hpux: remove dead code
+	* mh-hpux8: remove dead code
+	* mh-irix5: remove dead code
+	* mh-irix6: remove dead code
+	* mh-ncr3000: remove dead code
+	* mh-ncrsvr43: remove dead code
+	* mh-necv4: remove dead code
+	* mh-sco: remove dead code
+	* mh-solaris: remove dead code
+	* mh-sysv: remove dead code
+	* mh-sysv4: remove dead code
+	* mh-sysv5: remove dead code
+	* mh-irix4: remove, contains only dead code
+
+	* mt-armpic: Delete.
+	* mt-elfalphapic: Delete.
+	* mt-i370pic: Delete.
+	* mt-ia64pic: Delete.
+	* mt-m68kpic: Delete.
+	* mt-papic: Delete.
+	* mt-ppcpic: Delete.
+	* mt-s390pic: Delete.
+	* mt-sparcpic: Delete.
+	* mt-x86pic: Delete.
 
 2002-04-19  Nathanael Nerode  <neroden@twcny.rr.com>
 
@@ -94,13 +173,17 @@
 2000-07-21  Andrew Haley  <aph@cygnus.com>
 
 	* mh-ia64pic: New file.
-	* mt-ia64pic: New file.	
+	* mt-ia64pic: New file.
 
 2001-02-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
 	* mh-s390pic: New file.
 	* mt-s390pic: New file.
 
+2000-09-26  David Edelsohn  <edelsohn@gnu.org>
+
+	* mt-aix43 (NM_FOR_TARGET): Add -B bsd-style flag.
+
 2000-07-14  Mark P Mitchell  <mark@codesourcery.com>
 
 	* mh-irix6 (CC): Don't set it.
@@ -121,7 +204,7 @@
 
 2000-02-22  Nick Clifton  <nickc@cygnus.com>
 
-	* config/mt-wince: new file: Makefile fragment for WinCE targets.
+	* mt-wince: new file: Makefile fragment for WinCE targets.
 
 2000-01-06  Geoff Keating  <geoffk@cygnus.com>
 
@@ -136,6 +219,15 @@
 
 	* mt-d30v: New file, pass -g -Os -Wa,-C as default options.
 
+Thu Mar 18 00:17:50 1999  Mark Elbrecht <snowball3@usa.net>
+
+	* mh-go32: Delete.
+	* mh-djgpp: New. Renamed from mh-go32.
+
+Wed Feb 24 12:52:17 1999  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mh-windows: Ditto.
+
 1999-02-08  Syd Polk  <spolk@cygnus.com>
 
 	* acinclude.m4: Added macros to find itcl files.
@@ -149,11 +241,23 @@
 	* mh-armpic: New file.  Patch from Jim Pick <jim@jimpick.com>.
 	* mt-armpic: Likewise.
 
+Sat Jan 30 08:04:00 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* mh-interix: New file.
+
 Mon Jan 18 19:41:08 1999  Christopher Faylor <cgf@cygnus.com>
 
 	* cygwin.mh: Activate commented out dependencies for
 	gdb: libtermcap.
 
+Wed Dec 30 20:34:52 1998  Christopher Faylor <cgf@cygnus.com>
+
+	* mt-cygwin: Remove.
+
+Wed Dec 30 01:13:03 1998  Christopher Faylor <cgf@cygnus.com>
+
+	* mt-cygwin: New file.  libtermcap target info.
+
 Wed Nov 18 20:29:46 1998  Christopher Faylor <cgf@cygnus.com>
 
 	* cygwin.mh: Add extra libtermcap target information.
@@ -162,8 +266,8 @@
 
 Mon Nov  2 15:15:33 1998  Geoffrey Noer  <noer@cygnus.com>
 
-        * mh-cygwin32: delete
-        * mh-cygwin: was mh-cygwin32
+	* mh-cygwin32: delete
+	* mh-cygwin: was mh-cygwin32
 
 1998-10-26  Syd Polk  <spolk@cygnus.com>
 
@@ -190,7 +294,7 @@
 1998-05-29  Rob Savoye  <rob@chinadoll.cygnus.com>
 
 	* acinclude.m4: New collection of generic autoconf macros.
-	
+
 Wed Apr 22 12:24:28 1998  Michael Meissner  <meissner@cygnus.com>
 
 	* mt-ospace: New file, support using -Os instead of -O2 to compile
@@ -208,10 +312,29 @@
 
 	* mh-cygwin32: stop configuring and building dosrel.
 
+Fri Feb  6 01:33:52 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* mh-sparcpic (PICFLAG): Define to properly according
+	to current multilib configuration.
+	* mt-sparcpic (PICFLAG_FOR_TARGET): Define to properly
+	according to current multilib configuration.
+
+Sun Jan  4 01:06:55 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* mh-mingw32: New file.
+
 Thu Sep 11 16:43:27 1997  Jim Wilson  <wilson@cygnus.com>
 
 	* mh-elfalphapic, mt-elfalphapic: New files.
 
+1997-09-15 02:37  Ulrich Drepper  <drepper@cygnus.com>
+
+	* mt-linux: Define CXXFLAGS to make sure -fvtable-thunks is used.
+
+Sun Sep 14 20:53:42 1997  Geoffrey Noer  <noer@cygnus.com>
+
+	* mh-cygwin32: ok to build split texinfo files
+
 Wed Jul 23 12:32:18 1997  Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>
 
 	* mh-go32 (CFLAGS): Don't set -fno-omit-frame-pointer.
@@ -233,8 +356,8 @@
 
 Wed Jan  8 19:56:43 1997  Geoffrey Noer  <noer@cygnus.com>
 
-        * mh-cygwin32: override CFLAGS so debug info isn't included
-        in cygwin32-hosted tools by default
+	* mh-cygwin32: override CFLAGS so debug info isn't included
+	in cygwin32-hosted tools by default
 
 Tue Dec 31 16:04:26 1996  Ian Lance Taylor  <ian@cygnus.com>
 
@@ -244,6 +367,20 @@
 
 	* mt-ppc: Delete file, options moved to newlib configure.
 
+Mon Oct 28 17:32:46 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* mh-windows:  Add rules for building MSVC makefiles.
+
+Thu Oct 24 09:02:07 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* mh-windows (HOST_FLAGS):  Set srcroot, which is needed
+	for MSVC build procedure.
+
+Tue Oct  8 08:32:48 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* mh-windows:  Add support for windows host
+	(that is a build done under the Microsoft build environment).
+
 Fri Oct  4 12:21:03 1996  Angela Marie Thomas (angela@cygnus.com)
 
 	* mh-dgux386: New file.  x86 dgux specific flags
@@ -257,6 +394,11 @@
 
 	* mh-cygwin32: don't -D_WIN32 here anymore
 
+Sun Aug 11 20:51:50 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* mh-cygwin32 (CFLAGS):  Define _WIN32 to be compatible
+	with normal Windows compilation environment.
+
 Thu Aug 15 19:46:44 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw-mh-mpw (SEGFLAG_68K, SEGFLAG_PPC): Remove.
@@ -326,13 +468,28 @@
 
 	* mh-ncrsvr43 (CFLAGS): Remove -Hnocopyr.
 
+Thu Nov 30 14:45:25 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* mt-v810 (CC_FOR_TARGET): Add -ansi flag.  NEC compiler
+	defaults to K&R mode, but doesn't have varargs.h, so we have to
+	compile in ANSI mode.
+
+Wed Nov 29 13:49:08 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* mt-v810 (CC_FOR_TARGET, AS_FOR_TARGET, AR_FOR_TARGET,
+	RANLIB_FOR_TARGET): Set as appropriate for NEC v810 toolchain.
+
+Tue Nov 14 15:03:12 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* mh-i386win32: add LD_FOR_TARGET.
+
 Tue Nov  7 15:41:30 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw-mh-mpw (CC_MWC68K, CC_MWCPPC): Remove unused include path.
 	(CC_MWCPPC): Add -mpw_chars, disable warnings, add comments
 	explaining reasons for various flags.
 	(EXTRALIBS_PPC, EXTRALIBS_MWCPPC ): Put runtime library first.
-	
+
 Fri Oct 13 14:44:25 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
 	* mh-aix, mh-sun:  Removed.
@@ -341,7 +498,7 @@
 
 	* mh-sco, mh-solaris, mh-sysv4 (X11_EXTRA_LIBS): Define.
 
-        * mh-hp300, mh-hpux, mh-hpux8, mh-solaris, mh-sun3, mh-sysv4: Don't 
+	* mh-hp300, mh-hpux, mh-hpux8, mh-solaris, mh-sun3, mh-sysv4: Don't
 	hardcode location of X stuff here.
 
 Thu Sep 28 13:14:56 1995  Stan Shebs  <shebs@andros.cygnus.com>
@@ -350,6 +507,10 @@
 	compilers, add definitions for library and link steps for
 	PowerMacs.
 
+Sat Sep 16 18:31:08 PDT 1995  Angela Marie Thomas <angela@cygnus.com>
+
+	* mh-ncrsvr43: Removed AR_FLAGS
+
 Thu Sep 14 08:20:04 1995  Fred Fish  <fnf@cygnus.com>
 
 	* mh-hp300 (CC): Add "CC = cc -Wp,-H256000" to avoid
@@ -364,10 +525,14 @@
 
 	* mpw-mh-mpw (CC): Define ANSI_PROTOTYPES.
 
+Mon Jun  5 18:26:36 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* m?-*pic: Define PICFLAG* instead of LIB*FLAGS*.
+
 Mon Apr 10 12:29:48 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw-mh-mpw (EXTRALIBS): Always link in Math.o, CSANELIB.o,
-        and ToolLibs.o.
+	and ToolLibs.o.
 
 	* mpw-mh-mpw (CC): Define ALMOST_STDC.
 	(CFLAGS): Remove ALMOST_STDC, -mc68881.
@@ -382,6 +547,15 @@
 
 	* mt-netware: New file.
 
+Tue Mar 28 14:47:34 1995  Jason Molenda (crash@phydeaux.cygnus.com)
+
+	Revert this change:
+
+	Mon Mar 29 19:59:26 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+		* mh-solaris: SunPRO C needs -Xs to be able to get a
+		working xmakefile for Emacs.
+
 Mon Mar 13 12:31:29 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* mh-hpux8: New file.
@@ -396,6 +570,10 @@
 
 	* m?-*pic (LIBCXXFLAGS): Add -fno-implicit-templates.
 
+Sat Nov  5 18:43:30 1994  Jason Merrill  (jason@phydeaux.cygnus.com)
+
+	* m[th]-*pic: Support --enable-shared.
+
 Thu Nov  3 17:27:19 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
 
 	* mh-irix4 (CC): Increase maximum string length.
@@ -417,6 +595,15 @@
 	* mh-hpux (CC): Add -Wp,-H256000 to avoid "too much defining"
 	errors from the HPUX 8 compilers.
 
+Fri May  6 14:19:25 1994  Steve Chamberlain  (sac@cygnus.com)
+
+	* mh-go32: New fragment.
+
+Thu May  5 20:06:45 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* mh-lynxrs6k: Renamed from mh-lynxosrs6k, to make it
+	unique in 8.3 naming schemes.
+
 Wed May  4 20:14:47 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
 
 	* mh-lynxrs6k: set SHELL to /bin/bash
@@ -425,10 +612,18 @@
 
 	* mh-irix4 (CC): Change -XNh1500 to -XNh2000.
 
+Mon Jan 31 18:40:55 1994  Stu Grossman  (grossman at cygnus.com)
+
+	* mh-lynxosrs6k:  Account for lack of ranlib!
+
 Sat Dec 25 20:03:45 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
 	* mt-hppa: Delete.
 
+Thu Dec  2 14:35:54 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* mh-irix5: New file for Irix 5.
+
 Tue Nov 16 22:54:39 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* mh-a68bsd: Define CC to gcc.
@@ -480,16 +675,62 @@
 
 	* mh-sysv4 (INSTALL): Use cp, not /usr/ucb/install.
 
+Sat Apr 17 17:19:50 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-delta88: remove extraneous GCC references
+
 Thu Apr  8 11:21:52 1993  Ian Lance Taylor  (ian@cygnus.com)
 
 	* mt-a29k, mt-ebmon29k, mt-os68k, mt-ose68000, mt-ose68k,
 	mt-vxworks68, mt-vxworks960: Removed obsolete, unused target
 	Makefile fragment files.
 
+Wed Mar 31 12:31:56 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* mh-irix4: Bump -XNh value to 1500 to match gcc requirements.
+
+Mon Mar 29 19:59:26 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-sun3: cc needs -J to compile cp-parse.c correctly
+
+	* mh-solaris: SunPRO C needs -Xs to be able to get a
+	working xmakefile for Emacs.
+
 Mon Mar  8 15:05:25 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
 
 	* mh-aix386: New file; old mh-aix, plus no-op RANLIB.
 
+Tue Mar  2 21:15:58 1993  Fred Fish  (fnf@cygnus.com)
+
+	* mh-vaxult2:  New file.
+
+Sat Jan 23 20:32:01 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-sco: define X11_LIB to the mess that SCO ODT requires
+
+Tue Dec 29 15:06:00 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* mh-sco: Don't override BISON definition.
+
+Mon Dec  7 06:43:27 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-sco: don't default $(CC) to gcc
+
+Mon Nov 30 14:54:34 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-solaris: rework standard X location to use
+	$OPENWINHOME, if defined.
+
+	* mh-sun: handle X11 include locations
+
+	* mh-decstation: define NeedFunctionPrototypes to 0, to
+	work around dain-bramaged DECwindows include files
+
+Fri Nov 27 18:35:54 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-hpux, mh-solaris: define the "standard" locations for
+	the vendor supplied X11 headers and libraries
+
 Thu Oct  1 13:50:48 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* mh-solaris: INSTALL is NOT /usr/ucb/install
@@ -498,6 +739,11 @@
 
 	* mt-ose68000, mt-ose68k: renamed from mt-OSE*.
 
+Mon Aug  3 15:41:28 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-solaris: removed the -xs from CFLAGS (let the people
+	with Sun's C compiler deal with it themselved)
+
 Tue Jul 21 02:11:01 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
 
 	* mt-OSE68k, mt-680000: new configs.
@@ -506,20 +752,47 @@
 
 	* mh-irix4: merged changes from progressive.
 
+Wed Jul  8 00:01:30 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* mh-solaris:  Use -xs when compiling so that Sun-C puts
+	a symbol-table into the executable.
+
+Mon Jun 15 12:31:52 1992  Fred Fish  (fnf@cygnus.com)
+
+	* mh-ncr3000 (INSTALL):  Don't use /usr/ucb/install,
+	it is broken on ncr 3000's.
+
 Tue Jun  9 23:29:38 1992  Per Bothner  (bothner@rtl.cygnus.com)
 
 	* Everywhere: Change RANLIB=echo>/dev/null (which confuses
 	some shells - and I don't blame them) to RANLIB=true.
 	* mh-solaris:  Use /usr/ucb/install for INSTALL.
 
+Tue Jun  9 17:18:11 1992  Fred Fish  (fnf at cygnus.com)
+
+	* mh-ncr3000, mh-sysv4:  Add INSTALL.
+
 Sun May 31 14:45:23 1992  Mark Eichin  (eichin at cygnus.com)
 
 	* mh-solaris2: Add new configuration for Solaris 2 (sysv, no ranlib)
 
+Wed Apr 22 14:38:34 1992  Fred Fish  (fnf@cygnus.com)
+
+	* mh-delta88, mh-ncr3000:  Replace MINUS_G with
+	CFLAGS per new configuration strategy.
+
 Fri Apr 10 23:10:08 1992  Fred Fish  (fnf@cygnus.com)
 
 	* mh-ncr3000:  Add new configuration for NCR 3000.
 
+Thu Mar  5 12:05:58 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* mh-irix4: Port to SGI Irix-4.x.
+
+Thu Jan 30 16:17:30 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* mh-sco: Fix SCO configuration stuff.
+
 Tue Dec 10 00:10:55 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
 
 	* ChangeLog: fresh changelog.
Index: config/acinclude.m4
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/config/acinclude.m4,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 acinclude.m4
--- config/acinclude.m4	11 Oct 2002 05:59:53 -0000	1.1.1.3
+++ config/acinclude.m4	14 Jan 2004 13:41:37 -0000
@@ -6,7 +6,7 @@
 dnl We are probably using a cross compiler, which will not be able to fully
 dnl link an executable.  This should really be fixed in autoconf itself.
 dnl Find a working G++ cross compiler. This only works for the GNU C++ compiler.
-AC_DEFUN(CYG_AC_PROG_CXX_CROSS,
+AC_DEFUN([CYG_AC_PROG_CXX_CROSS],
 [AC_BEFORE([$0], [AC_PROG_CXXCPP])
 AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
 
@@ -35,7 +35,7 @@
 ])
 
 dnl See if the G++ compiler we found works.
-AC_DEFUN(CYG_AC_PROG_GXX_WORKS,
+AC_DEFUN([CYG_AC_PROG_GXX_WORKS],
 [AC_MSG_CHECKING([whether the G++ compiler ($CXX $CXXFLAGS $LDFLAGS) actually works])
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -103,7 +103,7 @@
 dnl ====================================================================
 dnl Find a working GCC cross compiler. This only works for the GNU gcc compiler.
 dnl This is based on the macros above for G++.
-AC_DEFUN(CYG_AC_PROG_CC_CROSS,
+AC_DEFUN([CYG_AC_PROG_CC_CROSS],
 [AC_BEFORE([$0], [AC_PROG_CCPP])
 AC_CHECK_PROGS(CC, cc, gcc)
 
@@ -132,7 +132,7 @@
 ])
 
 dnl See if the GCC compiler we found works.
-AC_DEFUN(CYG_AC_PROG_GCC_WORKS,
+AC_DEFUN([CYG_AC_PROG_GCC_WORKS],
 [AC_MSG_CHECKING([whether the Gcc compiler ($CC $CFLAGS $LDFLAGS) actually works])
 AC_LANG_SAVE
 AC_LANG_C
@@ -199,7 +199,7 @@
 dnl ====================================================================
 dnl Find the BFD library in the build tree. This is used to access and
 dnl manipulate object or executable files.
-AC_DEFUN(CYG_AC_PATH_BFD, [
+AC_DEFUN([CYG_AC_PATH_BFD], [
 AC_MSG_CHECKING(for the bfd header in the build tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 dnl Look for the header file
@@ -241,7 +241,7 @@
 dnl ====================================================================
 dnl Find the libiberty library. This defines many commonly used C
 dnl functions that exists in various states based on the underlying OS.
-AC_DEFUN(CYG_AC_PATH_LIBERTY, [
+AC_DEFUN([CYG_AC_PATH_LIBERTY], [
 AC_MSG_CHECKING(for the liberty library in the build tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 AC_CACHE_VAL(ac_cv_c_liberty,[
@@ -262,7 +262,7 @@
 
 dnl ====================================================================
 dnl Find the opcodes library. This is used to do dissasemblies.
-AC_DEFUN(CYG_AC_PATH_OPCODES, [
+AC_DEFUN([CYG_AC_PATH_OPCODES], [
 AC_MSG_CHECKING(for the opcodes library in the build tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 AC_CACHE_VAL(ac_cv_c_opc,[
@@ -284,7 +284,7 @@
 dnl ====================================================================
 dnl Look for the DejaGnu header file in the source tree. This file
 dnl defines the functions used to testing support.
-AC_DEFUN(CYG_AC_PATH_DEJAGNU, [
+AC_DEFUN([CYG_AC_PATH_DEJAGNU], [
 AC_MSG_CHECKING(for the testing support files in the source tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 AC_CACHE_VAL(ac_cv_c_dejagnu,[
@@ -335,7 +335,7 @@
 dnl ====================================================================
 dnl Find the libintl library in the build tree. This is for
 dnl  internationalization support.
-AC_DEFUN(CYG_AC_PATH_INTL, [
+AC_DEFUN([CYG_AC_PATH_INTL], [
 AC_MSG_CHECKING(for the intl header in the build tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 dnl Look for the header file
@@ -375,7 +375,7 @@
 
 dnl ====================================================================
 dnl Find the simulator library.
-AC_DEFUN(CYG_AC_PATH_SIM, [
+AC_DEFUN([CYG_AC_PATH_SIM], [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.. ../../../../../../../../../.."
 case "$target_cpu" in
     powerpc)	target_dir=ppc ;;
@@ -457,7 +457,7 @@
 
 dnl ====================================================================
 dnl Find the libiberty library.
-AC_DEFUN(CYG_AC_PATH_LIBIBERTY, [
+AC_DEFUN([CYG_AC_PATH_LIBIBERTY], [
 AC_MSG_CHECKING(for the libiberty library in the build tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 AC_CACHE_VAL(ac_cv_c_libib,[
@@ -477,7 +477,7 @@
 ])
 
 dnl ====================================================================
-AC_DEFUN(CYG_AC_PATH_DEVO, [
+AC_DEFUN([CYG_AC_PATH_DEVO], [
 AC_MSG_CHECKING(for devo headers in the source tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 AC_CACHE_VAL(ac_cv_c_devoh,[
@@ -498,7 +498,7 @@
 
 dnl ====================================================================
 dnl find the IDE library and headers.
-AC_DEFUN(CYG_AC_PATH_IDE, [
+AC_DEFUN([CYG_AC_PATH_IDE], [
 AC_MSG_CHECKING(for IDE headers in the source tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 IDEHDIR=
@@ -591,7 +591,7 @@
 
 dnl ====================================================================
 dnl Find all the ILU headers and libraries
-AC_DEFUN(CYG_AC_PATH_ILU, [
+AC_DEFUN([CYG_AC_PATH_ILU], [
 AC_MSG_CHECKING(for ILU kernel headers in the source tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 AC_CACHE_VAL(ac_cv_c_iluh,[
@@ -752,7 +752,7 @@
 dnl This defines the byte order for the host. We can't use
 dnl AC_C_BIGENDIAN, cause we want to create a config file and
 dnl substitue the real value, so the header files work right
-AC_DEFUN(CYG_AC_C_ENDIAN, [
+AC_DEFUN([CYG_AC_C_ENDIAN], [
 AC_MSG_CHECKING(to see if this is a little endian host)
 AC_CACHE_VAL(ac_cv_c_little_endian, [
 ac_cv_c_little_endian=unknown
@@ -788,7 +788,7 @@
 dnl is just to keep configure from stopping here.
 case "${host}" in
 changequote(,)
-   i[3456]86-*-*) ac_cv_c_little_endian=yes ;;
+   i[3456789]86-*-*) ac_cv_c_little_endian=yes ;;
    sparc*-*-*)    ac_cv_c_little_endian=no ;;
 changequote([,])
   *)    AC_MSG_WARN(Can't cross compile this test) ;;
@@ -809,7 +809,7 @@
 dnl ====================================================================
 dnl Look for the path to libgcc, so we can use it to directly link
 dnl in libgcc.a with LD.
-AC_DEFUN(CYG_AC_PATH_LIBGCC,
+AC_DEFUN([CYG_AC_PATH_LIBGCC],
 [AC_MSG_CHECKING([Looking for the path to libgcc.a])
 AC_LANG_SAVE
 AC_LANG_C
@@ -844,12 +844,12 @@
 dnl because 10 sorts before 9. We also look for just tcl. We have to
 dnl be careful that we don't match stuff like tclX by accident.
 dnl the alternative search directory is involked by --with-tclinclude
-AC_DEFUN(CYG_AC_PATH_TCL, [
+AC_DEFUN([CYG_AC_PATH_TCL], [
     CYG_AC_PATH_TCLH
     CYG_AC_PATH_TCLCONFIG
     CYG_AC_LOAD_TCLCONFIG
 ])
-AC_DEFUN(CYG_AC_PATH_TCLH, [
+AC_DEFUN([CYG_AC_PATH_TCLH], [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 no_tcl=true
 AC_MSG_CHECKING(for Tcl headers in the source tree)
@@ -935,7 +935,7 @@
 
 dnl ====================================================================
 dnl Ok, lets find the tcl configuration
-AC_DEFUN(CYG_AC_PATH_TCLCONFIG, [
+AC_DEFUN([CYG_AC_PATH_TCLCONFIG], [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 dnl First, look for one uninstalled.  
 dnl the alternative search directory is invoked by --with-tclconfig
@@ -1024,7 +1024,7 @@
 
 dnl Defined as a separate macro so we don't have to cache the values
 dnl from PATH_TCLCONFIG (because this can also be cached).
-AC_DEFUN(CYG_AC_LOAD_TCLCONFIG, [
+AC_DEFUN([CYG_AC_LOAD_TCLCONFIG], [
     . $TCLCONFIG
 
 dnl AC_SUBST(TCL_VERSION)
@@ -1070,12 +1070,12 @@
 ])
 
 dnl ====================================================================
-AC_DEFUN(CYG_AC_PATH_TK, [
+AC_DEFUN([CYG_AC_PATH_TK], [
     CYG_AC_PATH_TKH
     CYG_AC_PATH_TKCONFIG
     CYG_AC_LOAD_TKCONFIG
 ])
-AC_DEFUN(CYG_AC_PATH_TKH, [
+AC_DEFUN([CYG_AC_PATH_TKH], [
 #
 # Ok, lets find the tk source trees so we can use the headers
 # If the directory (presumably symlink) named "tk" exists, use that one
@@ -1168,7 +1168,7 @@
 AC_SUBST(TKHDIR)
 ])
 
-AC_DEFUN(CYG_AC_PATH_TKCONFIG, [
+AC_DEFUN([CYG_AC_PATH_TKCONFIG], [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 dnl First, look for one uninstalled.  
 dnl the alternative search directory is invoked by --with-tkconfig
@@ -1257,7 +1257,7 @@
 
 dnl Defined as a separate macro so we don't have to cache the values
 dnl from PATH_TKCONFIG (because this can also be cached).
-AC_DEFUN(CYG_AC_LOAD_TKCONFIG, [
+AC_DEFUN([CYG_AC_LOAD_TKCONFIG], [
     if test -f "$TKCONFIG" ; then
       . $TKCONFIG
     fi
@@ -1287,13 +1287,13 @@
 dnl ====================================================================
 dnl Ok, lets find the itcl source trees so we can use the headers
 dnl the alternative search directory is involked by --with-itclinclude
-AC_DEFUN(CYG_AC_PATH_ITCL, [
+AC_DEFUN([CYG_AC_PATH_ITCL], [
     CYG_AC_PATH_ITCLH
     CYG_AC_PATH_ITCLLIB
     CYG_AC_PATH_ITCLSH
     CYG_AC_PATH_ITCLMKIDX
 ])
-AC_DEFUN(CYG_AC_PATH_ITCLH, [
+AC_DEFUN([CYG_AC_PATH_ITCLH], [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 no_itcl=true
 AC_MSG_CHECKING(for Itcl headers in the source tree)
@@ -1367,7 +1367,7 @@
 dnl Ok, lets find the itcl library
 dnl First, look for one uninstalled.  
 dnl the alternative search directory is invoked by --with-itcllib
-AC_DEFUN(CYG_AC_PATH_ITCLLIB, [
+AC_DEFUN([CYG_AC_PATH_ITCLLIB], [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 if test x"${no_itcl}" = x ; then
     dnl we reset no_itcl incase something fails here
@@ -1454,7 +1454,7 @@
 dnl ====================================================================
 dnl Ok, lets find the itcl source trees so we can use the itcl_sh script
 dnl the alternative search directory is involked by --with-itclinclude
-AC_DEFUN(CYG_AC_PATH_ITCLSH, [
+AC_DEFUN([CYG_AC_PATH_ITCLSH], [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 no_itcl=true
 AC_MSG_CHECKING(for the itcl_sh script)
@@ -1516,7 +1516,7 @@
 dnl ====================================================================
 dnl Ok, lets find the itcl source trees so we can use the itcl_sh script
 dnl the alternative search directory is involked by --with-itclinclude
-AC_DEFUN(CYG_AC_PATH_ITCLMKIDX, [
+AC_DEFUN([CYG_AC_PATH_ITCLMKIDX], [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 no_itcl=true
 AC_MSG_CHECKING(for itcl_mkindex.tcl script)
@@ -1582,11 +1582,11 @@
 dnl ====================================================================
 dnl Ok, lets find the tix source trees so we can use the headers
 dnl the alternative search directory is involked by --with-tixinclude
-AC_DEFUN(CYG_AC_PATH_TIX, [
+AC_DEFUN([CYG_AC_PATH_TIX], [
     CYG_AC_PATH_TIXH
     CYG_AC_PATH_TIXLIB
 ])
-AC_DEFUN(CYG_AC_PATH_TIXH, [
+AC_DEFUN([CYG_AC_PATH_TIXH], [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 no_tix=true
 AC_MSG_CHECKING(for Tix headers in the source tree)
@@ -1663,7 +1663,7 @@
 AC_SUBST(TIXHDIR)
 ])
 
-AC_DEFUN(CYG_AC_PATH_TIXCONFIG, [
+AC_DEFUN([CYG_AC_PATH_TIXCONFIG], [
 #
 # Ok, lets find the tix configuration
 # First, look for one uninstalled.  
@@ -1737,7 +1737,7 @@
 
 # Defined as a separate macro so we don't have to cache the values
 # from PATH_TIXCONFIG (because this can also be cached).
-AC_DEFUN(CYG_AC_LOAD_TIXCONFIG, [
+AC_DEFUN([CYG_AC_LOAD_TIXCONFIG], [
     if test -f "$TIXCONFIG" ; then
       . $TIXCONFIG
     fi
@@ -1746,7 +1746,7 @@
     AC_SUBST(TIX_LIB_FULL_PATH)
 ])
 
-AC_DEFUN(CYG_AC_PATH_ITCLCONFIG, [
+AC_DEFUN([CYG_AC_PATH_ITCLCONFIG], [
 #
 # Ok, lets find the itcl configuration
 # First, look for one uninstalled.  
@@ -1820,7 +1820,7 @@
 
 # Defined as a separate macro so we don't have to cache the values
 # from PATH_ITCLCONFIG (because this can also be cached).
-AC_DEFUN(CYG_AC_LOAD_ITCLCONFIG, [
+AC_DEFUN([CYG_AC_LOAD_ITCLCONFIG], [
     if test -f "$ITCLCONFIG" ; then
       . $ITCLCONFIG
     fi
@@ -1833,7 +1833,7 @@
 ])
 
 
-AC_DEFUN(CYG_AC_PATH_ITKCONFIG, [
+AC_DEFUN([CYG_AC_PATH_ITKCONFIG], [
 #
 # Ok, lets find the itk configuration
 # First, look for one uninstalled.  
@@ -1907,7 +1907,7 @@
 
 # Defined as a separate macro so we don't have to cache the values
 # from PATH_ITKCONFIG (because this can also be cached).
-AC_DEFUN(CYG_AC_LOAD_ITKCONFIG, [
+AC_DEFUN([CYG_AC_LOAD_ITKCONFIG], [
     if test -f "$ITKCONFIG" ; then
       . $ITKCONFIG
     fi
@@ -1921,11 +1921,11 @@
 dnl ====================================================================
 dnl Ok, lets find the libgui source trees so we can use the headers
 dnl the alternative search directory is involked by --with-libguiinclude
-AC_DEFUN(CYG_AC_PATH_LIBGUI, [
+AC_DEFUN([CYG_AC_PATH_LIBGUI], [
     CYG_AC_PATH_LIBGUIH
     CYG_AC_PATH_LIBGUILIB
 ])
-AC_DEFUN(CYG_AC_PATH_LIBGUIH, [
+AC_DEFUN([CYG_AC_PATH_LIBGUIH], [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../..../../../../../../../../../../.."
 no_libgui=true
 AC_MSG_CHECKING(for Libgui headers in the source tree)
@@ -1995,7 +1995,7 @@
 
 dnl ====================================================================
 dnl find the GUI library
-AC_DEFUN(CYG_AC_PATH_LIBGUILIB, [
+AC_DEFUN([CYG_AC_PATH_LIBGUILIB], [
 AC_MSG_CHECKING(for GUI library  in the build tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 dnl look for the library
Index: config/mh-cxux
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/config/mh-cxux,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 mh-cxux
--- config/mh-cxux	11 Oct 2002 05:59:53 -0000	1.1.1.2
+++ config/mh-cxux	28 Dec 2002 07:09:15 -0000
@@ -1,7 +1,5 @@
 # Configuration for Harris CX/UX 7 (and maybe 6), based on sysv4 configuration.
 
-RANLIB = true
-
 # The l flag generates a warning from the SVR4 archiver, remove it.
 AR_FLAGS = cq
 
Index: config/mh-necv4
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/config/mh-necv4,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 mh-necv4
--- config/mh-necv4	11 Oct 2002 05:59:53 -0000	1.1.1.2
+++ config/mh-necv4	28 Dec 2002 07:09:15 -0000
@@ -1,6 +1,4 @@
 # Host Makefile fragment for NEC MIPS SVR4.
 
-RANLIB = true
-
 # NEC -lX11 needs some other libraries.
 X11_EXTRA_LIBS = -lsocket -lnsl
Index: config/mh-sco
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/config/mh-sco,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 mh-sco
--- config/mh-sco	11 Oct 2002 05:59:53 -0000	1.1.1.2
+++ config/mh-sco	28 Dec 2002 07:09:15 -0000
@@ -1,4 +1,3 @@
-RANLIB = true
 # You may need this if you don't have bison.
 # BISON = yacc -Sm10400
 
Index: config/mh-solaris
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/config/mh-solaris,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 mh-solaris
--- config/mh-solaris	11 Oct 2002 05:59:53 -0000	1.1.1.2
+++ config/mh-solaris	28 Dec 2002 07:09:15 -0000
@@ -1,5 +1,2 @@
 # Makefile changes for Suns running Solaris 2
-
-RANLIB = true
-
 X11_EXTRA_LIBS = -lnsl -lsocket
Index: config/mh-sysv4
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/config/mh-sysv4,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 mh-sysv4
--- config/mh-sysv4	11 Oct 2002 05:59:53 -0000	1.1.1.2
+++ config/mh-sysv4	28 Dec 2002 07:09:15 -0000
@@ -1,5 +1,3 @@
-RANLIB = true
-
 # The l flag generates a warning from the SVR4 archiver, remove it.
 AR_FLAGS = cr
 
Index: config/mh-sysv5
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/config/mh-sysv5,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 mh-sysv5
--- config/mh-sysv5	11 Oct 2002 05:59:53 -0000	1.1.1.2
+++ config/mh-sysv5	28 Dec 2002 07:09:15 -0000
@@ -1,5 +1,3 @@
-RANLIB = true
-
 # The l flag generates a warning from the SVR4 archiver, remove it.
 AR_FLAGS = cr
 
Index: config/mt-v810
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/config/mt-v810,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mt-v810
--- config/mt-v810	1 Mar 1998 22:56:49 -0000	1.1.1.1
+++ config/mt-v810	28 Dec 2002 07:09:15 -0000
@@ -1,4 +1,3 @@
 CC_FOR_TARGET = ca732 -ansi
 AS_FOR_TARGET = as732
 AR_FOR_TARGET = ar732
-RANLIB_FOR_TARGET = true
Index: etc/ChangeLog
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/etc/ChangeLog,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 ChangeLog
--- etc/ChangeLog	2 Dec 2002 09:06:01 -0000	1.1.1.3
+++ etc/ChangeLog	16 May 2003 16:30:26 -0000
@@ -1,3 +1,12 @@
+2003-05-16  Kelley Cook  <kelleycook@wideopenwest.com>
+
+	* configure.texi: Use "i[3-7]86" in example.
+
+2003-01-02  H.J. Lu <hjl@gnu.org>
+
+	* Makefile.in (DESTDIR): New.
+	(install-info): Use it.
+
 2002-06-11  Nick Clifton  <nickc@cambridge.redhat.com>
 
 	Import the following patches from the FSF GCC sources:
Index: etc/Makefile.in
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/etc/Makefile.in,v
retrieving revision 1.1.1.4
diff -u -r1.1.1.4 Makefile.in
--- etc/Makefile.in	31 Aug 2002 20:20:07 -0000	1.1.1.4
+++ etc/Makefile.in	2 Jan 2003 20:51:02 -0000
@@ -2,6 +2,8 @@
 # Makefile.in for etc
 #
 
+DESTDIR		=
+
 prefix 		= @prefix@
 exec_prefix 	= @exec_prefix@
 
@@ -68,17 +70,17 @@
 	done
 
 install-info: info
-	$(SHELL) $(srcdir)/../mkinstalldirs $(infodir)
+	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir)
 	if test ! -f standards.info; then cd $(srcdir); fi; \
 	if test -f standards.info; then \
 	  for i in standards.info*; do \
-	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
 	  done; \
 	fi
 	if test ! -f configure.info; then cd $(srcdir); fi; \
 	if test -f configure.info; then \
 	  for i in configure.info*; do \
-	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
 	  done; \
 	fi
 
Index: gas/ChangeLog
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/gas/ChangeLog,v
retrieving revision 1.1.1.17
diff -u -r1.1.1.17 ChangeLog
--- gas/ChangeLog	16 Jun 2004 05:45:12 -0000	1.1.1.17
+++ gas/ChangeLog	12 Dec 2004 01:27:55 -0000
@@ -1,3 +1,12 @@
+2004-08-18  Thiemo Seufer  <seufer@csv.ica.uni-stuttgart.de>
+	* config/tc-mips.c (append_insn): Handle delay slots in branch likely
+	correctly.
+
+2004-07-28  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config/tc-hppa.h (TARGET_FORMAT): Set to "elf32-hppa-netbsd"
+	for TE_NetBSD.
+
 2004-05-23  Alan Modra  <amodra@bigpond.net.au>
 
 	* expr.c (operand, operator): Don't reject '++' and '--'.
Index: gas/itbl-parse.y
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/gas/itbl-parse.y,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 itbl-parse.y
--- gas/itbl-parse.y	2 Dec 2002 09:05:14 -0000	1.1.1.3
+++ gas/itbl-parse.y	5 Jul 2004 22:21:40 -0000
@@ -152,7 +152,7 @@
 	    char -> any printable character
 	    ltr -> ['a'..'z'|'A'..'Z'] 
 	    dec -> ['0'..'9']*	    	    	    	    	     ; value in decimal
-	    hex -> '0x'['0'..'9' | 'a'..'f' | 'A'..'F']*	; value in hexidecimal 
+	    hex -> '0x'['0'..'9' | 'a'..'f' | 'A'..'F']*	; value in hexadecimal 
 
 
 Examples
@@ -239,7 +239,7 @@
 
 ----
 FIXME! should really change lexical analyzer 
-to recognize 'dreg' etc. in context sensative way.
+to recognize 'dreg' etc. in context sensitive way.
 Currently function names or mnemonics may be incorrectly parsed as keywords
 
 FIXME! hex is ambiguous with any digit
Index: gprof/po/Make-in
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/gprof/po/Make-in,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Make-in
--- gprof/po/Make-in	2 Dec 2002 09:05:44 -0000	1.1.1.2
+++ gprof/po/Make-in	19 Jul 2003 07:31:15 -0000
@@ -24,6 +24,8 @@
 gettextsrcdir = $(prefix)/share/gettext/po
 subdir = po
 
+DESTDIR =
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -70,9 +72,7 @@
 
 .po.gmo:
 	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && test -w $$file \
-	  && (rm -f $$file && $(GMSGFMT) -o $$file $< ) \
-	  || echo "$$file is not writable"
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
 	sed -f ../intl/po2msg.sed < $< > $*.msg \
@@ -113,9 +113,9 @@
 install-data-no: all
 install-data-yes: all
 	if test -r $(MKINSTALLDIRS); then \
-	  $(MKINSTALLDIRS) $(datadir); \
+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
 	else \
-	  $(top_srcdir)/mkinstalldirs $(datadir); \
+	  $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
 	fi
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
@@ -125,7 +125,7 @@
 	    *)     destdir=$(localedir);; \
 	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
+	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
 	  if test -r $(MKINSTALLDIRS); then \
 	    $(MKINSTALLDIRS) $$dir; \
 	  else \
@@ -155,12 +155,12 @@
 	done
 	if test "$(PACKAGE)" = "gettext"; then \
 	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
+	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
 	  else \
-	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
 	  fi; \
 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(gettextsrcdir)/Makefile.in.in; \
+			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
 	else \
 	  : ; \
 	fi
@@ -173,12 +173,12 @@
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 	done
-	rm -f $(gettextsrcdir)/po-Makefile.in.in
+	rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
 
 check: all
 
Index: gprof/po/gprof.pot
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/gprof/po/gprof.pot,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 gprof.pot
--- gprof/po/gprof.pot	2 Dec 2002 09:05:44 -0000	1.1.1.2
+++ gprof/po/gprof.pot	11 Jul 2003 05:10:20 -0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-10-30 10:08-0500\n"
+"POT-Creation-Date: 2003-07-11 13:58+0930\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -244,97 +244,96 @@
 msgid "%s: file `%s' has no symbols\n"
 msgstr ""
 
-#: corefile.c:748
+#: corefile.c:758
 #, c-format
 msgid "%s: somebody miscounted: ltab.len=%d instead of %ld\n"
 msgstr ""
 
-#: gmon_io.c:96 gmon_io.c:159 gmon_io.c:219 gmon_io.c:251 gmon_io.c:422
-#: gmon_io.c:449 gmon_io.c:646 gmon_io.c:671
+#: gmon_io.c:82
 #, c-format
-msgid "%s: bits per address has unexpected value of %u\n"
+msgid "%s: address size has unexpected value of %u\n"
 msgstr ""
 
-#: gmon_io.c:288 gmon_io.c:383
+#: gmon_io.c:345 gmon_io.c:440
 #, c-format
 msgid "%s: file too short to be a gmon file\n"
 msgstr ""
 
-#: gmon_io.c:298 gmon_io.c:432
+#: gmon_io.c:355 gmon_io.c:483
 #, c-format
 msgid "%s: file `%s' has bad magic cookie\n"
 msgstr ""
 
-#: gmon_io.c:309
+#: gmon_io.c:366
 #, c-format
 msgid "%s: file `%s' has unsupported version %d\n"
 msgstr ""
 
-#: gmon_io.c:339
+#: gmon_io.c:396
 #, c-format
 msgid "%s: %s: found bad tag %d (file corrupted?)\n"
 msgstr ""
 
-#: gmon_io.c:405
+#: gmon_io.c:462
 #, c-format
 msgid "%s: profiling rate incompatible with first gmon file\n"
 msgstr ""
 
-#: gmon_io.c:465
+#: gmon_io.c:510
 #, c-format
 msgid "%s: incompatible with first gmon file\n"
 msgstr ""
 
-#: gmon_io.c:493
+#: gmon_io.c:538
 #, c-format
 msgid "%s: file '%s' does not appear to be in gmon.out format\n"
 msgstr ""
 
-#: gmon_io.c:514
+#: gmon_io.c:559
 #, c-format
 msgid "%s: unexpected EOF after reading %d/%d bins\n"
 msgstr ""
 
-#: gmon_io.c:547
+#: gmon_io.c:592
 msgid "time is in ticks, not seconds\n"
 msgstr ""
 
-#: gmon_io.c:553 gmon_io.c:742
+#: gmon_io.c:598 gmon_io.c:775
 #, c-format
 msgid "%s: don't know how to deal with file format %d\n"
 msgstr ""
 
-#: gmon_io.c:560
+#: gmon_io.c:605
 #, c-format
 msgid "File `%s' (version %d) contains:\n"
 msgstr ""
 
-#: gmon_io.c:563
+#: gmon_io.c:608
 #, c-format
 msgid "\t%d histogram record\n"
 msgstr ""
 
-#: gmon_io.c:564
+#: gmon_io.c:609
 #, c-format
 msgid "\t%d histogram records\n"
 msgstr ""
 
-#: gmon_io.c:566
+#: gmon_io.c:611
 #, c-format
 msgid "\t%d call-graph record\n"
 msgstr ""
 
-#: gmon_io.c:567
+#: gmon_io.c:612
 #, c-format
 msgid "\t%d call-graph records\n"
 msgstr ""
 
-#: gmon_io.c:569
+#: gmon_io.c:614
 #, c-format
 msgid "\t%d basic-block count record\n"
 msgstr ""
 
-#: gmon_io.c:570
+#: gmon_io.c:615
 #, c-format
 msgid "\t%d basic-block count records\n"
 msgstr ""
Index: include/opcode/ChangeLog
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/include/opcode/ChangeLog,v
retrieving revision 1.1.1.12
diff -u -r1.1.1.12 ChangeLog
--- include/opcode/ChangeLog	16 Jun 2004 05:45:05 -0000	1.1.1.12
+++ include/opcode/ChangeLog	12 Dec 2004 01:28:29 -0000
@@ -1,3 +1,7 @@
+2004-08-30  Michal Ludvig  <mludvig@suse.cz>
+
+	* i386.h (i386_optab): Added montmul/xsha1/xsha256 insns.
+
 2004-04-08  Alan Modra  <amodra@bigpond.net.au>
 
 	Apply from mainline.
Index: include/opcode/i386.h
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/include/opcode/i386.h,v
retrieving revision 1.1.1.11
diff -u -r1.1.1.11 i386.h
--- include/opcode/i386.h	16 Jun 2004 05:45:05 -0000	1.1.1.11
+++ include/opcode/i386.h	12 Dec 2004 01:28:29 -0000
@@ -1367,7 +1367,10 @@
 {"xcryptcbc", 0, 0xf30fa7d0, X, Cpu686|CpuPadLock, NoSuf|IsString, { 0, 0, 0} },
 {"xcryptcfb", 0, 0xf30fa7e0, X, Cpu686|CpuPadLock, NoSuf|IsString, { 0, 0, 0} },
 {"xcryptofb", 0, 0xf30fa7e8, X, Cpu686|CpuPadLock, NoSuf|IsString, { 0, 0, 0} },
-/* alias for xstorerng */
+{"montmul",   0, 0xf30fa6c0, X, Cpu686|CpuPadLock, NoSuf|IsString, { 0, 0, 0} },
+{"xsha1",     0, 0xf30fa6c8, X, Cpu686|CpuPadLock, NoSuf|IsString, { 0, 0, 0} },
+{"xsha256",   0, 0xf30fa6d0, X, Cpu686|CpuPadLock, NoSuf|IsString, { 0, 0, 0} },
+/* Alias for xstorerng.  */
 {"xstore", 0, 0x0fa7c0, X, Cpu686|CpuPadLock, NoSuf|IsString, { 0, 0, 0} },
 
 /* sentinel */
Index: ld/ChangeLog
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/ld/ChangeLog,v
retrieving revision 1.1.1.18
diff -u -r1.1.1.18 ChangeLog
--- ld/ChangeLog	16 Jun 2004 05:45:32 -0000	1.1.1.18
+++ ld/ChangeLog	12 Dec 2004 01:28:40 -0000
@@ -1,3 +1,7 @@
+2004-07-28  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* emulparams/hppanbsd.sh (OUTPUT_FORMAT): Set to "elf32-hppa-netbsd".
+
 2004-05-13  Joel Sherrill <joel@oarcorp.com>
 
 	* configure.tgt (or32-*-rtems*): Switch to elf and
Index: ld/Makefile.in
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/ld/Makefile.in,v
retrieving revision 1.15
diff -u -r1.15 Makefile.in
--- ld/Makefile.in	16 Jun 2004 06:03:34 -0000	1.15
+++ ld/Makefile.in	3 May 2004 17:34:55 -0000
@@ -11,9 +11,6 @@
 # PARTICULAR PURPOSE.
 
 
-# $FreeBSD: src/contrib/binutils/ld/Makefile.in,v 1.15 2004/06/16 06:03:34 obrien Exp $
-
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -334,7 +331,6 @@
 	ei386beos.o \
 	ei386bsd.o \
 	ei386coff.o \
-	ei386freebsd.o \
 	ei386go32.o \
 	ei386linux.o \
 	ei386lynx.o \
@@ -1664,9 +1660,6 @@
 ei386coff.c: $(srcdir)/emulparams/i386coff.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386coff.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} i386coff "$(tdir_i386coff)"
-ei386freebsd.c: $(srcdir)/emulparams/i386freebsd.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} i386freebsd "$(tdir_i386freebsd)"
 ei386go32.c: $(srcdir)/emulparams/i386go32.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386go32.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} i386go32 "$(tdir_i386go32)"
Index: ld/emultempl/elf32.em
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/ld/emultempl/elf32.em,v
retrieving revision 1.14
diff -u -r1.14 elf32.em
--- ld/emultempl/elf32.em	16 Jun 2004 06:09:06 -0000	1.14
+++ ld/emultempl/elf32.em	3 May 2004 17:34:56 -0000
@@ -1,6 +1,3 @@
-# $FreeBSD: src/contrib/binutils/ld/emultempl/elf32.em,v 1.14 2004/06/16 06:09:06 obrien Exp $
-
-
 # This shell script emits a C file. -*- C -*-
 # It does some substitutions.
 # This file is now misnamed, because it supports both 32 bit and 64 bit
@@ -466,68 +463,6 @@
 
 EOF
   case ${target} in
-    *-*-freebsd*)
-      cat >>e${EMULATION_NAME}.c <<EOF
-/*
- * Read the system search path the FreeBSD way rather than like Linux.
- */
-#include <elf-hints.h>
-
-static bfd_boolean
-gld${EMULATION_NAME}_check_ld_elf_hints (const char *name, int force)
-{
-  static bfd_boolean initialized;
-  static char *ld_elf_hints;
-
-  if (! initialized)
-    {
-      FILE *f;
-      char *tmppath;
-
-      tmppath = concat (ld_sysroot, _PATH_ELF_HINTS, NULL);
-      f = fopen (tmppath, FOPEN_RB);
-      free (tmppath);
-      if (f != NULL)
-	{
-	  struct elfhints_hdr hdr;
-
-	  if (fread(&hdr, 1, sizeof(hdr), f) == sizeof(hdr) &&
-	      hdr.magic == ELFHINTS_MAGIC &&
-	      hdr.version == 1)
-	    {
-	      if (fseek(f, hdr.strtab + hdr.dirlist, SEEK_SET) != -1)
-		{
-		  char *b;
-
-		  b = (char *) xmalloc (hdr.dirlistlen + 1);
-		  if (fread(b, 1, hdr.dirlistlen + 1, f) !=
-		      hdr.dirlistlen + 1)
-		    {
-		      free(b);
-		      b = NULL;
-		    }
-		  else
-		    {
-		      ld_elf_hints = gld${EMULATION_NAME}_add_sysroot (b);
-		      free (b);
-		    }
-		}
-	    }
-	  fclose (f);
-	}
-
-      initialized = TRUE;
-    }
-
-  if (ld_elf_hints == NULL)
-    return FALSE;
-
-  return gld${EMULATION_NAME}_search_needed (ld_elf_hints, name, force);
-}
-EOF
-    # FreeBSD
-    ;;
-
     *-*-linux-gnu*)
       cat >>e${EMULATION_NAME}.c <<EOF
 /* For a native linker, check the file /etc/ld.so.conf for directories
@@ -803,14 +738,6 @@
 EOF
 if [ "x${USE_LIBPATH}" = xyes ] ; then
   case ${target} in
-    *-*-freebsd*)
-      cat >>e${EMULATION_NAME}.c <<EOF
-	  if (gld${EMULATION_NAME}_check_ld_elf_hints (l->name, force))
-	    break;
-EOF
-    # FreeBSD
-    ;;
-
     *-*-linux-gnu*)
       cat >>e${EMULATION_NAME}.c <<EOF
 	  if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
Index: ld/po/Make-in
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/ld/po/Make-in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Make-in
--- ld/po/Make-in	12 May 2000 23:15:10 -0000	1.1.1.1
+++ ld/po/Make-in	5 Jul 2004 22:22:42 -0000
@@ -24,6 +24,8 @@
 gettextsrcdir = $(prefix)/share/gettext/po
 subdir = po
 
+DESTDIR =
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -111,9 +113,9 @@
 install-data-no: all
 install-data-yes: all
 	if test -r $(MKINSTALLDIRS); then \
-	  $(MKINSTALLDIRS) $(datadir); \
+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
 	else \
-	  $(top_srcdir)/mkinstalldirs $(datadir); \
+	  $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
 	fi
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
@@ -123,7 +125,7 @@
 	    *)     destdir=$(localedir);; \
 	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
+	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
 	  if test -r $(MKINSTALLDIRS); then \
 	    $(MKINSTALLDIRS) $$dir; \
 	  else \
@@ -153,12 +155,12 @@
 	done
 	if test "$(PACKAGE)" = "gettext"; then \
 	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
+	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
 	  else \
-	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
 	  fi; \
 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(gettextsrcdir)/Makefile.in.in; \
+			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
 	else \
 	  : ; \
 	fi
@@ -171,12 +173,12 @@
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 	done
-	rm -f $(gettextsrcdir)/po-Makefile.in.in
+	rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
 
 check: all
 
Index: ld/po/POTFILES.in
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/ld/po/POTFILES.in,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 POTFILES.in
--- ld/po/POTFILES.in	26 Jun 2001 16:57:43 -0000	1.1.1.2
+++ ld/po/POTFILES.in	5 Jul 2004 22:22:42 -0000
@@ -1,7 +1,6 @@
 deffile.h
 emultempl/armcoff.em
 emultempl/pe.em
-ld.h
 ldcref.c
 ldctor.c
 ldctor.h
@@ -11,6 +10,7 @@
 ldexp.h
 ldfile.c
 ldfile.h
+ld.h
 ldlang.c
 ldlang.h
 ldlex.h
Index: ld/po/ld.pot
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/ld/po/ld.pot,v
retrieving revision 1.1.1.6
diff -u -r1.1.1.6 ld.pot
--- ld/po/ld.pot	2 Dec 2002 09:05:58 -0000	1.1.1.6
+++ ld/po/ld.pot	5 Jul 2004 22:22:43 -0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-10-30 10:08-0500\n"
+"POT-Creation-Date: 2003-07-11 13:58+0930\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,195 +15,210 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: emultempl/armcoff.em:71
+#: emultempl/armcoff.em:72
 msgid "  --support-old-code   Support interworking with old code\n"
 msgstr ""
 
-#: emultempl/armcoff.em:72
+#: emultempl/armcoff.em:73
 msgid "  --thumb-entry=<sym>  Set the entry point to be Thumb symbol <sym>\n"
 msgstr ""
 
-#: emultempl/armcoff.em:141
+#: emultempl/armcoff.em:121
 #, c-format
 msgid "Errors encountered processing file %s"
 msgstr ""
 
-#: emultempl/armcoff.em:207 emultempl/pe.em:1422
+#: emultempl/armcoff.em:188 emultempl/pe.em:1396
 msgid "%P: warning: '--thumb-entry %s' is overriding '-e %s'\n"
 msgstr ""
 
-#: emultempl/armcoff.em:212 emultempl/pe.em:1427
+#: emultempl/armcoff.em:193 emultempl/pe.em:1401
 msgid "%P: warning: connot find thumb start symbol %s\n"
 msgstr ""
 
-#: emultempl/pe.em:317
+#: emultempl/pe.em:300
 msgid ""
 "  --base_file <basefile>             Generate a base file for relocatable "
 "DLLs\n"
 msgstr ""
 
-#: emultempl/pe.em:318
+#: emultempl/pe.em:301
 msgid ""
 "  --dll                              Set image base to the default for DLLs\n"
 msgstr ""
 
-#: emultempl/pe.em:319
+#: emultempl/pe.em:302
 msgid "  --file-alignment <size>            Set file alignment\n"
 msgstr ""
 
-#: emultempl/pe.em:320
+#: emultempl/pe.em:303
 msgid "  --heap <size>                      Set initial size of the heap\n"
 msgstr ""
 
-#: emultempl/pe.em:321
+#: emultempl/pe.em:304
 msgid ""
 "  --image-base <address>             Set start address of the executable\n"
 msgstr ""
 
-#: emultempl/pe.em:322
+#: emultempl/pe.em:305
 msgid ""
 "  --major-image-version <number>     Set version number of the executable\n"
 msgstr ""
 
-#: emultempl/pe.em:323
+#: emultempl/pe.em:306
 msgid "  --major-os-version <number>        Set minimum required OS version\n"
 msgstr ""
 
-#: emultempl/pe.em:324
+#: emultempl/pe.em:307
 msgid ""
 "  --major-subsystem-version <number> Set minimum required OS subsystem "
 "version\n"
 msgstr ""
 
-#: emultempl/pe.em:325
+#: emultempl/pe.em:308
 msgid ""
 "  --minor-image-version <number>     Set revision number of the executable\n"
 msgstr ""
 
-#: emultempl/pe.em:326
+#: emultempl/pe.em:309
 msgid "  --minor-os-version <number>        Set minimum required OS revision\n"
 msgstr ""
 
-#: emultempl/pe.em:327
+#: emultempl/pe.em:310
 msgid ""
 "  --minor-subsystem-version <number> Set minimum required OS subsystem "
 "revision\n"
 msgstr ""
 
-#: emultempl/pe.em:328
+#: emultempl/pe.em:311
 msgid "  --section-alignment <size>         Set section alignment\n"
 msgstr ""
 
-#: emultempl/pe.em:329
+#: emultempl/pe.em:312
 msgid "  --stack <size>                     Set size of the initial stack\n"
 msgstr ""
 
-#: emultempl/pe.em:330
+#: emultempl/pe.em:313
 msgid ""
 "  --subsystem <name>[:<version>]     Set required OS subsystem [& version]\n"
 msgstr ""
 
-#: emultempl/pe.em:331
+#: emultempl/pe.em:314
 msgid ""
 "  --support-old-code                 Support interworking with old code\n"
 msgstr ""
 
-#: emultempl/pe.em:332
+#: emultempl/pe.em:315
 msgid ""
 "  --thumb-entry=<symbol>             Set the entry point to be Thumb "
 "<symbol>\n"
 msgstr ""
 
-#: emultempl/pe.em:334
+#: emultempl/pe.em:317
 msgid ""
 "  --add-stdcall-alias                Export symbols with and without @nn\n"
 msgstr ""
 
-#: emultempl/pe.em:335
+#: emultempl/pe.em:318
 msgid "  --disable-stdcall-fixup            Don't link _sym to _sym@nn\n"
 msgstr ""
 
-#: emultempl/pe.em:336
+#: emultempl/pe.em:319
 msgid ""
 "  --enable-stdcall-fixup             Link _sym to _sym@nn without warnings\n"
 msgstr ""
 
-#: emultempl/pe.em:337
+#: emultempl/pe.em:320
 msgid ""
 "  --exclude-symbols sym,sym,...      Exclude symbols from automatic export\n"
 msgstr ""
 
-#: emultempl/pe.em:338
+#: emultempl/pe.em:321
 msgid ""
 "  --exclude-libs lib,lib,...         Exclude libraries from automatic "
 "export\n"
 msgstr ""
 
-#: emultempl/pe.em:339
+#: emultempl/pe.em:322
 msgid ""
 "  --export-all-symbols               Automatically export all globals to "
 "DLL\n"
 msgstr ""
 
-#: emultempl/pe.em:340
+#: emultempl/pe.em:323
 msgid "  --kill-at                          Remove @nn from exported symbols\n"
 msgstr ""
 
-#: emultempl/pe.em:341
+#: emultempl/pe.em:324
 msgid "  --out-implib <file>                Generate import library\n"
 msgstr ""
 
-#: emultempl/pe.em:342
+#: emultempl/pe.em:325
 msgid ""
 "  --output-def <file>                Generate a .DEF file for the built DLL\n"
 msgstr ""
 
-#: emultempl/pe.em:343
+#: emultempl/pe.em:326
 msgid "  --warn-duplicate-exports           Warn about duplicate exports.\n"
 msgstr ""
 
-#: emultempl/pe.em:344
+#: emultempl/pe.em:327
 msgid ""
 "  --compat-implib                    Create backward compatible import "
 "libs;\n"
 "                                       create __imp_<SYMBOL> as well.\n"
 msgstr ""
 
-#: emultempl/pe.em:346
+#: emultempl/pe.em:329
 msgid ""
 "  --enable-auto-image-base           Automatically choose image base for "
 "DLLs\n"
 "                                       unless user specifies one\n"
 msgstr ""
 
-#: emultempl/pe.em:348
+#: emultempl/pe.em:331
 msgid ""
 "  --disable-auto-image-base          Do not auto-choose image base. "
 "(default)\n"
 msgstr ""
 
-#: emultempl/pe.em:349
+#: emultempl/pe.em:332
 msgid ""
 "  --dll-search-prefix=<string>       When linking dynamically to a dll "
-"without an\n"
-"                                       importlib, use <string><basename>."
-"dll \n"
+"without\n"
+"                                       an importlib, use <string><basename>."
+"dll\n"
 "                                       in preference to lib<basename>.dll \n"
 msgstr ""
 
-#: emultempl/pe.em:352
+#: emultempl/pe.em:335
 msgid ""
-"  --enable-auto-import               Do sophistcated linking of _sym to \n"
+"  --enable-auto-import               Do sophistcated linking of _sym to\n"
 "                                       __imp_sym for DATA references\n"
 msgstr ""
 
-#: emultempl/pe.em:354
+#: emultempl/pe.em:337
 msgid ""
 "  --disable-auto-import              Do not auto-import DATA items from "
 "DLLs\n"
 msgstr ""
 
-#: emultempl/pe.em:355
+#: emultempl/pe.em:338
+msgid ""
+"  --enable-runtime-pseudo-reloc      Work around auto-import limitations by\n"
+"                                       adding pseudo-relocations resolved "
+"at\n"
+"                                       runtime.\n"
+msgstr ""
+
+#: emultempl/pe.em:341
+msgid ""
+"  --disable-runtime-pseudo-reloc     Do not add runtime pseudo-relocations "
+"for\n"
+"                                       auto-imported DATA.\n"
+msgstr ""
+
+#: emultempl/pe.em:343
 msgid ""
 "  --enable-extra-pe-debug            Enable verbose debug output when "
 "building\n"
@@ -211,119 +226,113 @@
 "import)\n"
 msgstr ""
 
-#: emultempl/pe.em:424
+#: emultempl/pe.em:412
 msgid "%P: warning: bad version number in -subsystem option\n"
 msgstr ""
 
-#: emultempl/pe.em:460
+#: emultempl/pe.em:448
 msgid "%P%F: invalid subsystem type %s\n"
 msgstr ""
 
-#: emultempl/pe.em:475
+#: emultempl/pe.em:460
 msgid "%P%F: invalid hex number for PE parameter '%s'\n"
 msgstr ""
 
-#: emultempl/pe.em:493
+#: emultempl/pe.em:477
 msgid "%P%F: strange hex info for PE parameter '%s'\n"
 msgstr ""
 
-#: emultempl/pe.em:532
+#: emultempl/pe.em:494
 #, c-format
 msgid "%s: Can't open base file %s\n"
 msgstr ""
 
-#: emultempl/pe.em:738
+#: emultempl/pe.em:707
 msgid "%P: warning, file alignment > section alignment.\n"
 msgstr ""
 
-#: emultempl/pe.em:822 emultempl/pe.em:848
+#: emultempl/pe.em:794 emultempl/pe.em:821
 #, c-format
 msgid "Warning: resolving %s by linking to %s\n"
 msgstr ""
 
-#: emultempl/pe.em:827 emultempl/pe.em:853
+#: emultempl/pe.em:799 emultempl/pe.em:826
 msgid "Use --enable-stdcall-fixup to disable these warnings\n"
 msgstr ""
 
-#: emultempl/pe.em:828 emultempl/pe.em:854
+#: emultempl/pe.em:800 emultempl/pe.em:827
 msgid "Use --disable-stdcall-fixup to disable these fixups\n"
 msgstr ""
 
-#: emultempl/pe.em:879
+#: emultempl/pe.em:846
 #, c-format
 msgid "%C: Cannot get section contents - auto-import exception\n"
 msgstr ""
 
-#: emultempl/pe.em:887
-msgid ""
-"%C: variable '%T' can't be auto-imported. Please read the documentation for "
-"ld's --enable-auto-import for details.\n"
-msgstr ""
-
-#: emultempl/pe.em:916
+#: emultempl/pe.em:883
 #, c-format
 msgid "Info: resolving %s by linking to %s (auto-import)\n"
 msgstr ""
 
-#: emultempl/pe.em:997
+#: emultempl/pe.em:954
 msgid "%F%P: PE operations on non PE file.\n"
 msgstr ""
 
-#: emultempl/pe.em:1226
+#: emultempl/pe.em:1188
 #, c-format
 msgid "Errors encountered processing file %s\n"
 msgstr ""
 
-#: emultempl/pe.em:1249
+#: emultempl/pe.em:1211
 #, c-format
 msgid "Errors encountered processing file %s for interworking"
 msgstr ""
 
-#: emultempl/pe.em:1305 ldlang.c:2071 ldlang.c:4613 ldlang.c:4646
-#: ldmain.c:1062
+#: emultempl/pe.em:1273 ldlang.c:1904 ldlang.c:4397 ldlang.c:4428
+#: ldmain.c:1122
 msgid "%P%F: bfd_link_hash_lookup failed: %E\n"
 msgstr ""
 
-#: ldcref.c:158
+#: ldcref.c:153
 msgid "%X%P: bfd_hash_table_init of cref table failed: %E\n"
 msgstr ""
 
-#: ldcref.c:164
+#: ldcref.c:159
 msgid "%X%P: cref_hash_lookup failed: %E\n"
 msgstr ""
 
-#: ldcref.c:235
+#: ldcref.c:225
 msgid ""
 "\n"
 "Cross Reference Table\n"
 "\n"
 msgstr ""
 
-#: ldcref.c:236
+#: ldcref.c:226
 msgid "Symbol"
 msgstr ""
 
-#: ldcref.c:244
+#: ldcref.c:234
 msgid "File\n"
 msgstr ""
 
-#: ldcref.c:248
+#: ldcref.c:238
 msgid "No symbols\n"
 msgstr ""
 
-#: ldcref.c:400
+#: ldcref.c:384
 msgid "%P: symbol `%T' missing from main hash table\n"
 msgstr ""
 
-#: ldcref.c:465
+#: ldcref.c:448
 msgid "%B%F: could not read symbols; %E\n"
 msgstr ""
 
-#: ldcref.c:469 ldmain.c:1128 ldmain.c:1132
+#: ldcref.c:452 ldmain.c:1187 ldmain.c:1191
 msgid "%B%F: could not read symbols: %E\n"
 msgstr ""
 
-#: ldcref.c:537 ldcref.c:544 ldmain.c:1178 ldmain.c:1185
+#: ldcref.c:517 ldcref.c:524 ldmain.c:1234 ldmain.c:1241
 msgid "%B%F: could not read relocs: %E\n"
 msgstr ""
 
@@ -331,369 +340,377 @@
 #. in OUTSECNAME.  This reloc is from a section which is
 #. mapped into a section from which references to OUTSECNAME
 #. are prohibited.  We must report an error.
-#: ldcref.c:563
+#: ldcref.c:543
 msgid "%X%C: prohibited cross reference from %s to `%T' in %s\n"
 msgstr ""
 
-#: ldctor.c:88
+#: ldctor.c:84
 msgid "%P%X: Different relocs used in set %s\n"
 msgstr ""
 
-#: ldctor.c:106
+#: ldctor.c:102
 msgid "%P%X: Different object file formats composing set %s\n"
 msgstr ""
 
-#: ldctor.c:288 ldctor.c:302
+#: ldctor.c:281 ldctor.c:295
 msgid "%P%X: %s does not support reloc %s for set %s\n"
 msgstr ""
 
-#: ldctor.c:323
+#: ldctor.c:316
 msgid "%P%X: Unsupported size %d for set %s\n"
 msgstr ""
 
-#: ldctor.c:344
+#: ldctor.c:337
 msgid ""
 "\n"
 "Set                 Symbol\n"
 "\n"
 msgstr ""
 
-#: ldemul.c:225
+#: ldemul.c:247
 #, c-format
 msgid "%S SYSLIB ignored\n"
 msgstr ""
 
-#: ldemul.c:232
+#: ldemul.c:254
 #, c-format
 msgid "%S HLL ignored\n"
 msgstr ""
 
-#: ldemul.c:253
+#: ldemul.c:275
 msgid "%P: unrecognised emulation mode: %s\n"
 msgstr ""
 
-#: ldemul.c:254
+#: ldemul.c:276
 msgid "Supported emulations: "
 msgstr ""
 
-#: ldemul.c:298
+#: ldemul.c:320
 msgid "  no emulation specific options.\n"
 msgstr ""
 
-#: ldexp.c:184
+#: ldexp.c:148
 msgid "%F%P: %s uses undefined section %s\n"
 msgstr ""
 
-#: ldexp.c:186
+#: ldexp.c:150
 msgid "%F%P: %s forward reference of section %s\n"
 msgstr ""
 
-#: ldexp.c:400
+#: ldexp.c:355
 #, c-format
 msgid "%F%S %% by zero\n"
 msgstr ""
 
-#: ldexp.c:407
+#: ldexp.c:362
 #, c-format
 msgid "%F%S / by zero\n"
 msgstr ""
 
-#: ldexp.c:581
+#: ldexp.c:533
 #, c-format
 msgid "%X%S: unresolvable symbol `%s' referenced in expression\n"
 msgstr ""
 
-#: ldexp.c:601
+#: ldexp.c:553
 #, c-format
 msgid "%F%S: undefined symbol `%s' referenced in expression\n"
 msgstr ""
 
-#: ldexp.c:726
+#: ldexp.c:677
 #, c-format
 msgid "%F%S can not PROVIDE assignment to location counter\n"
 msgstr ""
 
-#: ldexp.c:736
+#: ldexp.c:687
 #, c-format
 msgid "%F%S invalid assignment to location counter\n"
 msgstr ""
 
-#: ldexp.c:740
+#: ldexp.c:691
 #, c-format
 msgid "%F%S assignment to location counter invalid outside of SECTION\n"
 msgstr ""
 
-#: ldexp.c:749
+#: ldexp.c:700
 msgid "%F%S cannot move location counter backwards (from %V to %V)\n"
 msgstr ""
 
-#: ldexp.c:776
+#: ldexp.c:727
 msgid "%P%F:%s: hash creation failed\n"
 msgstr ""
 
-#: ldexp.c:1078 ldexp.c:1112
+#: ldexp.c:1003 ldexp.c:1035
 #, c-format
 msgid "%F%S nonconstant expression for %s\n"
 msgstr ""
 
-#: ldexp.c:1167
+#: ldexp.c:1089
 #, c-format
 msgid "%F%S non constant expression for %s\n"
 msgstr ""
 
-#: ldfile.c:105
+#: ldfile.c:144
 #, c-format
 msgid "attempt to open %s failed\n"
 msgstr ""
 
-#: ldfile.c:107
+#: ldfile.c:146
 #, c-format
 msgid "attempt to open %s succeeded\n"
 msgstr ""
 
-#: ldfile.c:113
+#: ldfile.c:152
 msgid "%F%P: invalid BFD target `%s'\n"
 msgstr ""
 
-#: ldfile.c:218 ldfile.c:234
+#: ldfile.c:258 ldfile.c:275
 msgid "%P: skipping incompatible %s when searching for %s\n"
 msgstr ""
 
-#: ldfile.c:326
+#: ldfile.c:377
 msgid "%F%P: cannot open %s for %s: %E\n"
 msgstr ""
 
-#: ldfile.c:329
+#: ldfile.c:380
 msgid "%F%P: cannot open %s: %E\n"
 msgstr ""
 
-#: ldfile.c:359
+#: ldfile.c:410
+msgid "%F%P: cannot find %s inside %s\n"
+msgstr ""
+
+#: ldfile.c:413
 msgid "%F%P: cannot find %s\n"
 msgstr ""
 
-#: ldfile.c:378 ldfile.c:394
+#: ldfile.c:430 ldfile.c:446
 #, c-format
 msgid "cannot find script file %s\n"
 msgstr ""
 
-#: ldfile.c:380 ldfile.c:396
+#: ldfile.c:432 ldfile.c:448
 #, c-format
 msgid "opened script file %s\n"
 msgstr ""
 
-#: ldfile.c:445
+#: ldfile.c:492
 msgid "%P%F: cannot open linker script file %s: %E\n"
 msgstr ""
 
-#: ldfile.c:483
+#: ldfile.c:529
 msgid "%P%F: unknown architecture: %s\n"
 msgstr ""
 
-#: ldfile.c:499
+#: ldfile.c:543
 msgid "%P%F: target architecture respecified\n"
 msgstr ""
 
-#: ldfile.c:553
+#: ldfile.c:594
 msgid "%P%F: cannot represent machine `%s'\n"
 msgstr ""
 
-#: ldlang.c:784
+#: ldlang.c:640
 msgid ""
 "\n"
 "Memory Configuration\n"
 "\n"
 msgstr ""
 
-#: ldlang.c:786
+#: ldlang.c:642
 msgid "Name"
 msgstr ""
 
-#: ldlang.c:786
+#: ldlang.c:642
 msgid "Origin"
 msgstr ""
 
-#: ldlang.c:786
+#: ldlang.c:642
 msgid "Length"
 msgstr ""
 
-#: ldlang.c:786
+#: ldlang.c:642
 msgid "Attributes"
 msgstr ""
 
-#: ldlang.c:828
+#: ldlang.c:682
 msgid ""
 "\n"
 "Linker script and memory map\n"
 "\n"
 msgstr ""
 
-#: ldlang.c:845
+#: ldlang.c:698
 msgid "%P%F: Illegal use of `%s' section\n"
 msgstr ""
 
-#: ldlang.c:855
+#: ldlang.c:707
 msgid "%P%F: output format %s cannot represent section called %s\n"
 msgstr ""
 
-#: ldlang.c:1016
+#: ldlang.c:867
 msgid "%P: %B: warning: ignoring duplicate section `%s'\n"
 msgstr ""
 
-#: ldlang.c:1019
+#: ldlang.c:870
 msgid "%P: %B: warning: ignoring duplicate `%s' section symbol `%s'\n"
 msgstr ""
 
-#: ldlang.c:1033
+#: ldlang.c:884
 msgid "%P: %B: warning: duplicate section `%s' has different size\n"
 msgstr ""
 
-#: ldlang.c:1084
+#: ldlang.c:936
 msgid "%P%F: Failed to create hash table\n"
 msgstr ""
 
-#: ldlang.c:1503
+#: ldlang.c:1351
 msgid "%B: file not recognized: %E\n"
 msgstr ""
 
-#: ldlang.c:1504
+#: ldlang.c:1352
 msgid "%B: matching formats:"
 msgstr ""
 
-#: ldlang.c:1511
+#: ldlang.c:1359
 msgid "%F%B: file not recognized: %E\n"
 msgstr ""
 
-#: ldlang.c:1567
+#: ldlang.c:1418
 msgid "%F%B: member %B in archive is not an object\n"
 msgstr ""
 
-#: ldlang.c:1578 ldlang.c:1592
+#: ldlang.c:1429 ldlang.c:1443
 msgid "%F%B: could not read symbols: %E\n"
 msgstr ""
 
-#: ldlang.c:1859
+#: ldlang.c:1698
 msgid ""
 "%P: warning: could not find any targets that match endianness requirement\n"
 msgstr ""
 
-#: ldlang.c:1872
+#: ldlang.c:1711
 msgid "%P%F: target %s not found\n"
 msgstr ""
 
-#: ldlang.c:1874
+#: ldlang.c:1713
 msgid "%P%F: cannot open output file %s: %E\n"
 msgstr ""
 
-#: ldlang.c:1884
+#: ldlang.c:1723
 msgid "%P%F:%s: can not make object file: %E\n"
 msgstr ""
 
-#: ldlang.c:1888
+#: ldlang.c:1727
 msgid "%P%F:%s: can not set architecture: %E\n"
 msgstr ""
 
-#: ldlang.c:1892
+#: ldlang.c:1731
 msgid "%P%F: can not create link hash table: %E\n"
 msgstr ""
 
-#: ldlang.c:2241
+#: ldlang.c:2069
 msgid " load address 0x%V"
 msgstr ""
 
-#: ldlang.c:2381
+#: ldlang.c:2204
 msgid "%W (size before relaxing)\n"
 msgstr ""
 
-#: ldlang.c:2468
+#: ldlang.c:2288
 #, c-format
 msgid "Address of section %s set to "
 msgstr ""
 
-#: ldlang.c:2629
+#: ldlang.c:2443
 #, c-format
 msgid "Fail with %d\n"
 msgstr ""
 
-#: ldlang.c:2874
+#: ldlang.c:2683
 msgid "%X%P: section %s [%V -> %V] overlaps section %s [%V -> %V]\n"
 msgstr ""
 
-#: ldlang.c:2903
+#: ldlang.c:2711
 msgid "%X%P: address 0x%v of %B section %s is not within region %s\n"
 msgstr ""
 
-#: ldlang.c:2911
+#: ldlang.c:2719
 msgid "%X%P: region %s is full (%B section %s)\n"
 msgstr ""
 
-#: ldlang.c:2961
+#: ldlang.c:2770
 msgid "%P%X: Internal error on COFF shared library section %s\n"
 msgstr ""
 
-#: ldlang.c:3005
-msgid "%P: warning: no memory region specified for section `%s'\n"
+#: ldlang.c:2826
+msgid "%P%F: error: no memory region specified for loadable section `%s'\n"
+msgstr ""
+
+#: ldlang.c:2830
+msgid "%P: warning: no memory region specified for loadable section `%s'\n"
 msgstr ""
 
-#: ldlang.c:3020
+#: ldlang.c:2846
 msgid "%P: warning: changing start of section %s by %u bytes\n"
 msgstr ""
 
-#: ldlang.c:3033
+#: ldlang.c:2859
 #, c-format
 msgid "%F%S: non constant address expression for section %s\n"
 msgstr ""
 
-#: ldlang.c:3208
+#: ldlang.c:3036
 msgid "%P%F: can't relax section: %E\n"
 msgstr ""
 
-#: ldlang.c:3403
+#: ldlang.c:3232
 msgid "%F%P: invalid data statement\n"
 msgstr ""
 
-#: ldlang.c:3440
+#: ldlang.c:3269
 msgid "%F%P: invalid reloc statement\n"
 msgstr ""
 
-#: ldlang.c:3579
+#: ldlang.c:3408
 msgid "%P%F:%s: can't set start address\n"
 msgstr ""
 
-#: ldlang.c:3592 ldlang.c:3610
+#: ldlang.c:3421 ldlang.c:3439
 msgid "%P%F: can't set start address\n"
 msgstr ""
 
-#: ldlang.c:3604
+#: ldlang.c:3433
 msgid "%P: warning: cannot find entry symbol %s; defaulting to %V\n"
 msgstr ""
 
-#: ldlang.c:3615
+#: ldlang.c:3444
 msgid "%P: warning: cannot find entry symbol %s; not setting start address\n"
 msgstr ""
 
-#: ldlang.c:3665
+#: ldlang.c:3488
 msgid ""
 "%P%F: Relocatable linking with relocations from format %s (%B) to format %s "
 "(%B) is not supported\n"
 msgstr ""
 
-#: ldlang.c:3674
+#: ldlang.c:3497
 msgid ""
 "%P: warning: %s architecture of input file `%B' is incompatible with %s "
 "output\n"
 msgstr ""
 
-#: ldlang.c:3695
+#: ldlang.c:3518
 msgid "%E%X: failed to merge target specific data of file %B\n"
 msgstr ""
 
-#: ldlang.c:3784
+#: ldlang.c:3604
 msgid ""
 "\n"
 "Allocating common symbols\n"
 msgstr ""
 
-#: ldlang.c:3785
+#: ldlang.c:3605
 msgid ""
 "Common symbol       size              file\n"
 "\n"
@@ -702,859 +719,888 @@
 #. This message happens when using the
 #. svr3.ifile linker script, so I have
 #. disabled it.
-#: ldlang.c:3863
+#: ldlang.c:3681
 msgid "%P: no [COMMON] command, defaulting to .bss\n"
 msgstr ""
 
-#: ldlang.c:3922
+#: ldlang.c:3737
 msgid "%P%F: invalid syntax in flags\n"
 msgstr ""
 
-#: ldlang.c:4537
+#: ldlang.c:4325
 msgid "%P%Fmultiple STARTUP files\n"
 msgstr ""
 
-#: ldlang.c:4580
+#: ldlang.c:4368
 msgid "%X%P:%S: section has both a load address and a load region\n"
 msgstr ""
 
-#: ldlang.c:4830
+#: ldlang.c:4608
 msgid "%F%P: bfd_record_phdr failed: %E\n"
 msgstr ""
 
-#: ldlang.c:4849
+#: ldlang.c:4627
 msgid "%X%P: section `%s' assigned to non-existent phdr `%s'\n"
 msgstr ""
 
-#: ldlang.c:5150
+#: ldlang.c:4919
 msgid "%X%P: unknown language `%s' in version information\n"
 msgstr ""
 
-#: ldlang.c:5202
+#: ldlang.c:4969
 msgid ""
 "%X%P: anonymous version tag cannot be combined with other version tags\n"
 msgstr ""
 
-#: ldlang.c:5209
+#: ldlang.c:4977
 msgid "%X%P: duplicate version tag `%s'\n"
 msgstr ""
 
-#: ldlang.c:5222 ldlang.c:5235
+#: ldlang.c:4990 ldlang.c:5003
 msgid "%X%P: duplicate expression `%s' in version information\n"
 msgstr ""
 
-#: ldlang.c:5277
+#: ldlang.c:5043
 msgid "%X%P: unable to find version dependency `%s'\n"
 msgstr ""
 
-#: ldlang.c:5299
+#: ldlang.c:5065
 msgid "%X%P: unable to read .exports section contents\n"
 msgstr ""
 
-#: ldmain.c:198
+#: ldmain.c:247
 msgid "%X%P: can't set BFD default target to `%s': %E\n"
 msgstr ""
 
-#: ldmain.c:291
+#: ldmain.c:349
 msgid "%P%F: -r and --mpc860c0 may not be used together\n"
 msgstr ""
 
-#: ldmain.c:293
+#: ldmain.c:351
 msgid "%P%F: --relax and -r may not be used together\n"
 msgstr ""
 
-#: ldmain.c:295
+#: ldmain.c:353
 msgid "%P%F: -r and -shared may not be used together\n"
 msgstr ""
 
-#: ldmain.c:301
+#: ldmain.c:359
 msgid "%P%F: -F may not be used without -shared\n"
 msgstr ""
 
-#: ldmain.c:303
+#: ldmain.c:361
 msgid "%P%F: -f may not be used without -shared\n"
 msgstr ""
 
-#: ldmain.c:342
+#: ldmain.c:403
 msgid "using external linker script:"
 msgstr ""
 
-#: ldmain.c:344
+#: ldmain.c:405
 msgid "using internal linker script:"
 msgstr ""
 
-#: ldmain.c:378
+#: ldmain.c:439
 msgid "%P%F: no input files\n"
 msgstr ""
 
-#: ldmain.c:383
+#: ldmain.c:443
 msgid "%P: mode %s\n"
 msgstr ""
 
-#: ldmain.c:400
+#: ldmain.c:459
 msgid "%P%F: cannot open map file %s: %E\n"
 msgstr ""
 
-#: ldmain.c:433
+#: ldmain.c:489
 msgid "%P: link errors found, deleting executable `%s'\n"
 msgstr ""
 
-#: ldmain.c:444
+#: ldmain.c:498
 msgid "%F%B: final close failed: %E\n"
 msgstr ""
 
-#: ldmain.c:468
+#: ldmain.c:524
 msgid "%X%P: unable to open for source of copy `%s'\n"
 msgstr ""
 
-#: ldmain.c:470
+#: ldmain.c:527
 msgid "%X%P: unable to open for destination of copy `%s'\n"
 msgstr ""
 
-#: ldmain.c:476
+#: ldmain.c:534
 msgid "%P: Error writing file `%s'\n"
 msgstr ""
 
-#: ldmain.c:482 pe-dll.c:1465
+#: ldmain.c:539 pe-dll.c:1443
 #, c-format
 msgid "%P: Error closing file `%s'\n"
 msgstr ""
 
-#: ldmain.c:499
+#: ldmain.c:555
 #, c-format
 msgid "%s: total time in link: %ld.%06ld\n"
 msgstr ""
 
-#: ldmain.c:502
+#: ldmain.c:558
 #, c-format
 msgid "%s: data size %ld\n"
 msgstr ""
 
-#: ldmain.c:543
+#: ldmain.c:596
 msgid "%P%F: missing argument to -m\n"
 msgstr ""
 
-#: ldmain.c:671 ldmain.c:692 ldmain.c:723
+#: ldmain.c:741 ldmain.c:759 ldmain.c:789
 msgid "%P%F: bfd_hash_table_init failed: %E\n"
 msgstr ""
 
-#: ldmain.c:676 ldmain.c:695
+#: ldmain.c:745 ldmain.c:763
 msgid "%P%F: bfd_hash_lookup failed: %E\n"
 msgstr ""
 
-#: ldmain.c:710
+#: ldmain.c:777
 msgid "%X%P: error: duplicate retain-symbols-file\n"
 msgstr ""
 
-#: ldmain.c:754
+#: ldmain.c:819
 msgid "%P%F: bfd_hash_lookup for insertion failed: %E\n"
 msgstr ""
 
-#: ldmain.c:759
+#: ldmain.c:824
 msgid "%P: `-retain-symbols-file' overrides `-s' and `-S'\n"
 msgstr ""
 
-#: ldmain.c:835
+#: ldmain.c:899
 msgid ""
 "Archive member included because of file (symbol)\n"
 "\n"
 msgstr ""
 
-#: ldmain.c:906
+#: ldmain.c:969
 msgid "%X%C: multiple definition of `%T'\n"
 msgstr ""
 
-#: ldmain.c:909
+#: ldmain.c:972
 msgid "%D: first defined here\n"
 msgstr ""
 
-#: ldmain.c:913
+#: ldmain.c:976
 msgid "%P: Disabling relaxation: it will not work with multiple definitions\n"
 msgstr ""
 
-#: ldmain.c:944
+#: ldmain.c:1006
 msgid "%B: warning: definition of `%T' overriding common\n"
 msgstr ""
 
-#: ldmain.c:947
+#: ldmain.c:1009
 msgid "%B: warning: common is here\n"
 msgstr ""
 
-#: ldmain.c:954
+#: ldmain.c:1016
 msgid "%B: warning: common of `%T' overridden by definition\n"
 msgstr ""
 
-#: ldmain.c:957
+#: ldmain.c:1019
 msgid "%B: warning: defined here\n"
 msgstr ""
 
-#: ldmain.c:964
+#: ldmain.c:1026
 msgid "%B: warning: common of `%T' overridden by larger common\n"
 msgstr ""
 
-#: ldmain.c:967
+#: ldmain.c:1029
 msgid "%B: warning: larger common is here\n"
 msgstr ""
 
-#: ldmain.c:971
+#: ldmain.c:1033
 msgid "%B: warning: common of `%T' overriding smaller common\n"
 msgstr ""
 
-#: ldmain.c:974
+#: ldmain.c:1036
 msgid "%B: warning: smaller common is here\n"
 msgstr ""
 
-#: ldmain.c:978
+#: ldmain.c:1040
 msgid "%B: warning: multiple common of `%T'\n"
 msgstr ""
 
-#: ldmain.c:980
+#: ldmain.c:1042
 msgid "%B: warning: previous common is here\n"
 msgstr ""
 
-#: ldmain.c:1001 ldmain.c:1040
+#: ldmain.c:1062 ldmain.c:1100
 msgid "%P: warning: global constructor %s used\n"
 msgstr ""
 
-#: ldmain.c:1050
+#: ldmain.c:1110
 msgid "%P%F: BFD backend error: BFD_RELOC_CTOR unsupported\n"
 msgstr ""
 
-#: ldmain.c:1234
+#: ldmain.c:1287 ldmisc.c:533
 msgid "%F%P: bfd_hash_table_init failed: %E\n"
 msgstr ""
 
-#: ldmain.c:1241
+#: ldmain.c:1294 ldmisc.c:540
 msgid "%F%P: bfd_hash_lookup failed: %E\n"
 msgstr ""
 
-#: ldmain.c:1261
+#: ldmain.c:1314
 msgid "%C: undefined reference to `%T'\n"
 msgstr ""
 
-#: ldmain.c:1267
+#: ldmain.c:1320
 msgid "%D: more undefined references to `%T' follow\n"
 msgstr ""
 
-#: ldmain.c:1274
+#: ldmain.c:1327
 msgid "%B: undefined reference to `%T'\n"
 msgstr ""
 
-#: ldmain.c:1280
+#: ldmain.c:1333
 msgid "%B: more undefined references to `%T' follow\n"
 msgstr ""
 
-#: ldmain.c:1300 ldmain.c:1321 ldmain.c:1340
+#: ldmain.c:1364 ldmain.c:1392 ldmain.c:1410
 msgid "%P%X: generated"
 msgstr ""
 
-#: ldmain.c:1303
+#: ldmain.c:1371
+msgid " additional relocation overflows omitted from the output\n"
+msgstr ""
+
+#: ldmain.c:1375
 msgid " relocation truncated to fit: %s %T"
 msgstr ""
 
-#: ldmain.c:1324
+#: ldmain.c:1395
 #, c-format
 msgid "dangerous relocation: %s\n"
 msgstr ""
 
-#: ldmain.c:1343
+#: ldmain.c:1413
 msgid " reloc refers to symbol `%T' which is not being output\n"
 msgstr ""
 
-#: ldmisc.c:157
+#: ldmisc.c:147
 msgid "no symbol"
 msgstr ""
 
-#: ldmisc.c:221
+#: ldmisc.c:211
 #, c-format
 msgid "built in linker script:%u"
 msgstr ""
 
-#: ldmisc.c:271 ldmisc.c:275
+#: ldmisc.c:260 ldmisc.c:264
 msgid "%B%F: could not read symbols\n"
 msgstr ""
 
-#. We use abfd->filename in this initial line,
-#. in case filename is a .h file or something
-#. similarly unhelpful.
-#: ldmisc.c:311
-msgid "%B: In function `%T':\n"
+#: ldmisc.c:291
+msgid ": In function `%T':\n"
 msgstr ""
 
-#: ldmisc.c:463
+#: ldmisc.c:438
 msgid "%F%P: internal error %s %d\n"
 msgstr ""
 
-#: ldmisc.c:513
+#: ldmisc.c:484
 msgid "%P: internal error: aborting at %s line %d in %s\n"
 msgstr ""
 
-#: ldmisc.c:516
+#: ldmisc.c:487
 msgid "%P: internal error: aborting at %s line %d\n"
 msgstr ""
 
-#: ldmisc.c:518
+#: ldmisc.c:489
 msgid "%P%F: please report this bug\n"
 msgstr ""
 
 #. Output for noisy == 2 is intended to follow the GNU standards.
-#: ldver.c:38
+#: ldver.c:39
 #, c-format
 msgid "GNU ld version %s\n"
 msgstr ""
 
-#: ldver.c:42
+#: ldver.c:43
 msgid "Copyright 2002 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: ldver.c:43
+#: ldver.c:44
 msgid ""
 "This program is free software; you may redistribute it under the terms of\n"
 "the GNU General Public License.  This program has absolutely no warranty.\n"
 msgstr ""
 
-#: ldver.c:52
+#: ldver.c:53
 msgid "  Supported emulations:\n"
 msgstr ""
 
-#: ldwrite.c:59 ldwrite.c:195
+#: ldwrite.c:54 ldwrite.c:190
 msgid "%P%F: bfd_new_link_order failed\n"
 msgstr ""
 
-#: ldwrite.c:325
+#: ldwrite.c:310
 msgid "%F%P: clone section failed: %E\n"
 msgstr ""
 
-#: ldwrite.c:364
+#: ldwrite.c:348
 #, c-format
 msgid "%8x something else\n"
 msgstr ""
 
-#: ldwrite.c:547
+#: ldwrite.c:525
 msgid "%F%P: final link failed: %E\n"
 msgstr ""
 
-#: lexsup.c:173 lexsup.c:268
+#: lexsup.c:179 lexsup.c:284
 msgid "KEYWORD"
 msgstr ""
 
-#: lexsup.c:173
+#: lexsup.c:179
 msgid "Shared library control for HP/UX compatibility"
 msgstr ""
 
-#: lexsup.c:176
+#: lexsup.c:182
 msgid "ARCH"
 msgstr ""
 
-#: lexsup.c:176
+#: lexsup.c:182
 msgid "Set architecture"
 msgstr ""
 
-#: lexsup.c:178 lexsup.c:339
+#: lexsup.c:184 lexsup.c:357
 msgid "TARGET"
 msgstr ""
 
-#: lexsup.c:178
+#: lexsup.c:184
 msgid "Specify target for following input files"
 msgstr ""
 
-#: lexsup.c:180 lexsup.c:221 lexsup.c:233 lexsup.c:242 lexsup.c:313
-#: lexsup.c:346 lexsup.c:386
+#: lexsup.c:186 lexsup.c:229 lexsup.c:241 lexsup.c:254 lexsup.c:329
+#: lexsup.c:364 lexsup.c:408
 msgid "FILE"
 msgstr ""
 
-#: lexsup.c:180
+#: lexsup.c:186
 msgid "Read MRI format linker script"
 msgstr ""
 
-#: lexsup.c:182
+#: lexsup.c:188
 msgid "Force common symbols to be defined"
 msgstr ""
 
-#: lexsup.c:186 lexsup.c:376 lexsup.c:378 lexsup.c:380
+#: lexsup.c:192 lexsup.c:398 lexsup.c:400 lexsup.c:402
 msgid "ADDRESS"
 msgstr ""
 
-#: lexsup.c:186
+#: lexsup.c:192
 msgid "Set start address"
 msgstr ""
 
-#: lexsup.c:188
+#: lexsup.c:194
 msgid "Export all dynamic symbols"
 msgstr ""
 
-#: lexsup.c:190
+#: lexsup.c:196
 msgid "Link big-endian objects"
 msgstr ""
 
-#: lexsup.c:192
+#: lexsup.c:198
 msgid "Link little-endian objects"
 msgstr ""
 
-#: lexsup.c:194 lexsup.c:197
+#: lexsup.c:200 lexsup.c:203
 msgid "SHLIB"
 msgstr ""
 
-#: lexsup.c:194
+#: lexsup.c:200
 msgid "Auxiliary filter for shared object symbol table"
 msgstr ""
 
-#: lexsup.c:197
+#: lexsup.c:203
 msgid "Filter for shared object symbol table"
 msgstr ""
 
-#: lexsup.c:199
+#: lexsup.c:205
 msgid "Ignored"
 msgstr ""
 
-#: lexsup.c:201
+#: lexsup.c:207
 msgid "SIZE"
 msgstr ""
 
-#: lexsup.c:201
+#: lexsup.c:207
 msgid "Small data size (if no size, same as --shared)"
 msgstr ""
 
-#: lexsup.c:204
+#: lexsup.c:210
 msgid "FILENAME"
 msgstr ""
 
-#: lexsup.c:204
+#: lexsup.c:210
 msgid "Set internal name of shared library"
 msgstr ""
 
-#: lexsup.c:206
+#: lexsup.c:212
 msgid "PROGRAM"
 msgstr ""
 
-#: lexsup.c:206
+#: lexsup.c:212
 msgid "Set PROGRAM as the dynamic linker to use"
 msgstr ""
 
-#: lexsup.c:208
+#: lexsup.c:214
 msgid "LIBNAME"
 msgstr ""
 
-#: lexsup.c:208
+#: lexsup.c:214
 msgid "Search for library LIBNAME"
 msgstr ""
 
-#: lexsup.c:210
+#: lexsup.c:216
 msgid "DIRECTORY"
 msgstr ""
 
-#: lexsup.c:210
+#: lexsup.c:216
 msgid "Add DIRECTORY to library search path"
 msgstr ""
 
-#: lexsup.c:212
+#: lexsup.c:218
 msgid "EMULATION"
 msgstr ""
 
-#: lexsup.c:212
+#: lexsup.c:218
 msgid "Set emulation"
 msgstr ""
 
-#: lexsup.c:214
+#: lexsup.c:220
 msgid "Print map file on standard output"
 msgstr ""
 
-#: lexsup.c:216
+#: lexsup.c:222
 msgid "Do not page align data"
 msgstr ""
 
-#: lexsup.c:218
+#: lexsup.c:224
 msgid "Do not page align data, do not make text readonly"
 msgstr ""
 
-#: lexsup.c:221
+#: lexsup.c:227
+msgid "Page align data, make text readonly"
+msgstr ""
+
+#: lexsup.c:229
 msgid "Set output file name"
 msgstr ""
 
-#: lexsup.c:223
+#: lexsup.c:231
 msgid "Optimize output file"
 msgstr ""
 
-#: lexsup.c:225
+#: lexsup.c:233
 msgid "Ignored for SVR4 compatibility"
 msgstr ""
 
-#: lexsup.c:229
-msgid "Generate relocateable output"
+#: lexsup.c:237
+msgid "Generate relocatable output"
 msgstr ""
 
-#: lexsup.c:233
+#: lexsup.c:241
 msgid "Just link symbols (if directory, same as --rpath)"
 msgstr ""
 
-#: lexsup.c:236
+#: lexsup.c:244
 msgid "Strip all symbols"
 msgstr ""
 
-#: lexsup.c:238
+#: lexsup.c:246
 msgid "Strip debugging symbols"
 msgstr ""
 
-#: lexsup.c:240
+#: lexsup.c:248
+msgid "Strip symbols in discarded sections"
+msgstr ""
+
+#: lexsup.c:250
+msgid "Do not strip symbols in discarded sections"
+msgstr ""
+
+#: lexsup.c:252
 msgid "Trace file opens"
 msgstr ""
 
-#: lexsup.c:242
+#: lexsup.c:254
 msgid "Read linker script"
 msgstr ""
 
-#: lexsup.c:244 lexsup.c:260 lexsup.c:299 lexsup.c:311 lexsup.c:370
-#: lexsup.c:389 lexsup.c:409
+#: lexsup.c:256 lexsup.c:272 lexsup.c:315 lexsup.c:327 lexsup.c:392
+#: lexsup.c:411 lexsup.c:431
 msgid "SYMBOL"
 msgstr ""
 
-#: lexsup.c:244
+#: lexsup.c:256
 msgid "Start with undefined reference to SYMBOL"
 msgstr ""
 
-#: lexsup.c:246
+#: lexsup.c:258
 msgid "[=SECTION]"
 msgstr ""
 
-#: lexsup.c:246
+#: lexsup.c:258
 msgid "Don't merge input [SECTION | orphan] sections"
 msgstr ""
 
-#: lexsup.c:248
+#: lexsup.c:260
 msgid "Build global constructor/destructor tables"
 msgstr ""
 
-#: lexsup.c:250
+#: lexsup.c:262
 msgid "Print version information"
 msgstr ""
 
-#: lexsup.c:252
+#: lexsup.c:264
 msgid "Print version and emulation information"
 msgstr ""
 
-#: lexsup.c:254
+#: lexsup.c:266
 msgid "Discard all local symbols"
 msgstr ""
 
-#: lexsup.c:256
+#: lexsup.c:268
 msgid "Discard temporary local symbols (default)"
 msgstr ""
 
-#: lexsup.c:258
+#: lexsup.c:270
 msgid "Don't discard any local symbols"
 msgstr ""
 
-#: lexsup.c:260
+#: lexsup.c:272
 msgid "Trace mentions of SYMBOL"
 msgstr ""
 
-#: lexsup.c:262 lexsup.c:348 lexsup.c:350
+#: lexsup.c:274 lexsup.c:366 lexsup.c:368
 msgid "PATH"
 msgstr ""
 
-#: lexsup.c:262
+#: lexsup.c:274
 msgid "Default search path for Solaris compatibility"
 msgstr ""
 
-#: lexsup.c:264
+#: lexsup.c:276
 msgid "Start a group"
 msgstr ""
 
-#: lexsup.c:266
+#: lexsup.c:278
 msgid "End a group"
 msgstr ""
 
-#: lexsup.c:268
+#: lexsup.c:280
+msgid "Accept input files whose architecture cannot be determined"
+msgstr ""
+
+#: lexsup.c:282
+msgid "Reject input files whose architecture is unknown"
+msgstr ""
+
+#: lexsup.c:284
 msgid "Ignored for SunOS compatibility"
 msgstr ""
 
-#: lexsup.c:270
+#: lexsup.c:286
 msgid "Link against shared libraries"
 msgstr ""
 
-#: lexsup.c:276
+#: lexsup.c:292
 msgid "Do not link against shared libraries"
 msgstr ""
 
-#: lexsup.c:284
+#: lexsup.c:300
 msgid "Bind global references locally"
 msgstr ""
 
-#: lexsup.c:286
+#: lexsup.c:302
 msgid "Check section addresses for overlaps (default)"
 msgstr ""
 
-#: lexsup.c:288
+#: lexsup.c:304
 msgid "Do not check section addresses for overlaps"
 msgstr ""
 
-#: lexsup.c:291
+#: lexsup.c:307
 msgid "Output cross reference table"
 msgstr ""
 
-#: lexsup.c:293
+#: lexsup.c:309
 msgid "SYMBOL=EXPRESSION"
 msgstr ""
 
-#: lexsup.c:293
+#: lexsup.c:309
 msgid "Define a symbol"
 msgstr ""
 
-#: lexsup.c:295
+#: lexsup.c:311
 msgid "[=STYLE]"
 msgstr ""
 
-#: lexsup.c:295
+#: lexsup.c:311
 msgid "Demangle symbol names [using STYLE]"
 msgstr ""
 
-#: lexsup.c:297
+#: lexsup.c:313
 msgid "Generate embedded relocs"
 msgstr ""
 
-#: lexsup.c:299
+#: lexsup.c:315
 msgid "Call SYMBOL at unload-time"
 msgstr ""
 
-#: lexsup.c:301
+#: lexsup.c:317
 msgid "Force generation of file with .exe suffix"
 msgstr ""
 
-#: lexsup.c:303
+#: lexsup.c:319
 msgid "Remove unused sections (on some targets)"
 msgstr ""
 
-#: lexsup.c:306
+#: lexsup.c:322
 msgid "Don't remove unused sections (default)"
 msgstr ""
 
-#: lexsup.c:309
+#: lexsup.c:325
 msgid "Print option help"
 msgstr ""
 
-#: lexsup.c:311
+#: lexsup.c:327
 msgid "Call SYMBOL at load-time"
 msgstr ""
 
-#: lexsup.c:313
+#: lexsup.c:329
 msgid "Write a map file"
 msgstr ""
 
-#: lexsup.c:315
+#: lexsup.c:331
 msgid "Do not define Common storage"
 msgstr ""
 
-#: lexsup.c:317
+#: lexsup.c:333
 msgid "Do not demangle symbol names"
 msgstr ""
 
-#: lexsup.c:319
+#: lexsup.c:335
 msgid "Use less memory and more disk I/O"
 msgstr ""
 
-#: lexsup.c:321
+#: lexsup.c:337
 msgid "Allow no undefined symbols"
 msgstr ""
 
-#: lexsup.c:323
-msgid "Allow undefined symbols in shared objects"
+#: lexsup.c:339
+msgid "Allow undefined symbols in shared objects (the default)"
 msgstr ""
 
-#: lexsup.c:325
+#: lexsup.c:341
+msgid "Do not allow undefined symbols in shared objects"
+msgstr ""
+
+#: lexsup.c:343
 msgid "Allow multiple definitions"
 msgstr ""
 
-#: lexsup.c:327
+#: lexsup.c:345
 msgid "Disallow undefined version"
 msgstr ""
 
-#: lexsup.c:329
+#: lexsup.c:347
 msgid "Don't warn about mismatched input files"
 msgstr ""
 
-#: lexsup.c:331
+#: lexsup.c:349
 msgid "Turn off --whole-archive"
 msgstr ""
 
-#: lexsup.c:333
+#: lexsup.c:351
 msgid "Create an output file even if errors occur"
 msgstr ""
 
-#: lexsup.c:337
+#: lexsup.c:355
 msgid ""
 "Only use library directories specified on\n"
 "\t\t\t\tthe command line"
 msgstr ""
 
-#: lexsup.c:339
+#: lexsup.c:357
 msgid "Specify target of output file"
 msgstr ""
 
-#: lexsup.c:341
+#: lexsup.c:359
 msgid "Ignored for Linux compatibility"
 msgstr ""
 
-#: lexsup.c:343
+#: lexsup.c:361
 msgid "Relax branches on certain targets"
 msgstr ""
 
-#: lexsup.c:346
+#: lexsup.c:364
 msgid "Keep only symbols listed in FILE"
 msgstr ""
 
-#: lexsup.c:348
+#: lexsup.c:366
 msgid "Set runtime shared library search path"
 msgstr ""
 
-#: lexsup.c:350
+#: lexsup.c:368
 msgid "Set link time shared library search path"
 msgstr ""
 
-#: lexsup.c:352
+#: lexsup.c:370
 msgid "Create a shared library"
 msgstr ""
 
-#: lexsup.c:356
+#: lexsup.c:374
+msgid "Create a position independent executable"
+msgstr ""
+
+#: lexsup.c:378
 msgid "Sort common symbols by size"
 msgstr ""
 
-#: lexsup.c:360
+#: lexsup.c:382
 msgid "COUNT"
 msgstr ""
 
-#: lexsup.c:360
+#: lexsup.c:382
 msgid "How many tags to reserve in .dynamic section"
 msgstr ""
 
-#: lexsup.c:362
+#: lexsup.c:384
 msgid "[=SIZE]"
 msgstr ""
 
-#: lexsup.c:362
+#: lexsup.c:384
 msgid "Split output sections every SIZE octets"
 msgstr ""
 
-#: lexsup.c:364
+#: lexsup.c:386
 msgid "[=COUNT]"
 msgstr ""
 
-#: lexsup.c:364
+#: lexsup.c:386
 msgid "Split output sections every COUNT relocs"
 msgstr ""
 
-#: lexsup.c:366
+#: lexsup.c:388
 msgid "Print memory usage statistics"
 msgstr ""
 
-#: lexsup.c:368
+#: lexsup.c:390
 msgid "Display target specific options"
 msgstr ""
 
-#: lexsup.c:370
+#: lexsup.c:392
 msgid "Do task level linking"
 msgstr ""
 
-#: lexsup.c:372
+#: lexsup.c:394
 msgid "Use same format as native linker"
 msgstr ""
 
-#: lexsup.c:374
+#: lexsup.c:396
 msgid "SECTION=ADDRESS"
 msgstr ""
 
-#: lexsup.c:374
+#: lexsup.c:396
 msgid "Set address of named section"
 msgstr ""
 
-#: lexsup.c:376
+#: lexsup.c:398
 msgid "Set address of .bss section"
 msgstr ""
 
-#: lexsup.c:378
+#: lexsup.c:400
 msgid "Set address of .data section"
 msgstr ""
 
-#: lexsup.c:380
+#: lexsup.c:402
 msgid "Set address of .text section"
 msgstr ""
 
-#: lexsup.c:382
+#: lexsup.c:404
 msgid "Output lots of information during link"
 msgstr ""
 
-#: lexsup.c:386
+#: lexsup.c:408
 msgid "Read version information script"
 msgstr ""
 
-#: lexsup.c:389
+#: lexsup.c:411
 msgid ""
 "Take export symbols list from .exports, using\n"
 "\t\t\t\tSYMBOL as the version."
 msgstr ""
 
-#: lexsup.c:392
+#: lexsup.c:414
 msgid "Warn about duplicate common symbols"
 msgstr ""
 
-#: lexsup.c:394
+#: lexsup.c:416
 msgid "Warn if global constructors/destructors are seen"
 msgstr ""
 
-#: lexsup.c:397
+#: lexsup.c:419
 msgid "Warn if the multiple GP values are used"
 msgstr ""
 
-#: lexsup.c:399
+#: lexsup.c:421
 msgid "Warn only once per undefined symbol"
 msgstr ""
 
-#: lexsup.c:401
+#: lexsup.c:423
 msgid "Warn if start of section changes due to alignment"
 msgstr ""
 
-#: lexsup.c:404
+#: lexsup.c:426
 msgid "Treat warnings as errors"
 msgstr ""
 
-#: lexsup.c:407
+#: lexsup.c:429
 msgid "Include all objects from following archives"
 msgstr ""
 
-#: lexsup.c:409
+#: lexsup.c:431
 msgid "Use wrapper functions for SYMBOL"
 msgstr ""
 
-#: lexsup.c:411
+#: lexsup.c:433
 msgid "[=WORDS]"
 msgstr ""
 
-#: lexsup.c:411
+#: lexsup.c:433
 msgid ""
 "Modify problematic branches in last WORDS (1-10,\n"
 "\t\t\t\tdefault 5) words of a page"
 msgstr ""
 
-#: lexsup.c:577
+#: lexsup.c:602
 msgid "%P: unrecognized option '%s'\n"
 msgstr ""
 
-#: lexsup.c:579
+#: lexsup.c:604
 msgid "%P%F: use the --help option for usage information\n"
 msgstr ""
 
-#: lexsup.c:598
+#: lexsup.c:622
 msgid "%P%F: unrecognized -a option `%s'\n"
 msgstr ""
 
-#: lexsup.c:611
+#: lexsup.c:635
 msgid "%P%F: unrecognized -assert option `%s'\n"
 msgstr ""
 
-#: lexsup.c:654
+#: lexsup.c:678
 msgid "%F%P: unknown demangling style `%s'"
 msgstr ""
 
-#: lexsup.c:714
+#: lexsup.c:737
 msgid "%P%F: invalid number `%s'\n"
 msgstr ""
 
@@ -1566,128 +1612,138 @@
 #. an error message here.  We cannot just make this a warning,
 #. increment optind, and continue because getopt is too confused
 #. and will seg-fault the next time around.
-#: lexsup.c:818
+#: lexsup.c:849
 msgid "%P%F: bad -rpath option\n"
 msgstr ""
 
-#: lexsup.c:916
+#: lexsup.c:953
 msgid "%P%F: -shared not supported\n"
 msgstr ""
 
-#: lexsup.c:948
+#: lexsup.c:962
+msgid "%P%F: -pie not supported\n"
+msgstr ""
+
+#: lexsup.c:994
 msgid "%P%F: invalid argument to option \"--section-start\"\n"
 msgstr ""
 
-#: lexsup.c:954
+#: lexsup.c:1000
 msgid "%P%F: missing argument(s) to option \"--section-start\"\n"
 msgstr ""
 
-#: lexsup.c:1103
+#: lexsup.c:1158
 msgid "%P%F: may not nest groups (--help for usage)\n"
 msgstr ""
 
-#: lexsup.c:1110
+#: lexsup.c:1165
 msgid "%P%F: group ended before it began (--help for usage)\n"
 msgstr ""
 
-#: lexsup.c:1124
+#: lexsup.c:1179
 msgid "%P%F: invalid argument to option \"mpc860c0\"\n"
 msgstr ""
 
-#: lexsup.c:1179
+#: lexsup.c:1234
 msgid "%P%F: invalid hex number `%s'\n"
 msgstr ""
 
-#: lexsup.c:1191
+#: lexsup.c:1246
 #, c-format
 msgid "Usage: %s [options] file...\n"
 msgstr ""
 
-#: lexsup.c:1193
+#: lexsup.c:1248
 msgid "Options:\n"
 msgstr ""
 
 #. Note: Various tools (such as libtool) depend upon the
 #. format of the listings below - do not change them.
-#: lexsup.c:1276
+#: lexsup.c:1331
 #, c-format
 msgid "%s: supported targets:"
 msgstr ""
 
-#: lexsup.c:1284
+#: lexsup.c:1339
 #, c-format
 msgid "%s: supported emulations: "
 msgstr ""
 
-#: lexsup.c:1289
+#: lexsup.c:1344
 #, c-format
 msgid "%s: emulation specific options:\n"
 msgstr ""
 
-#: lexsup.c:1293
+#: lexsup.c:1348
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr ""
 
-#: mri.c:334
+#: mri.c:307
 msgid "%P%F: unknown format type %s\n"
 msgstr ""
 
-#: pe-dll.c:323
+#: pe-dll.c:301
 #, c-format
 msgid "%XUnsupported PEI architecture: %s\n"
 msgstr ""
 
-#: pe-dll.c:673
+#: pe-dll.c:650
 #, c-format
 msgid "%XError, duplicate EXPORT with ordinals: %s (%d vs %d)\n"
 msgstr ""
 
-#: pe-dll.c:680
+#: pe-dll.c:657
 #, c-format
 msgid "Warning, duplicate EXPORT: %s\n"
 msgstr ""
 
-#: pe-dll.c:744
+#: pe-dll.c:723
 #, c-format
 msgid "%XCannot export %s: symbol not defined\n"
 msgstr ""
 
-#: pe-dll.c:750
+#: pe-dll.c:729
 #, c-format
 msgid "%XCannot export %s: symbol wrong type (%d vs %d)\n"
 msgstr ""
 
-#: pe-dll.c:757
+#: pe-dll.c:736
 #, c-format
 msgid "%XCannot export %s: symbol not found\n"
 msgstr ""
 
-#: pe-dll.c:872
+#: pe-dll.c:848
 #, c-format
 msgid "%XError, ordinal used twice: %d (%s vs %s)\n"
 msgstr ""
 
-#: pe-dll.c:1183
+#: pe-dll.c:1165
 #, c-format
 msgid "%XError: %d-bit reloc in dll\n"
 msgstr ""
 
-#: pe-dll.c:1318
+#: pe-dll.c:1296
 #, c-format
 msgid "%s: Can't open output def file %s\n"
 msgstr ""
 
-#: pe-dll.c:1461
+#: pe-dll.c:1439
 msgid "; no contents available\n"
 msgstr ""
 
-#: pe-dll.c:2137
+#: pe-dll.c:2203
+msgid ""
+"%C: variable '%T' can't be auto-imported. Please read the documentation for "
+"ld's --enable-auto-import for details.\n"
+msgstr ""
+
+#: pe-dll.c:2233
 #, c-format
 msgid "%XCan't open .lib file: %s\n"
 msgstr ""
 
-#: pe-dll.c:2142
+#: pe-dll.c:2238
 #, c-format
 msgid "Creating library file: %s\n"
 msgstr ""
Index: opcodes/ChangeLog
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/opcodes/ChangeLog,v
retrieving revision 1.1.1.16
diff -u -r1.1.1.16 ChangeLog
--- opcodes/ChangeLog	16 Jun 2004 05:44:17 -0000	1.1.1.16
+++ opcodes/ChangeLog	12 Dec 2004 01:58:34 -0000
@@ -1,3 +1,27 @@
+2004-12-11  David O'Brien  <obrien@FreeBSD.org>
+
+	Merge from mainline:
+	2004-04-20  Jakub Jelinek  <jakub@redhat.com>
+	* sparc-opc.c (fmoviccx, fmovfccx, fmovccx): Define.
+	(fmovicc, fmovfcc, fmovcc): Remove fpsize argument, change opcode to
+	suffix.  Use fmov*x macros, create all 3 fpsize variants in one
+	macro.  Adjust all users.
+
+2004-10-06  Aldy Hernandez  <aldyh@redhat.com>
+
+	* ppc-opc.c (powerpc_opcodes): Add efscfd, efdabs, efdnabs,
+	efdneg, efdadd, efdsub, efdmul, efddiv, efdcmpgt, efdcmplt,
+	efdcmpeq, efdtstgt, efdtstlt, efdtsteq, efdcfsi, efdcfsid,
+	efdcfui, efdcfuid, efdcfsf, efdcfuf, efdctsi, efdctsidz, efdctsiz,
+	efdctui, efdctuidz, efdctuiz, efdctsf, efdctuf, efdctuf, efdcfs.
+
+2004-07-30  Michal Ludvig  <mludvig@suse.cz>
+
+	* i386-dis.c (GRPPADLCK): Renamed to GRPPADLCK1
+	(GRPPADLCK2): New define.
+	(twobyte_has_modrm): True for 0xA6.
+	(grps): GRPPADLCK2 for opcode 0xA6.
+
 2004-05-13  Nick Clifton  <nickc@redhat.com>
 
 	* po/fr.po: Updated French translation.
Index: opcodes/i386-dis.c
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/opcodes/i386-dis.c,v
retrieving revision 1.1.1.9
diff -u -r1.1.1.9 i386-dis.c
--- opcodes/i386-dis.c	16 Jun 2004 05:44:19 -0000	1.1.1.9
+++ opcodes/i386-dis.c	12 Dec 2004 01:29:21 -0000
@@ -393,7 +393,8 @@
 #define GRP13	  NULL, NULL, USE_GROUPS, NULL, 20, NULL, 0
 #define GRP14	  NULL, NULL, USE_GROUPS, NULL, 21, NULL, 0
 #define GRPAMD	  NULL, NULL, USE_GROUPS, NULL, 22, NULL, 0
-#define GRPPADLCK NULL, NULL, USE_GROUPS, NULL, 23, NULL, 0
+#define GRPPADLCK1 NULL, NULL, USE_GROUPS, NULL, 23, NULL, 0
+#define GRPPADLCK2 NULL, NULL, USE_GROUPS, NULL, 24, NULL, 0
 
 #define PREGRP0   NULL, NULL, USE_PREFIX_USER_TABLE, NULL,  0, NULL, 0
 #define PREGRP1   NULL, NULL, USE_PREFIX_USER_TABLE, NULL,  1, NULL, 0
@@ -952,8 +953,8 @@
   { "btS",		Ev, Gv, XX },
   { "shldS",		Ev, Gv, Ib },
   { "shldS",		Ev, Gv, CL },
-  { "(bad)",		XX, XX, XX },
-  { GRPPADLCK },
+  { GRPPADLCK2 },
+  { GRPPADLCK1 },
   /* a8 */
   { "pushT",		gs, XX, XX },
   { "popT",		gs, XX, XX },
@@ -1091,7 +1092,7 @@
   /* 70 */ 1,1,1,1,1,1,1,0,0,0,0,0,1,1,1,1, /* 7f */
   /* 80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 8f */
   /* 90 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 9f */
-  /* a0 */ 0,0,0,1,1,1,0,1,0,0,0,1,1,1,1,1, /* af */
+  /* a0 */ 0,0,0,1,1,1,1,1,0,0,0,1,1,1,1,1, /* af */
   /* b0 */ 1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,1, /* bf */
   /* c0 */ 1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0, /* cf */
   /* d0 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* df */
@@ -1455,7 +1456,7 @@
     { "(bad)",	XX, XX, XX },
     { "(bad)",	XX, XX, XX },
   },
-  /* GRPPADLCK */
+  /* GRPPADLCK1 */
   {
     { "xstorerng", OP_0f07, 0, XX, XX },
     { "xcryptecb", OP_0f07, 0, XX, XX },
@@ -1465,6 +1466,17 @@
     { "xcryptofb", OP_0f07, 0, XX, XX },
     { "(bad)",	   OP_0f07, 0, XX, XX },
     { "(bad)",	   OP_0f07, 0, XX, XX },
+  },
+  /* GRPPADLCK2 */
+  {
+    { "montmul", OP_0f07, 0, XX, XX },
+    { "xsha1",   OP_0f07, 0, XX, XX },
+    { "xsha256", OP_0f07, 0, XX, XX },
+    { "(bad)",	 OP_0f07, 0, XX, XX },
+    { "(bad)",   OP_0f07, 0, XX, XX },
+    { "(bad)",   OP_0f07, 0, XX, XX },
+    { "(bad)",	 OP_0f07, 0, XX, XX },
+    { "(bad)",	 OP_0f07, 0, XX, XX },
   }
 };
 
Index: opcodes/ppc-opc.c
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/opcodes/ppc-opc.c,v
retrieving revision 1.1.1.10
diff -u -r1.1.1.10 ppc-opc.c
--- opcodes/ppc-opc.c	16 Jun 2004 05:44:21 -0000	1.1.1.10
+++ opcodes/ppc-opc.c	12 Dec 2004 01:29:21 -0000
@@ -1940,6 +1940,41 @@
 { "nmaclhwso.",	XO(4,494,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },
 { "mfvscr",  VX(4, 1540), VX_MASK,	PPCVEC,		{ VD } },
 { "mtvscr",  VX(4, 1604), VX_MASK,	PPCVEC,		{ VB } },
+
+  /* Double-precision opcodes.  */
+  /* Some of these conflict with AltiVec, so move them before, since
+     PPCVEC includes the PPC_OPCODE_PPC set.  */
+{ "efscfd",   VX(4, 719), VX_MASK,	PPCEFS,		{ RS, RA } },
+{ "efdabs",   VX(4, 740), VX_MASK,	PPCEFS,		{ RS, RA } },
+{ "efdnabs",  VX(4, 741), VX_MASK,	PPCEFS,		{ RS, RA } },
+{ "efdneg",   VX(4, 742), VX_MASK,	PPCEFS,		{ RS, RA } },
+{ "efdadd",   VX(4, 736), VX_MASK,	PPCEFS,		{ RS, RA, RB } },
+{ "efdsub",   VX(4, 737), VX_MASK,	PPCEFS,		{ RS, RA, RB } },
+{ "efdmul",   VX(4, 744), VX_MASK,	PPCEFS,		{ RS, RA, RB } },
+{ "efddiv",   VX(4, 745), VX_MASK,	PPCEFS,		{ RS, RA, RB } },
+{ "efdcmpgt", VX(4, 748), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },
+{ "efdcmplt", VX(4, 749), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },
+{ "efdcmpeq", VX(4, 750), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },
+{ "efdtstgt", VX(4, 764), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },
+{ "efdtstlt", VX(4, 765), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },
+{ "efdtsteq", VX(4, 766), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },
+{ "efdcfsi",  VX(4, 753), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdcfsid", VX(4, 739), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdcfui",  VX(4, 752), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdcfuid", VX(4, 738), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdcfsf",  VX(4, 755), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdcfuf",  VX(4, 754), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdctsi",  VX(4, 757), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdctsidz",VX(4, 747), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdctsiz", VX(4, 762), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdctui",  VX(4, 756), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdctuidz",VX(4, 746), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdctuiz", VX(4, 760), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdctsf",  VX(4, 759), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdctuf",  VX(4, 758), VX_MASK,	PPCEFS,		{ RS, RB } },
+{ "efdcfs",   VX(4, 751), VX_MASK,	PPCEFS,		{ RS, RB } },
+  /* End of double-precision opcodes.  */
+
 { "vaddcuw", VX(4,  384), VX_MASK,	PPCVEC,		{ VD, VA, VB } },
 { "vaddfp",  VX(4,   10), VX_MASK, 	PPCVEC,		{ VD, VA, VB } },
 { "vaddsbs", VX(4,  768), VX_MASK,	PPCVEC,		{ VD, VA, VB } },
Index: opcodes/sparc-opc.c
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/opcodes/sparc-opc.c,v
retrieving revision 1.1.1.7
diff -u -r1.1.1.7 sparc-opc.c
--- opcodes/sparc-opc.c	16 Jun 2004 05:44:17 -0000	1.1.1.7
+++ opcodes/sparc-opc.c	12 Dec 2004 01:53:14 -0000
@@ -1273,110 +1273,72 @@
 #define FM_DF 2		/* v9 */
 #define FM_QF 3		/* v9 */
 
-#define fmovicc(opcode, fpsize, cond, flags) /* v9 */ \
-{ opcode, F3F(2, 0x35, 0x100+fpsize)|MCOND(cond,0),  F3F(~2, ~0x35, ~(0x100+fpsize))|MCOND(~cond,~0),  "z,f,g", flags, v9 }, \
-{ opcode, F3F(2, 0x35, 0x180+fpsize)|MCOND(cond,0),  F3F(~2, ~0x35, ~(0x180+fpsize))|MCOND(~cond,~0),  "Z,f,g", flags, v9 }
-
-#define fmovfcc(opcode, fpsize, fcond, flags) /* v9 */ \
-{ opcode, F3F(2, 0x35, 0x000+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x000+fpsize))|MCOND(~fcond,~0), "6,f,g", flags, v9 }, \
-{ opcode, F3F(2, 0x35, 0x040+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x040+fpsize))|MCOND(~fcond,~0), "7,f,g", flags, v9 }, \
-{ opcode, F3F(2, 0x35, 0x080+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x080+fpsize))|MCOND(~fcond,~0), "8,f,g", flags, v9 }, \
-{ opcode, F3F(2, 0x35, 0x0c0+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x0c0+fpsize))|MCOND(~fcond,~0), "9,f,g", flags, v9 }
+#define fmoviccx(opcode, fpsize, args, cond, flags) /* v9 */ \
+{ opcode, F3F(2, 0x35, 0x100+fpsize)|MCOND(cond,0),  F3F(~2, ~0x35, ~(0x100+fpsize))|MCOND(~cond,~0),  "z," args, flags, v9 }, \
+{ opcode, F3F(2, 0x35, 0x180+fpsize)|MCOND(cond,0),  F3F(~2, ~0x35, ~(0x180+fpsize))|MCOND(~cond,~0),  "Z," args, flags, v9 }
+
+#define fmovfccx(opcode, fpsize, args, fcond, flags) /* v9 */ \
+{ opcode, F3F(2, 0x35, 0x000+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x000+fpsize))|MCOND(~fcond,~0), "6," args, flags, v9 }, \
+{ opcode, F3F(2, 0x35, 0x040+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x040+fpsize))|MCOND(~fcond,~0), "7," args, flags, v9 }, \
+{ opcode, F3F(2, 0x35, 0x080+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x080+fpsize))|MCOND(~fcond,~0), "8," args, flags, v9 }, \
+{ opcode, F3F(2, 0x35, 0x0c0+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x0c0+fpsize))|MCOND(~fcond,~0), "9," args, flags, v9 }
 
 /* FIXME: use fmovicc/fmovfcc? */ /* v9 */
-#define fmovcc(opcode, fpsize, cond, fcond, flags) /* v9 */ \
-{ opcode, F3F(2, 0x35, 0x100+fpsize)|MCOND(cond,0),  F3F(~2, ~0x35, ~(0x100+fpsize))|MCOND(~cond,~0),  "z,f,g", flags | F_FLOAT, v9 }, \
-{ opcode, F3F(2, 0x35, 0x000+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x000+fpsize))|MCOND(~fcond,~0), "6,f,g", flags | F_FLOAT, v9 }, \
-{ opcode, F3F(2, 0x35, 0x180+fpsize)|MCOND(cond,0),  F3F(~2, ~0x35, ~(0x180+fpsize))|MCOND(~cond,~0),  "Z,f,g", flags | F_FLOAT, v9 }, \
-{ opcode, F3F(2, 0x35, 0x040+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x040+fpsize))|MCOND(~fcond,~0), "7,f,g", flags | F_FLOAT, v9 }, \
-{ opcode, F3F(2, 0x35, 0x080+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x080+fpsize))|MCOND(~fcond,~0), "8,f,g", flags | F_FLOAT, v9 }, \
-{ opcode, F3F(2, 0x35, 0x0c0+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x0c0+fpsize))|MCOND(~fcond,~0), "9,f,g", flags | F_FLOAT, v9 }
-
-/* v9 */ fmovcc  ("fmovda",	FM_DF, CONDA, FCONDA, 0),
-/* v9 */ fmovcc  ("fmovqa",	FM_QF, CONDA, FCONDA, 0),
-/* v9 */ fmovcc  ("fmovsa",	FM_SF, CONDA, FCONDA, 0),
-/* v9 */ fmovicc ("fmovdcc",	FM_DF, CONDCC, 0),
-/* v9 */ fmovicc ("fmovqcc",	FM_QF, CONDCC, 0),
-/* v9 */ fmovicc ("fmovscc",	FM_SF, CONDCC, 0),
-/* v9 */ fmovicc ("fmovdcs",	FM_DF, CONDCS, 0),
-/* v9 */ fmovicc ("fmovqcs",	FM_QF, CONDCS, 0),
-/* v9 */ fmovicc ("fmovscs",	FM_SF, CONDCS, 0),
-/* v9 */ fmovcc  ("fmovde",	FM_DF, CONDE, FCONDE, 0),
-/* v9 */ fmovcc  ("fmovqe",	FM_QF, CONDE, FCONDE, 0),
-/* v9 */ fmovcc  ("fmovse",	FM_SF, CONDE, FCONDE, 0),
-/* v9 */ fmovcc  ("fmovdg",	FM_DF, CONDG, FCONDG, 0),
-/* v9 */ fmovcc  ("fmovqg",	FM_QF, CONDG, FCONDG, 0),
-/* v9 */ fmovcc  ("fmovsg",	FM_SF, CONDG, FCONDG, 0),
-/* v9 */ fmovcc  ("fmovdge",	FM_DF, CONDGE, FCONDGE, 0),
-/* v9 */ fmovcc  ("fmovqge",	FM_QF, CONDGE, FCONDGE, 0),
-/* v9 */ fmovcc  ("fmovsge",	FM_SF, CONDGE, FCONDGE, 0),
-/* v9 */ fmovicc ("fmovdgeu",	FM_DF, CONDGEU, F_ALIAS),
-/* v9 */ fmovicc ("fmovqgeu",	FM_QF, CONDGEU, F_ALIAS),
-/* v9 */ fmovicc ("fmovsgeu",	FM_SF, CONDGEU, F_ALIAS),
-/* v9 */ fmovicc ("fmovdgu",	FM_DF, CONDGU, 0),
-/* v9 */ fmovicc ("fmovqgu",	FM_QF, CONDGU, 0),
-/* v9 */ fmovicc ("fmovsgu",	FM_SF, CONDGU, 0),
-/* v9 */ fmovcc  ("fmovdl",	FM_DF, CONDL, FCONDL, 0),
-/* v9 */ fmovcc  ("fmovql",	FM_QF, CONDL, FCONDL, 0),
-/* v9 */ fmovcc  ("fmovsl",	FM_SF, CONDL, FCONDL, 0),
-/* v9 */ fmovcc  ("fmovdle",	FM_DF, CONDLE, FCONDLE, 0),
-/* v9 */ fmovcc  ("fmovqle",	FM_QF, CONDLE, FCONDLE, 0),
-/* v9 */ fmovcc  ("fmovsle",	FM_SF, CONDLE, FCONDLE, 0),
-/* v9 */ fmovicc ("fmovdleu",	FM_DF, CONDLEU, 0),
-/* v9 */ fmovicc ("fmovqleu",	FM_QF, CONDLEU, 0),
-/* v9 */ fmovicc ("fmovsleu",	FM_SF, CONDLEU, 0),
-/* v9 */ fmovfcc ("fmovdlg",	FM_DF, FCONDLG, 0),
-/* v9 */ fmovfcc ("fmovqlg",	FM_QF, FCONDLG, 0),
-/* v9 */ fmovfcc ("fmovslg",	FM_SF, FCONDLG, 0),
-/* v9 */ fmovicc ("fmovdlu",	FM_DF, CONDLU, F_ALIAS),
-/* v9 */ fmovicc ("fmovqlu",	FM_QF, CONDLU, F_ALIAS),
-/* v9 */ fmovicc ("fmovslu",	FM_SF, CONDLU, F_ALIAS),
-/* v9 */ fmovcc  ("fmovdn",	FM_DF, CONDN, FCONDN, 0),
-/* v9 */ fmovcc  ("fmovqn",	FM_QF, CONDN, FCONDN, 0),
-/* v9 */ fmovcc  ("fmovsn",	FM_SF, CONDN, FCONDN, 0),
-/* v9 */ fmovcc  ("fmovdne",	FM_DF, CONDNE, FCONDNE, 0),
-/* v9 */ fmovcc  ("fmovqne",	FM_QF, CONDNE, FCONDNE, 0),
-/* v9 */ fmovcc  ("fmovsne",	FM_SF, CONDNE, FCONDNE, 0),
-/* v9 */ fmovicc ("fmovdneg",	FM_DF, CONDNEG, 0),
-/* v9 */ fmovicc ("fmovqneg",	FM_QF, CONDNEG, 0),
-/* v9 */ fmovicc ("fmovsneg",	FM_SF, CONDNEG, 0),
-/* v9 */ fmovcc  ("fmovdnz",	FM_DF, CONDNZ, FCONDNZ, F_ALIAS),
-/* v9 */ fmovcc  ("fmovqnz",	FM_QF, CONDNZ, FCONDNZ, F_ALIAS),
-/* v9 */ fmovcc  ("fmovsnz",	FM_SF, CONDNZ, FCONDNZ, F_ALIAS),
-/* v9 */ fmovfcc ("fmovdo",	FM_DF, FCONDO, 0),
-/* v9 */ fmovfcc ("fmovqo",	FM_QF, FCONDO, 0),
-/* v9 */ fmovfcc ("fmovso",	FM_SF, FCONDO, 0),
-/* v9 */ fmovicc ("fmovdpos",	FM_DF, CONDPOS, 0),
-/* v9 */ fmovicc ("fmovqpos",	FM_QF, CONDPOS, 0),
-/* v9 */ fmovicc ("fmovspos",	FM_SF, CONDPOS, 0),
-/* v9 */ fmovfcc ("fmovdu",	FM_DF, FCONDU, 0),
-/* v9 */ fmovfcc ("fmovqu",	FM_QF, FCONDU, 0),
-/* v9 */ fmovfcc ("fmovsu",	FM_SF, FCONDU, 0),
-/* v9 */ fmovfcc ("fmovdue",	FM_DF, FCONDUE, 0),
-/* v9 */ fmovfcc ("fmovque",	FM_QF, FCONDUE, 0),
-/* v9 */ fmovfcc ("fmovsue",	FM_SF, FCONDUE, 0),
-/* v9 */ fmovfcc ("fmovdug",	FM_DF, FCONDUG, 0),
-/* v9 */ fmovfcc ("fmovqug",	FM_QF, FCONDUG, 0),
-/* v9 */ fmovfcc ("fmovsug",	FM_SF, FCONDUG, 0),
-/* v9 */ fmovfcc ("fmovduge",	FM_DF, FCONDUGE, 0),
-/* v9 */ fmovfcc ("fmovquge",	FM_QF, FCONDUGE, 0),
-/* v9 */ fmovfcc ("fmovsuge",	FM_SF, FCONDUGE, 0),
-/* v9 */ fmovfcc ("fmovdul",	FM_DF, FCONDUL, 0),
-/* v9 */ fmovfcc ("fmovqul",	FM_QF, FCONDUL, 0),
-/* v9 */ fmovfcc ("fmovsul",	FM_SF, FCONDUL, 0),
-/* v9 */ fmovfcc ("fmovdule",	FM_DF, FCONDULE, 0),
-/* v9 */ fmovfcc ("fmovqule",	FM_QF, FCONDULE, 0),
-/* v9 */ fmovfcc ("fmovsule",	FM_SF, FCONDULE, 0),
-/* v9 */ fmovicc ("fmovdvc",	FM_DF, CONDVC, 0),
-/* v9 */ fmovicc ("fmovqvc",	FM_QF, CONDVC, 0),
-/* v9 */ fmovicc ("fmovsvc",	FM_SF, CONDVC, 0),
-/* v9 */ fmovicc ("fmovdvs",	FM_DF, CONDVS, 0),
-/* v9 */ fmovicc ("fmovqvs",	FM_QF, CONDVS, 0),
-/* v9 */ fmovicc ("fmovsvs",	FM_SF, CONDVS, 0),
-/* v9 */ fmovcc  ("fmovdz",	FM_DF, CONDZ, FCONDZ, F_ALIAS),
-/* v9 */ fmovcc  ("fmovqz",	FM_QF, CONDZ, FCONDZ, F_ALIAS),
-/* v9 */ fmovcc  ("fmovsz",	FM_SF, CONDZ, FCONDZ, F_ALIAS),
-
+#define fmovccx(opcode, fpsize, args, cond, fcond, flags) /* v9 */ \
+{ opcode, F3F(2, 0x35, 0x100+fpsize)|MCOND(cond,0),  F3F(~2, ~0x35, ~(0x100+fpsize))|MCOND(~cond,~0),  "z," args, flags | F_FLOAT, v9 }, \
+{ opcode, F3F(2, 0x35, 0x000+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x000+fpsize))|MCOND(~fcond,~0), "6," args, flags | F_FLOAT, v9 }, \
+{ opcode, F3F(2, 0x35, 0x180+fpsize)|MCOND(cond,0),  F3F(~2, ~0x35, ~(0x180+fpsize))|MCOND(~cond,~0),  "Z," args, flags | F_FLOAT, v9 }, \
+{ opcode, F3F(2, 0x35, 0x040+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x040+fpsize))|MCOND(~fcond,~0), "7," args, flags | F_FLOAT, v9 }, \
+{ opcode, F3F(2, 0x35, 0x080+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x080+fpsize))|MCOND(~fcond,~0), "8," args, flags | F_FLOAT, v9 }, \
+{ opcode, F3F(2, 0x35, 0x0c0+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x0c0+fpsize))|MCOND(~fcond,~0), "9," args, flags | F_FLOAT, v9 }
+
+#define fmovicc(suffix, cond, flags) /* v9 */ \
+fmoviccx("fmovd" suffix, FM_DF, "B,H", cond, flags),		\
+fmoviccx("fmovq" suffix, FM_QF, "R,J", cond, flags),		\
+fmoviccx("fmovs" suffix, FM_SF, "f,g", cond, flags)
+
+#define fmovfcc(suffix, fcond, flags) /* v9 */ \
+fmovfccx("fmovd" suffix, FM_DF, "B,H", fcond, flags),		\
+fmovfccx("fmovq" suffix, FM_QF, "R,J", fcond, flags),		\
+fmovfccx("fmovs" suffix, FM_SF, "f,g", fcond, flags)
+
+#define fmovcc(suffix, cond, fcond, flags) /* v9 */ \
+fmovccx("fmovd" suffix, FM_DF, "B,H", cond, fcond, flags),	\
+fmovccx("fmovq" suffix, FM_QF, "R,J", cond, fcond, flags),	\
+fmovccx("fmovs" suffix, FM_SF, "f,g", cond, fcond, flags)
+
+/* v9 */ fmovcc  ("a", CONDA, FCONDA, 0),
+/* v9 */ fmovicc ("cc", CONDCC, 0),
+/* v9 */ fmovicc ("cs", CONDCS, 0),
+/* v9 */ fmovcc  ("e", CONDE, FCONDE, 0),
+/* v9 */ fmovcc  ("g", CONDG, FCONDG, 0),
+/* v9 */ fmovcc  ("ge", CONDGE, FCONDGE, 0),
+/* v9 */ fmovicc ("geu", CONDGEU, F_ALIAS),
+/* v9 */ fmovicc ("gu", CONDGU, 0),
+/* v9 */ fmovcc  ("l", CONDL, FCONDL, 0),
+/* v9 */ fmovcc  ("le", CONDLE, FCONDLE, 0),
+/* v9 */ fmovicc ("leu", CONDLEU, 0),
+/* v9 */ fmovfcc ("lg", FCONDLG, 0),
+/* v9 */ fmovicc ("lu", CONDLU, F_ALIAS),
+/* v9 */ fmovcc  ("n", CONDN, FCONDN, 0),
+/* v9 */ fmovcc  ("ne", CONDNE, FCONDNE, 0),
+/* v9 */ fmovicc ("neg", CONDNEG, 0),
+/* v9 */ fmovcc  ("nz", CONDNZ, FCONDNZ, F_ALIAS),
+/* v9 */ fmovfcc ("o", FCONDO, 0),
+/* v9 */ fmovicc ("pos", CONDPOS, 0),
+/* v9 */ fmovfcc ("u", FCONDU, 0),
+/* v9 */ fmovfcc ("ue", FCONDUE, 0),
+/* v9 */ fmovfcc ("ug", FCONDUG, 0),
+/* v9 */ fmovfcc ("uge", FCONDUGE, 0),
+/* v9 */ fmovfcc ("ul", FCONDUL, 0),
+/* v9 */ fmovfcc ("ule", FCONDULE, 0),
+/* v9 */ fmovicc ("vc", CONDVC, 0),
+/* v9 */ fmovicc ("vs", CONDVS, 0),
+/* v9 */ fmovcc  ("z", CONDZ, FCONDZ, F_ALIAS),
+
+#undef fmoviccx /* v9 */
+#undef fmovfccx /* v9 */
+#undef fmovccx /* v9 */
 #undef fmovicc /* v9 */
 #undef fmovfcc /* v9 */
 #undef fmovcc /* v9 */