2014-12-24 Juan Manuel Guerrero  <juan.guerrero@gmx.de>

	* ld/ldmain.c (multiple_definition) [HAVE_DXE3_SUPPORT]:  If the linker
	is compiled for DX3 module support, it will be able to resolve multiple
	symbol definitions.  This is usually the case when different DXE3 import
	libraries provide the same wrapper function to call certain function
	from the DXE3 module.  If the symbol is defined in a static library and
	in an import library, the import library definition takes always precedence
	over the static library.  This is to guarantee that all aplications linked
	with the same DXE3 module use the same functionality and not the one from
	the static library.  The DXE3 module provides functions ported to DJGPP,
	the functions from the static library may not be ported to DJGPP and may
	behave differently.

	* djgpp/build.sh:  Uncomment the DXE3_SUPPORT_ENABLED=yes line to compile
	binutils with feature enabled to resolve multiple symbol definitions due
	to the use of DXE3 modules.  Requires to compile binutils using a current
	library build from the CVS repository.

	* binutils/addr2line.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* binutils/ar.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* binutils/coffdump.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* binutils/cxxfilt.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* binutils/nlmconv.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* binutils/nm.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* binutils/objcopy.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* binutils/objdump.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* binutils/readelf.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* binutils/size.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* binutils/srconv.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* binutils/strings.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* binutils/sysdump.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* gas/as.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* gprof/gprof.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* ld/ldmain.c (main):  Use STRIP_FULL_PATH_AND_EXTENSION to adjust file name.

	* ld/libnames.tab:  New file providing the mapping table between the
        library's LFN to SFN.

	* ld/ldfile.c [__DJGPP__]:  New function map_LFN_to_SFN.
	Maps a library long filename to a short filename according to a table
	defined in /dev/env/DJDIR/lib/libnames.tab.
	(ldfile_try_open_bfd) [__DJGPP__]:  If library is not found by its
	original name try the mapped SFN one.

	* libiberty/stack-limit.c (stack_limit_increase):  Pacify compiler.

	* bfd/cache.c (bfd_cache_max_open) [__DJGPP__]:  Do not use getrlimit
	to check for the amount of files that can be opened.

	* binutils/readelf.c (print_symbol) [__DJGPP__]:  Use mbtowc instead
	of mbrtowc.

	* gas/dw2gencfi.c (get_debugseg_name):  Pacify compiler.

	* gas/config/obj-coff-seh.c (get_pxdata_name):  Pacify compiler.

	* bfd/coff-go32.c: Define COFF_GO32 macro.
	Add _bfd_go32_mkobject prototype.
	Define coff_mkobject macro to _bfd_go32_mkobject.
	Define IMAGE_SCN_LNK_NRELOC_OVFL.  Signals that relocation counter
	has overflown.

	* bfd/coff-stgo32.c: Add _bfd_go32_mkobject prototype.
	Define coff_mkobject macro to _bfd_go32_mkobject.
	Add _bfd_go32_mkobject definition.
	Define IMAGE_SCN_LNK_NRELOC_OVFL.  Signals that relocation counter
	has overflown.

	* bfd/coffswap.h (coff_swap_scnhdr_in) [COFF_GO32_EXE, COFF_GO32]:
	Iff reading an executable file and iff it is the ".text" section
	header calculate the number of lines from the 16 bit field of the
	relocation counter and the 16 bit filed of the line counter.
	(coff_swap_scnhdr_out) [COFF_GO32_EXE, COFF_GO32]:
	Use the same Ansatz to identify a .text section of an executable like
	in coff_swap_scnhdr_in.
	- Iff building an executable file and iff it is the ".text" section
	header store the upper 16 bits of the line counter in the relocation
	counter.
	- Iff not building an executabe file or iff building an executable file
	but iff it is not the ".text" section header then:
	  1) if the relocation counter is greater the 65534 set the relocation
	     counter to 65535 and set the IMAGE_SCN_LNK_NRELOC_OVFL bit.
	     The relocation counter overflow is handled elsewhere.
	  2) if the line counter is greater than 65535 then abort.

	* bfd/coffcode.h [COFF_GO32_EXE, COFF_GO32, COFF_WITH_PE]: Define new
	macro COFF_WITH_PE_OR_COFF_WITH_EXTENDED_RELOC_COUNTER.
	(coff_write_relocs, coff_write_object_contents): Replace COFF_WITH_PE
	with COFF_WITH_PE_OR_COFF_WITH_EXTENDED_RELOC_COUNTER where appropriate
	and add obj_go32 to the check if relocation counter >= 0xFFFF.
	(coff_set_alignment_hook): Implementation for DJGPP.
	[COFF_GO32_EXE, COFF_GO32]:  Define COFF_PAD_SECTION_HEADERS.
	Taken from bnu219s2.zip.

	* bfd/libcoff-in.h: Define obj_go32 macro.
	Add go32 flag to struct coff_tdata.  1 if DJGPP else 0.

	* bfd/cofflink.c (_bfd_coff_final_link): If it is an obj_go32 allow
	relocations larger than 65535.

	* djgpp/build.sh:  DJGPP specific shell script to adjust, configure
	and compile progs and libs.

	* config.sub:  Use uname result to set basic_machine value
	instead of hardcoded one.

	* ld/scripttempl/i386go32.sc:  DJGPP specific adjustments to the
	linker script.
	Taken from djcross-binutils-2.19.1-10ap.src.rpm.
	Added discard .gnu.lto_* sections command to linker script.

	* libiberty/cp-demangle.c (d_demangle_callback):  Pacify compiler.

	* libiberty/make-relative-prefix.c:  DJGPP specific adjustments.
	Taken from bnu219s2.zip.

	* libiberty/make-temp-file.c:  DJGPP specific adjustments.
	Taken from bnu219s2.zip.

	* libiberty/pex-common.c (temp_file, pex_run_in_environment):  Pacify
	compiler.






diff -aprNU5 binutils-2.25.orig/bfd/cache.c binutils-2.25/bfd/cache.c
--- binutils-2.25.orig/bfd/cache.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/bfd/cache.c	2014-12-24 17:50:52 +0100
@@ -76,10 +76,60 @@ static int
 bfd_cache_max_open (void)
 {
   if (max_open_files == 0)
     {
       int max;
+#ifdef __DJGPP__
+      /*  Do not trust getrlimit.  */
+
+# if 1
+      max_open_files = 15;
+# else
+#  define MAX_FILE_HANDLES  256
+
+      char dir_name[FILENAME_MAX + 1], file_name[MAX_FILE_HANDLES][FILENAME_MAX + 1];
+      char *path = getenv("TMPDIR");
+      int old_errno = errno;
+      bfd_boolean dir_created = TRUE;
+
+      snprintf(dir_name, FILENAME_MAX, "%s/%s", path ? path : ".", "ofXXXXXX");
+      if (mkdir(mktemp(dir_name), S_IWUSR))
+      {
+        snprintf(dir_name, FILENAME_MAX, "%s", "./RLIMIT.TST");
+        if (errno = 0, mkdir(dir_name, S_IWUSR) && errno && errno != EEXIST)
+          dir_created = FALSE;
+      }
+      if (dir_created)
+      {
+        int fd[MAX_FILE_HANDLES];
+
+        for (max = 0; max < MAX_FILE_HANDLES; max++)
+        {
+          snprintf(file_name[max], FILENAME_MAX, "%s/%d", dir_name, max);
+          if ((fd[max] = open(file_name[max], O_CREAT | O_RDWR)) == EOF)
+            break;
+        }
+
+        for (max_open_files = max; max > -1; max--)
+        {
+          close(fd[max]);
+          unlink(file_name[max]);
+        }
+
+        rmdir(dir_name);
+      }
+      else
+        max_open_files = 10;
+
+      errno = old_errno;
+
+      max = max_open_files / 8;
+      max_open_files = max < 2 ? 2 : max;
+
+#  undefine MAX_FILE_HANDLES
+# endif
+#else
 #ifdef HAVE_GETRLIMIT
       struct rlimit rlim;
       if (getrlimit (RLIMIT_NOFILE, &rlim) == 0
 	  && rlim.rlim_cur != (rlim_t) RLIM_INFINITY)
 	max = rlim.rlim_cur / 8;
@@ -89,10 +139,11 @@ bfd_cache_max_open (void)
 	max = sysconf (_SC_OPEN_MAX) / 8;
 #else
 	max = 10;
 #endif /* _SC_OPEN_MAX */
       max_open_files = max < 10 ? 10 : max;
+#endif /* __DJGPP__ */
     }
 
   return max_open_files;
 }
 
diff -aprNU5 binutils-2.25.orig/bfd/coff-go32.c binutils-2.25/bfd/coff-go32.c
--- binutils-2.25.orig/bfd/coff-go32.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/bfd/coff-go32.c	2014-12-24 17:50:52 +0100
@@ -20,10 +20,11 @@
    MA 02110-1301, USA.  */
 
 #define TARGET_SYM		i386_coff_go32_vec
 #define TARGET_NAME		"coff-go32"
 #define TARGET_UNDERSCORE	'_'
+#define COFF_GO32
 #define COFF_LONG_SECTION_NAMES
 #define COFF_SUPPORT_GNU_LINKONCE
 #define COFF_LONG_FILENAMES
 
 #define COFF_SECTION_ALIGNMENT_ENTRIES \
@@ -40,6 +41,16 @@
 { COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
   COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
 { COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi"), \
   COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
 
+/* Section contains extended relocations. */
+#define IMAGE_SCN_LNK_NRELOC_OVFL  0x01000000
+
+#include "sysdep.h"
+#include "bfd.h"
+
+bfd_boolean _bfd_go32_mkobject (bfd *abfd);
+
+#define coff_mkobject  _bfd_go32_mkobject
+
 #include "coff-i386.c"
diff -aprNU5 binutils-2.25.orig/bfd/coff-stgo32.c binutils-2.25/bfd/coff-stgo32.c
--- binutils-2.25.orig/bfd/coff-stgo32.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/bfd/coff-stgo32.c	2014-12-24 17:50:52 +0100
@@ -51,10 +51,13 @@
 { COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
   COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
 { COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi"), \
   COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
 
+/* Section contains extended relocations. */
+#define IMAGE_SCN_LNK_NRELOC_OVFL  0x01000000
+
 #include "sysdep.h"
 #include "bfd.h"
 
 /* All that ..._PRE and ...POST functions are called from the corresponding
    coff_swap... functions. The ...PRE functions are called at the beginning
@@ -100,10 +103,14 @@ static const bfd_target *go32_check_form
 static bfd_boolean
   go32_stubbed_coff_bfd_copy_private_bfd_data (bfd *, bfd *);
 
 #define coff_bfd_copy_private_bfd_data go32_stubbed_coff_bfd_copy_private_bfd_data
 
+bfd_boolean _bfd_go32_mkobject (bfd *abfd);
+
+#define coff_mkobject  _bfd_go32_mkobject
+
 #include "coff-i386.c"
 
 /* This macro is used, because I cannot assume the endianness of the
    host system.  */
 #define _H(index) (H_GET_16 (abfd, (header + index * 2)))
@@ -420,5 +427,29 @@ go32_check_format (bfd *abfd)
   if (bfd_seek (abfd, 0, SEEK_SET) != 0)
     return NULL;
 
   return coff_object_p (abfd);
 }
+
+/*  This function is not static because it is used
+    by both targets coff-go32 and coff-go32-exe.  */
+
+bfd_boolean
+_bfd_go32_mkobject (bfd *abfd)
+{
+  coff_data_type *coff;
+  bfd_size_type amt = sizeof (coff_data_type);
+
+  abfd->tdata.coff_obj_data = bfd_zalloc (abfd, amt);
+  if (abfd->tdata.coff_obj_data == NULL)
+    return FALSE;
+  coff = coff_data (abfd);
+  coff->symbols = NULL;
+  coff->conversion_table = NULL;
+  coff->raw_syments = NULL;
+  coff->relocbase = 0;
+  coff->local_toc_sym_map = 0;
+
+  coff->go32 = 1;
+
+  return TRUE;
+}
diff -aprNU5 binutils-2.25.orig/bfd/coffcode.h binutils-2.25/bfd/coffcode.h
--- binutils-2.25.orig/bfd/coffcode.h	2014-12-23 08:47:10 +0100
+++ binutils-2.25/bfd/coffcode.h	2014-12-24 17:50:52 +0100
@@ -376,10 +376,14 @@ CODE_FRAGMENT
 #define DOT_ZDEBUG	".zdebug"
 #define GNU_LINKONCE_WI ".gnu.linkonce.wi."
 #define GNU_LINKONCE_WT ".gnu.linkonce.wt."
 #define DOT_RELOC	".reloc"
 
+#if defined(COFF_WITH_PE) || defined(COFF_GO32_EXE) || defined(COFF_GO32)
+# define COFF_WITH_PE_OR_COFF_WITH_EXTENDED_RELOC_COUNTER
+#endif
+
 #if defined (COFF_LONG_SECTION_NAMES)
 /* Needed to expand the inputs to BLANKOR1TOODD.  */
 #define COFFLONGSECTIONCATHELPER(x,y)    x ## y
 /* If the input macro Y is blank or '1', return an odd number; if it is
    '0', return an even number.  Result undefined in all other cases.  */
@@ -1963,13 +1967,50 @@ coff_set_alignment_hook (bfd *abfd, asec
     }
 }
 
 #else /* ! RS6000COFF_C */
 
+#if defined (COFF_GO32_EXE) || defined (COFF_GO32)
+
+static void
+coff_set_alignment_hook (bfd * abfd ATTRIBUTE_UNUSED,
+			 asection * section,
+			 void * scnhdr)
+{
+  struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
+
+  /* Check for extended relocs.  */
+  if (hdr->s_flags & IMAGE_SCN_LNK_NRELOC_OVFL)
+    {
+      struct external_reloc dst;
+      struct internal_reloc n;
+      file_ptr oldpos = bfd_tell (abfd);
+      bfd_size_type relsz = bfd_coff_relsz (abfd);
+
+      if (bfd_seek (abfd, (file_ptr) hdr->s_relptr, 0) != 0)
+	return;
+      if (bfd_bread (& dst, relsz, abfd) != relsz)
+	return;
+
+      coff_swap_reloc_in (abfd, &dst, &n);
+      if (bfd_seek (abfd, oldpos, 0) != 0)
+	return;
+      section->reloc_count = hdr->s_nreloc = n.r_vaddr - 1;
+      section->rel_filepos += relsz;
+    }
+  else if (hdr->s_nreloc == 0xffff)
+    (*_bfd_error_handler)
+      ("%s: warning: claims to have 0xffff relocs, without overflow",
+       bfd_get_filename (abfd));
+}
+
+#else /* ! COFF_GO32_EXE && ! COFF_GO32 */
+
 #define coff_set_alignment_hook \
   ((void (*) (bfd *, asection *, void *)) bfd_void)
 
+#endif /* ! COFF_GO32_EXE && ! COFF_GO32 */
 #endif /* ! RS6000COFF_C */
 #endif /* ! COFF_WITH_PE */
 #endif /* ! COFF_ALIGN_IN_SECTION_HEADER */
 
 #ifndef coff_mkobject
@@ -2674,12 +2715,12 @@ coff_write_relocs (bfd * abfd, int first
 #endif
 
       if (bfd_seek (abfd, s->rel_filepos, SEEK_SET) != 0)
 	return FALSE;
 
-#ifdef COFF_WITH_PE
-      if (obj_pe (abfd) && s->reloc_count >= 0xffff)
+#ifdef COFF_WITH_PE_OR_COFF_WITH_EXTENDED_RELOC_COUNTER
+      if ((obj_pe (abfd) || obj_go32 (abfd)) && s->reloc_count >= 0xffff)
 	{
 	  /* Encode real count here as first reloc.  */
 	  struct internal_reloc n;
 
 	  memset (& n, 0, sizeof (n));
@@ -3574,10 +3615,14 @@ coff_apply_checksum (bfd *abfd)
   return TRUE;
 }
 
 #endif /* COFF_IMAGE_WITH_PE */
 
+#if defined (COFF_GO32_EXE) || defined (COFF_GO32)
+# define COFF_PAD_SECTION_HEADERS
+#endif
+
 static bfd_boolean
 coff_write_object_contents (bfd * abfd)
 {
   asection *current;
   bfd_boolean hasrelocs = FALSE;
@@ -3618,13 +3663,13 @@ coff_write_object_contents (bfd * abfd)
   /* Work out the size of the reloc and linno areas.  */
 
   for (current = abfd->sections; current != NULL; current =
        current->next)
     {
-#ifdef COFF_WITH_PE
+#ifdef COFF_WITH_PE_OR_COFF_WITH_EXTENDED_RELOC_COUNTER
       /* We store the actual reloc count in the first reloc's addr.  */
-      if (obj_pe (abfd) && current->reloc_count >= 0xffff)
+      if ((obj_pe (abfd) || obj_go32 (abfd)) && current->reloc_count >= 0xffff)
 	reloc_count ++;
 #endif
       reloc_count += current->reloc_count;
     }
 
@@ -3648,13 +3693,13 @@ coff_write_object_contents (bfd * abfd)
 
       if (current->reloc_count)
 	{
 	  current->rel_filepos = reloc_base;
 	  reloc_base += current->reloc_count * bfd_coff_relsz (abfd);
-#ifdef COFF_WITH_PE
+#ifdef COFF_WITH_PE_OR_COFF_WITH_EXTENDED_RELOC_COUNTER
 	  /* Extra reloc to hold real count.  */
-	  if (obj_pe (abfd) && current->reloc_count >= 0xffff)
+	  if ((obj_pe (abfd) || obj_go32 (abfd)) && current->reloc_count >= 0xffff)
 	    reloc_base += bfd_coff_relsz (abfd);
 #endif
 	}
       else
 	current->rel_filepos = 0;
@@ -3973,10 +4018,22 @@ coff_write_object_contents (bfd * abfd)
 	}
     }
 #endif
 #endif
 
+#ifdef COFF_PAD_SECTION_HEADERS
+  if (abfd->flags & EXEC_P)
+  {
+    file_ptr cur_ptr = scn_base + abfd->section_count * bfd_coff_scnhsz(abfd);
+    long fill_size = (abfd->sections->filepos - cur_ptr);
+    bfd_byte *b = bfd_zmalloc(fill_size);
+    if (b)
+      bfd_bwrite ((PTR)b, fill_size, abfd);
+    free (b);
+  }
+#endif
+
   /* OK, now set up the filehdr...  */
 
   /* Don't include the internal abs section in the section count */
 
   /* We will NOT put a fucking timestamp in the header here. Every time you
diff -aprNU5 binutils-2.25.orig/bfd/cofflink.c binutils-2.25/bfd/cofflink.c
--- binutils-2.25.orig/bfd/cofflink.c	2014-12-23 08:47:10 +0100
+++ binutils-2.25/bfd/cofflink.c	2014-12-24 17:50:52 +0100
@@ -676,11 +676,11 @@ _bfd_coff_final_link (bfd *abfd,
 	  o->flags |= SEC_RELOC;
 	  o->rel_filepos = rel_filepos;
 	  rel_filepos += o->reloc_count * relsz;
 	  /* In PE COFF, if there are at least 0xffff relocations an
 	     extra relocation will be written out to encode the count.  */
-	  if (obj_pe (abfd) && o->reloc_count >= 0xffff)
+	  if ((obj_pe (abfd) || obj_go32 (abfd)) && o->reloc_count >= 0xffff)
 	    rel_filepos += relsz;
 	}
 
       if (bfd_coff_long_section_names (abfd)
 	  && strlen (o->name) > SCNNMLEN)
@@ -1065,11 +1065,11 @@ _bfd_coff_final_link (bfd *abfd,
 	      bfd_coff_swap_reloc_out (abfd, irel, erel);
 	    }
 
 	  if (bfd_seek (abfd, o->rel_filepos, SEEK_SET) != 0)
 	    goto error_return;
-	  if (obj_pe (abfd) && o->reloc_count >= 0xffff)
+	  if ((obj_pe (abfd) || obj_go32 (abfd)) && o->reloc_count >= 0xffff)
 	    {
 	      /* In PE COFF, write the count of relocs as the first
 		 reloc.  The header overflow bit will be set
 		 elsewhere. */
 	      struct internal_reloc incount;
diff -aprNU5 binutils-2.25.orig/bfd/coffswap.h binutils-2.25/bfd/coffswap.h
--- binutils-2.25.orig/bfd/coffswap.h	2014-10-14 07:32:02 +0100
+++ binutils-2.25/bfd/coffswap.h	2014-12-24 17:50:54 +0100
@@ -765,10 +765,23 @@ coff_swap_scnhdr_in (bfd * abfd, void *
   scnhdr_int->s_relptr = GET_SCNHDR_RELPTR (abfd, scnhdr_ext->s_relptr);
   scnhdr_int->s_lnnoptr = GET_SCNHDR_LNNOPTR (abfd, scnhdr_ext->s_lnnoptr);
   scnhdr_int->s_flags = GET_SCNHDR_FLAGS (abfd, scnhdr_ext->s_flags);
   scnhdr_int->s_nreloc = GET_SCNHDR_NRELOC (abfd, scnhdr_ext->s_nreloc);
   scnhdr_int->s_nlnno = GET_SCNHDR_NLNNO (abfd, scnhdr_ext->s_nlnno);
+#if defined (COFF_GO32_EXE) || defined(COFF_GO32)
+  /* DJGPP follows the same strategy than PE COFF.
+     Iff the file is an executable then the higher 16 bits
+     of the line number have been stored in the relocation
+     counter field.  */
+  if (abfd->flags & EXEC_P
+      && (strcmp(scnhdr_ext->s_name, ".text") == 0))
+  {
+    scnhdr_int->s_nlnno = (GET_SCNHDR_NRELOC(abfd, scnhdr_ext->s_nreloc) << 16)
+                          + GET_SCNHDR_NLNNO(abfd, scnhdr_ext->s_nlnno);
+    scnhdr_int->s_nreloc = 0;
+  }
+#endif
 #ifdef I960
   scnhdr_int->s_align = GET_SCNHDR_ALIGN (abfd, scnhdr_ext->s_align);
 #endif
 #ifdef COFF_ADJUST_SCNHDR_IN_POST
   COFF_ADJUST_SCNHDR_IN_POST (abfd, ext, in);
@@ -795,10 +808,60 @@ coff_swap_scnhdr_out (bfd * abfd, void *
   PUT_SCNHDR_LNNOPTR (abfd, scnhdr_int->s_lnnoptr, scnhdr_ext->s_lnnoptr);
   PUT_SCNHDR_FLAGS (abfd, scnhdr_int->s_flags, scnhdr_ext->s_flags);
 #if defined(M88)
   H_PUT_32 (abfd, scnhdr_int->s_nlnno, scnhdr_ext->s_nlnno);
   H_PUT_32 (abfd, scnhdr_int->s_nreloc, scnhdr_ext->s_nreloc);
+#elif defined (COFF_GO32_EXE) || defined(COFF_GO32)
+  if (abfd->flags & EXEC_P
+      && (strcmp(scnhdr_int->s_name, ".text") == 0))
+    {
+      /* DJGPP follows the same strategy than PE COFF.
+	 By inference from looking at MS output, the 32 bit field
+	 which is the combination of the number_of_relocs and
+	 number_of_linenos is used for the line number count in
+	 executables.  A 16-bit field won't do for cc1.  The MS
+	 document says that the number of relocs is zero for
+	 executables, but the 17-th bit has been observed to be there.
+	 Overflow is not an issue: a 4G-line program will overflow a
+	 bunch of other fields long before this!  */
+      PUT_SCNHDR_NLNNO (abfd, (scnhdr_int->s_nlnno & 0xffff), scnhdr_ext->s_nlnno);
+      PUT_SCNHDR_NRELOC (abfd, (scnhdr_int->s_nlnno >> 16), scnhdr_ext->s_nreloc);
+    }
+  else
+    {
+      /* DJGPP follows the same strategy than PE COFF. */
+      if (scnhdr_int->s_nlnno <= MAX_SCNHDR_NLNNO)
+	PUT_SCNHDR_NLNNO (abfd, scnhdr_int->s_nlnno, scnhdr_ext->s_nlnno);
+      else
+	{
+	  char buf[sizeof (scnhdr_int->s_name) + 1];
+
+	  memcpy (buf, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));
+	  buf[sizeof (scnhdr_int->s_name)] = '\0';
+	  (*_bfd_error_handler)
+	   (_("%s: %s: line number overflow: 0x%lx > 0xffff"),
+	    bfd_get_filename (abfd),
+	    buf, scnhdr_int->s_nlnno);
+	  bfd_set_error (bfd_error_file_truncated);
+	  PUT_SCNHDR_NLNNO (abfd, 0xffff, scnhdr_ext->s_nlnno);
+	  ret = 0;
+	}
+
+      /* Although we could encode 0xffff relocs here, we do not, to be
+         consistent with other parts of bfd. Also it lets us warn, as
+         we should never see 0xffff here w/o having the overflow flag
+         set.  */
+      if (scnhdr_int->s_nreloc < MAX_SCNHDR_NRELOC)
+	PUT_SCNHDR_NRELOC (abfd, scnhdr_int->s_nreloc, scnhdr_ext->s_nreloc);
+      else
+	{
+	  /* DJGPP can deal with large #s of relocs, but not here.  */
+	  PUT_SCNHDR_NRELOC (abfd, 0xffff, scnhdr_ext->s_nreloc);
+	  scnhdr_int->s_flags |= IMAGE_SCN_LNK_NRELOC_OVFL;
+	  PUT_SCNHDR_FLAGS (abfd, scnhdr_int->s_flags, scnhdr_ext->s_flags);
+	}
+    }
 #else
   if (scnhdr_int->s_nlnno <= MAX_SCNHDR_NLNNO)
     PUT_SCNHDR_NLNNO (abfd, scnhdr_int->s_nlnno, scnhdr_ext->s_nlnno);
   else
     {
diff -aprNU5 binutils-2.25.orig/bfd/libcoff-in.h binutils-2.25/bfd/libcoff-in.h
--- binutils-2.25.orig/bfd/libcoff-in.h	2014-12-23 08:47:10 +0100
+++ binutils-2.25/bfd/libcoff-in.h	2014-12-24 17:50:54 +0100
@@ -23,12 +23,13 @@
 
 /* Object file tdata; access macros.  */
 
 #define coff_data(bfd)		      ((bfd)->tdata.coff_obj_data)
 #define obj_pe(bfd)                   (coff_data (bfd)->pe)
+#define obj_go32(bfd)                 (coff_data (bfd)->go32)
 #define obj_symbols(bfd)	      (coff_data (bfd)->symbols)
-#define	obj_sym_filepos(bfd)	      (coff_data (bfd)->sym_filepos)
+#define obj_sym_filepos(bfd)	      (coff_data (bfd)->sym_filepos)
 #define obj_relocbase(bfd)	      (coff_data (bfd)->relocbase)
 #define obj_raw_syments(bfd)	      (coff_data (bfd)->raw_syments)
 #define obj_raw_syment_count(bfd)     (coff_data (bfd)->raw_syment_count)
 #define obj_convert(bfd)	      (coff_data (bfd)->conversion_table)
 #define obj_conv_table_size(bfd)      (coff_data (bfd)->conv_table_size)
@@ -104,10 +105,12 @@ typedef struct coff_tdata
 
   /* Copy of some of the f_flags bits in the COFF filehdr structure,
      used by ARM code.  */
   flagword flags;
 
+  /* Is this a GO32 coff file?  */
+  int go32;
   /* coff-stgo32 EXE stub header after BFD tdata has been allocated.  Its data
      is kept in internal_filehdr.go32stub beforehand.  */
   char *go32stub;
 } coff_data_type;
 
diff -aprNU5 binutils-2.25.orig/binutils/addr2line.c binutils-2.25/binutils/addr2line.c
--- binutils-2.25.orig/binutils/addr2line.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/binutils/addr2line.c	2014-12-24 17:50:54 +0100
@@ -419,11 +419,11 @@ main (int argc, char **argv)
   setlocale (LC_CTYPE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  program_name = *argv;
+  program_name = STRIP_FULL_PATH_AND_EXTENSION(argv[0]);
   xmalloc_set_program_name (program_name);
 
   expandargv (&argc, &argv);
 
   bfd_init ();
diff -aprNU5 binutils-2.25.orig/binutils/ar.c binutils-2.25/binutils/ar.c
--- binutils-2.25.orig/binutils/ar.c	2014-12-23 08:47:10 +0100
+++ binutils-2.25/binutils/ar.c	2014-12-24 17:50:54 +0100
@@ -687,11 +687,11 @@ main (int argc, char **argv)
   setlocale (LC_CTYPE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  program_name = argv[0];
+  program_name = STRIP_FULL_PATH_AND_EXTENSION(argv[0]);
   xmalloc_set_program_name (program_name);
 #if BFD_SUPPORTS_PLUGINS
   bfd_plugin_set_program_name (program_name);
 #endif
 
diff -aprNU5 binutils-2.25.orig/binutils/coffdump.c binutils-2.25/binutils/coffdump.c
--- binutils-2.25.orig/binutils/coffdump.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/binutils/coffdump.c	2014-12-24 17:50:54 +0100
@@ -494,11 +494,11 @@ main (int ac, char **av)
   setlocale (LC_CTYPE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  program_name = av[0];
+  program_name = STRIP_FULL_PATH_AND_EXTENSION(av[0]);
   xmalloc_set_program_name (program_name);
 
   expandargv (&ac, &av);
 
   while ((opt = getopt_long (ac, av, "HhVv", long_options,
diff -aprNU5 binutils-2.25.orig/binutils/cxxfilt.c binutils-2.25/binutils/cxxfilt.c
--- binutils-2.25.orig/binutils/cxxfilt.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/binutils/cxxfilt.c	2014-12-24 17:50:54 +0100
@@ -172,11 +172,11 @@ main (int argc, char **argv)
 {
   int c;
   const char *valid_symbols;
   enum demangling_styles style = auto_demangling;
 
-  program_name = argv[0];
+  program_name = STRIP_FULL_PATH_AND_EXTENSION(argv[0]);
   xmalloc_set_program_name (program_name);
 
   expandargv (&argc, &argv);
 
   while ((c = getopt_long (argc, argv, "_hinps:tv", long_options, (int *) 0)) != EOF)
diff -aprNU5 binutils-2.25.orig/binutils/nlmconv.c binutils-2.25/binutils/nlmconv.c
--- binutils-2.25.orig/binutils/nlmconv.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/binutils/nlmconv.c	2014-12-24 17:50:54 +0100
@@ -207,11 +207,11 @@ main (int argc, char **argv)
   setlocale (LC_CTYPE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  program_name = argv[0];
+  program_name = STRIP_FULL_PATH_AND_EXTENSION(argv[0]);
   xmalloc_set_program_name (program_name);
 
   expandargv (&argc, &argv);
 
   bfd_init ();
diff -aprNU5 binutils-2.25.orig/binutils/nm.c binutils-2.25/binutils/nm.c
--- binutils-2.25.orig/binutils/nm.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/binutils/nm.c	2014-12-24 17:50:54 +0100
@@ -1537,11 +1537,11 @@ main (int argc, char **argv)
   setlocale (LC_COLLATE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  program_name = *argv;
+  program_name = STRIP_FULL_PATH_AND_EXTENSION(argv[0]);
   xmalloc_set_program_name (program_name);
 #if BFD_SUPPORTS_PLUGINS
   bfd_plugin_set_program_name (program_name);
 #endif
 
diff -aprNU5 binutils-2.25.orig/binutils/objcopy.c binutils-2.25/binutils/objcopy.c
--- binutils-2.25.orig/binutils/objcopy.c	2014-12-23 08:47:10 +0100
+++ binutils-2.25/binutils/objcopy.c	2014-12-24 17:50:54 +0100
@@ -4368,11 +4368,11 @@ main (int argc, char *argv[])
   setlocale (LC_CTYPE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  program_name = argv[0];
+  program_name = STRIP_FULL_PATH_AND_EXTENSION(argv[0]);
   xmalloc_set_program_name (program_name);
 
   START_PROGRESS (program_name, 0);
 
   expandargv (&argc, &argv);
diff -aprNU5 binutils-2.25.orig/binutils/objdump.c binutils-2.25/binutils/objdump.c
--- binutils-2.25.orig/binutils/objdump.c	2014-12-23 08:47:10 +0100
+++ binutils-2.25/binutils/objdump.c	2014-12-24 17:50:54 +0100
@@ -3442,11 +3442,11 @@ main (int argc, char **argv)
 #endif
 
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  program_name = *argv;
+  program_name = STRIP_FULL_PATH_AND_EXTENSION(argv[0]);
   xmalloc_set_program_name (program_name);
 
   START_PROGRESS (program_name, 0);
 
   expandargv (&argc, &argv);
diff -aprNU5 binutils-2.25.orig/binutils/readelf.c binutils-2.25/binutils/readelf.c
--- binutils-2.25.orig/binutils/readelf.c	2014-12-23 08:47:10 +0100
+++ binutils-2.25/binutils/readelf.c	2014-12-24 17:50:54 +0100
@@ -484,11 +484,16 @@ print_symbol (int width, const char *sym
 
 #ifdef HAVE_MBSTATE_T
 	  /* Try to find out how many bytes made up the character that was
 	     just printed.  Advance the symbol pointer past the bytes that
 	     were displayed.  */
+#ifdef __DJGPP__
+	  /* DJGPP does not provide mbrtowc.  */
+	  n = mbtowc (& w, symbol - 1, MB_CUR_MAX);
+#else
 	  n = mbrtowc (& w, symbol - 1, MB_CUR_MAX, & state);
+#endif
 #else
 	  n = 1;
 #endif
 	  if (n != (size_t) -1 && n != (size_t) -2 && n > 0)
 	    symbol += (n - 1);
diff -aprNU5 binutils-2.25.orig/binutils/size.c binutils-2.25/binutils/size.c
--- binutils-2.25.orig/binutils/size.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/binutils/size.c	2014-12-24 17:50:54 +0100
@@ -129,11 +129,11 @@ main (int argc, char **argv)
   setlocale (LC_CTYPE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  program_name = *argv;
+  program_name = STRIP_FULL_PATH_AND_EXTENSION(argv[0]);
   xmalloc_set_program_name (program_name);
 
   expandargv (&argc, &argv);
 
   bfd_init ();
diff -aprNU5 binutils-2.25.orig/binutils/srconv.c binutils-2.25/binutils/srconv.c
--- binutils-2.25.orig/binutils/srconv.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/binutils/srconv.c	2014-12-24 17:50:54 +0100
@@ -1768,11 +1768,11 @@ main (int ac, char **av)
   setlocale (LC_CTYPE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  program_name = av[0];
+  program_name = STRIP_FULL_PATH_AND_EXTENSION(av[0]);
   xmalloc_set_program_name (program_name);
 
   expandargv (&ac, &av);
 
   while ((opt = getopt_long (ac, av, "dHhVvqn", long_options,
diff -aprNU5 binutils-2.25.orig/binutils/strings.c binutils-2.25/binutils/strings.c
--- binutils-2.25.orig/binutils/strings.c	2014-11-04 09:54:40 +0100
+++ binutils-2.25/binutils/strings.c	2014-12-24 17:50:54 +0100
@@ -160,11 +160,11 @@ main (int argc, char **argv)
   setlocale (LC_ALL, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  program_name = argv[0];
+  program_name = STRIP_FULL_PATH_AND_EXTENSION(argv[0]);
   xmalloc_set_program_name (program_name);
 
   expandargv (&argc, &argv);
 
   string_min = 4;
diff -aprNU5 binutils-2.25.orig/binutils/sysdump.c binutils-2.25/binutils/sysdump.c
--- binutils-2.25.orig/binutils/sysdump.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/binutils/sysdump.c	2014-12-24 17:50:54 +0100
@@ -672,11 +672,11 @@ main (int ac, char **av)
   setlocale (LC_CTYPE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  program_name = av[0];
+  program_name = STRIP_FULL_PATH_AND_EXTENSION(av[0]);
   xmalloc_set_program_name (program_name);
 
   expandargv (&ac, &av);
 
   while ((option = getopt_long (ac, av, "HhVv", long_options, (int *) NULL)) != EOF)
diff -aprNU5 binutils-2.25.orig/config.sub binutils-2.25/config.sub
--- binutils-2.25.orig/config.sub	2014-10-14 07:32:02 +0100
+++ binutils-2.25/config.sub	2014-12-24 17:50:54 +0100
@@ -619,11 +619,19 @@ case $basic_machine in
 	dicos)
 		basic_machine=i686-pc
 		os=-dicos
 		;;
 	djgpp)
-		basic_machine=i586-pc
+		UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+		case $UNAME_MACHINE in
+			*386*) basic_machine=i386-pc;;
+			*486*) basic_machine=i486-pc;;
+			*586*) basic_machine=i586-pc;;
+			*686*) basic_machine=i686-pc;;
+			*786*) basic_machine=i786-pc;;
+			*)     basic_machine=i586-pc;;
+		esac
 		os=-msdosdjgpp
 		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
diff -aprNU5 binutils-2.25.orig/djgpp/build.sh binutils-2.25/djgpp/build.sh
--- binutils-2.25.orig/djgpp/build.sh	1970-01-01 01:00:00 +0100
+++ binutils-2.25/djgpp/build.sh	2014-12-24 17:53:10 +0100
@@ -0,0 +1,464 @@
+#  This script only works in the ./djgpp directory.
+
+export HOME=.
+export PATH_SEPARATOR=:
+export PATH_EXPAND=y
+export TEST_FINDS_EXE=y
+export LD=ld
+export NM=nm
+export LN_S="cp -p"
+export GMSGFMT=${GMSGFMT='/dev/env/DJDIR/bin/msgfmt'}
+export MSGFMT=${MSGFMT='/dev/env/DJDIR/bin/msgfmt'}
+export MSGMERGE=${MSGMERGE='/dev/env/DJDIR/bin/msgmerge'}
+export XGETTEXT=${XGETTEXT='/dev/env/DJDIR/bin/xgettext'}
+export ac_cv_path_AWK=${AWK='/dev/env/DJDIR/bin/gawk'}
+export ac_cv_path_EMACS=${EMACS='/dev/env/DJDIR/gnu/emacs/bin/emacs'}
+export ac_cv_path_M4=${M4='/dev/env/DJDIR/bin/m4'}
+export ac_cv_path_GREP=${GREP='/dev/env/DJDIR/bin/grep'}
+export ac_cv_path_EGREP=${EGREP='/dev/env/DJDIR/bin/egrep'}
+export ac_cv_path_FGREP=${FGREP='/dev/env/DJDIR/bin/fgrep'}
+export ac_cv_path_SED=${SED='/dev/env/DJDIR/bin/sed'}
+export ac_cv_path_MAKEINFO=${MAKEINFO='/dev/env/DJDIR/bin/makeinfo'}
+export ac_cv_path_INSTALL_INFO=${INSTALL_INFO='/dev/env/DJDIR/bin/install-info'}
+export ac_cv_path_ROFF=${ROFF='/dev/env/DJDIR/bin/groff'}
+export ac_cv_path_GROFF=${GROFF='/dev/env/DJDIR/bin/groff'}
+export ac_cv_path_NROFF=${NROFF='/dev/env/DJDIR/bin/nroff'}
+export ac_cv_path_PERL=${PERL='/dev/env/DJDIR/bin/perl'}
+export ac_cv_path_mkdir=${MKDIR_P='/dev/env/DJDIR/bin/mkdir -p'}
+export ac_cv_path_RM=${RM='/dev/env/DJDIR/bin/rm'}
+export ac_cv_path_MV=${MV='/dev/env/DJDIR/bin/mv'}
+export ac_cv_path_TAR=${TAR='/dev/env/DJDIR/bin/tar'}
+export ac_cv_path_PR_PROGRAM=${PR='/dev/env/DJDIR/bin/pr'}
+export ac_cv_path_ed_PROGRAM=${ED='/dev/env/DJDIR/bin/ed'}
+export ac_cv_path_TEXI2DVI=${TEXI2DVI='texi2dvi'}
+export ac_cv_path_TEXI2PDF=${TEXI2PDF='texi2pdf'}
+export ac_cv_path_DVIPS=${DVIPS='dvips'}
+export ac_cv_path_PS2PDF=${PS2PDF='ps2pdf'}
+export ac_cv_path_TEST_SHELL=${TEST_SHELL='/dev/env/DJDIR/bin/bash'}
+export ac_cv_path_MKTEMP=${MKTEMP='/dev/env/DJDIR/bin/mktemp'}
+export ac_cv_prog_LN_S="cp -p"
+export ac_cv_prog_AWK=${AWK='/dev/env/DJDIR/bin/gawk'}
+export ac_cv_prog_EMACS=${EMACS='/dev/env/DJDIR/gnu/emacs/bin/emacs'}
+export ac_cv_prog_M4=${M4='/dev/env/DJDIR/bin/m4'}
+export ac_cv_prog_GREP=${GREP='/dev/env/DJDIR/bin/grep'}
+export ac_cv_prog_EGREP=${EGREP='/dev/env/DJDIR/bin/egrep'}
+export ac_cv_prog_FGREP=${FGREP='/dev/env/DJDIR/bin/fgrep'}
+export ac_cv_prog_SED=${SED='/dev/env/DJDIR/bin/sed'}
+export ac_cv_prog_MAKEINFO=${MAKEINFO='/dev/env/DJDIR/bin/makeinfo'}
+export ac_cv_prog_INSTALL_INFO=${INSTALL_INFO='/dev/env/DJDIR/bin/install-info'}
+export ac_cv_prog_ROFF=${ROFF='/dev/env/DJDIR/bin/groff'}
+export ac_cv_prog_GROFF=${GROFF='/dev/env/DJDIR/bin/groff'}
+export ac_cv_prog_NROFF=${NROFF='/dev/env/DJDIR/bin/nroff'}
+export ac_cv_prog_PERL=${PERL='/dev/env/DJDIR/bin/perl'}
+export ac_cv_prog_mkdir=${MKDIR_P='/dev/env/DJDIR/bin/mkdir -p'}
+export ac_cv_prog_RM=${RM='/dev/env/DJDIR/bin/rm'}
+export ac_cv_prog_MV=${MV='/dev/env/DJDIR/bin/mv'}
+export ac_cv_prog_TAR=${TAR='/dev/env/DJDIR/bin/tar'}
+export ac_cv_prog_PR_PROGRAM=${PR='/dev/env/DJDIR/bin/pr'}
+export ac_cv_prog_ed_PROGRAM=${ED='/dev/env/DJDIR/bin/ed'}
+export ac_cv_prog_TEXI2DVI=${TEXI2DVI='texi2dvi'}
+export ac_cv_prog_TEXI2PDF=${TEXI2PDF='texi2pdf'}
+export ac_cv_prog_DVIPS=${DVIPS='dvips'}
+export ac_cv_prog_PS2PDF=${PS2PDF='ps2pdf'}
+export ac_cv_prog_TEST_SHELL=${TEST_SHELL='/dev/env/DJDIR/bin/bash'}
+export ac_cv_prog_MKTEMP=${MKTEMP='/dev/env/DJDIR/bin/mktemp'}
+export ac_cv_func_fork=no
+export ac_cv_func_mkfifo=no
+export ac_cv_func_mknod=no
+export ac_cv_func_mmap=no
+export ac_cv_func_vfork=no
+
+# Do not allow that the BFD's configure script determine the
+# host dependant file_ptr a.k.a. off_t type as BFD_HOST_64_BIT.
+# This is the case if ftello64 and fseeko64 are found.  But DJGPP
+# does not provide the full set of 64 bit file functions required
+# for a working 64 bit BFD.
+export ac_cv_func_fseeko64=${ac_cv_func_fseeko64=no}
+export ac_cv_func_ftello64=${ac_cv_func_ftello64=no}
+export ac_cv_have_decl_fseeko64=${ac_cv_have_decl_fseeko64=no}
+export ac_cv_have_decl_ftello64=${ac_cv_have_decl_ftello64=no}
+
+# Ensure that always old GNU extern inline semantics is used
+# (aka -fgnu89-inline) even if ISO C99 semantics has been specified.
+export CFLAGS=${CFLAGS='-g -O2 -fgnu89-inline -march=i386 -mtune=i586'}
+
+# DJGPP's implementation of printf survives out-of-memory conditions.
+export gl_cv_func_printf_enomem='yes'
+
+# Enable libiberty installation.
+# Passing --enable-install-libiberty to the toplovel configure seems not to be enough.
+export enable_install_libiberty=yes
+
+# Uncomment this if you want to build with DXE3 support from CVS repository.
+# DXE3_SUPPORT_ENABLED=yes
+
+# Select NLS support.
+# NLS_SUPPORT='--enable-nls'
+ NLS_SUPPORT='--disable-nls'
+
+if [ "x${NLS_SUPPORT}" = "x--enable-nls" ]; then
+  rm -vf ../bfd/po/*gmo
+  rm -vf ../bfd/po/*pot
+  rm -vf ../binutils/po/*gmo
+  rm -vf ../binutils/po/*pot
+  rm -vf ../gas/po/*gmo
+  rm -vf ../gas/po/*pot
+  rm -vf ../gold/po/*gmo
+  rm -vf ../gold/po/*pot
+  rm -vf ../gprof/po/*gmo
+  rm -vf ../gprof/po/*pot
+  rm -vf ../ld/po/*gmo
+  rm -vf ../ld/po/*pot
+  rm -vf ../opcodes/po/*gmo
+  rm -vf ../opcodes/po/*pot
+  rm -vf ../bfd/po/*gmo
+  rm -vf ../bfd/po/*pot
+fi
+
+
+#
+#  1: Adjust the configure scripts.
+#
+
+cat > script.sed << EOF
+# For some reason the function does not work with bash 2.05b.
+/^func_lalib_p/,/^}$/ {
+  /test/ i\\
+    case \$1 in\\
+    *.la | *.lo)
+  /GREP/ {
+    s/$/;;/
+    a\\
+    *) false;;\\
+    esac
+  }
+}
+
+# Use func_lalib_p instead of func_lalib_unsafe_p.
+/func_lalib_unsafe_p[ 	][^(]/ s/_unsafe//
+
+# Adjust temp directory.
+/{TMPDIR-\/tmp}/ s|{TMPDIR-/tmp}|{TMPDIR-\${TMP-\${TEMP-.}}}|
+
+# Remove -lc reference from the dependency_libs= line in .la files.
+# This is unnecessary when linking with static  labraries and causes
+# multiple symbol definitions that cannot be resolved when using DXE3 modules.
+/^# Libraries that this one depends upon.$/,/^# Directory that this library needs to be installed in:$/ {
+  /^# Directory that this library needs to be installed in:$/ {
+    n
+    a\\
+	  sed "/^dependency_libs=/ s|[ 	]\\\\{1,\\\\}-lc| |"  \$output > fixed.sed && cp -vf fixed.sed \$output
+  }
+}
+
+# The CR test for awk does not work for DJGPP.
+/^ac_cs_awk_cr=/,/^$/ {
+  /^fi$/ a\\
+ac_cs_awk_cr=\$ac_cr
+}
+
+# AWK program above erroneously prepends '/' to C:/dos/paths
+/# AWK program above erroneously prepends/,/esac/ {
+  s/mingw/*djgpp* | mingw/
+}
+
+# Force the test for 'ln -s' to report 'cp -pf'.
+/as_ln_s='ln -s'/ s/ln -s/cp -pf/
+
+# Set the right shell for libtool
+/^LIBTOOL=.*libtool'$/ s/".*"/'\$(SHELL) '/
+
+# Adjust the config.site path for the case
+# of recursive called configure scripts
+/^if test "\$no_recursion" != yes; then/ a\\
+  djgpp_config_site=\$CONFIG_SITE
+/case \$srcdir in/,/esac/ {
+  / # Relative name.$/ a\\
+export CONFIG_SITE=\$ac_top_build_prefix\$djgpp_config_site
+}
+
+# DJGPP specific adjustments of the compile-time system search path for libraries.
+/^[ 	]*lt_search_path_spec=.*-print-search-dirs/ s,\`\$, -e \\"s%[A-z]:[\\\\\\\\/]djgpp-[0-9].[0-9][0-9][\\\\\\\\/]%/dev/env/DJDIR/%g\\"&,
+
+# Fix realpath check.  DJGPP always prepends a drive letter.
+/checking whether realpath works/,/^_ACEOF$/ {
+  /name && \*name == '\/'/ s/\*name/name[2]/
+}
+
+# Supress makeinfo test.  DJGPP does not provide any other port than 4.13.
+/# For an installed makeinfo, we require it to be from texinfo 4.7 or/,/;;/ {
+  /MAKEINFO.*makeinfo/ s/MAKEINFO/IGNORE_&/
+}
+EOF
+
+
+for file in ../ltmain.sh ../configure ../bfd/configure ../binutils/configure ../gas/configure ../gprof/configure ../ld/configure ../opcodes/configure; do
+  if test ! -f ${file}.orig; then
+    cp -vf ${file} ${file}.orig
+    touch ${file}.orig -r ${file}
+  fi
+  sed -f ./script.sed ${file}.orig > ./file.out
+  update ./file.out ${file}
+  touch ${file} -r ${file}.orig
+done
+rm -vf ./file.out ./script.sed
+
+
+
+#
+#  2: Adjust the Makefile.ins and other files.
+#
+
+cat > script.sed << EOF
+# Fix for ./bfd/Makefile.in
+# Force the regenaration of libcoff.h
+# to define obj_go32
+/^\\\$(BFD_H):/ s/:/: stmp-lcoff-h/
+
+# For html docs.
+/^MAKEINFOHTML[ 	]*=/ s/$/ --no-split/
+s/--split-size=5000000/--no-split/g
+
+# Fixes for ./libiberty/Makefile.in
+# ps support for libiberty docs.
+/dvi-subdir[ 	]\\{1,\\}pdf-subdir/ s/dvi-subdir[ 	]\\{1,\\}pdf-subdir/& ps-subdir/
+
+/^LIBIBERTY_PDFFILES[ 	]*=/ i\\
+LIBIBERTY_PSFILES = libiberty.ps\\
+\\
+ps: \\\$(LIBIBERTY_PSFILES) ps-subdir\\
+
+
+/^libiberty.pdf[ 	]*:/ i\\
+libiberty.ps : ./libiberty.dvi \\\$(srcdir)/libiberty.texi \\\$(TEXISRC)\\
+	dvips -o ./libiberty.ps ./libiberty.dvi\\
+
+# Enable libiberty installation.
+# Passing --enable-install-libiberty to the toplovel configure seems not to be enough.
+s/@target_header_dir@/libiberty/
+
+# Fixes for ./etc/Makefile.in.
+/^HTMLFILES =.*configure.html$/ i\\
+PSFILES = standards.ps configure.ps
+/epstopdf/ s/[ 	]\\{1,\\}-outfile/ --outfile/
+
+# Fixes for ./ld/Makefile.in.
+/^install-exec-local[	 ]*:.*ld-new.*$/ {
+  s/$/ install-data-local-djgpp/
+i\\
+install-data-local-djgpp:\\
+	\\\$(mkinstalldirs) \\\$(DESTDIR)\\\$(scriptdir)\\
+	for f in libnames.tab; do \\\\\\
+	  \\\$(INSTALL_DATA) \\\$(top_srcdir)/\\\$\\\$f \\\$(DESTDIR)\\\$(scriptdir)/\\\$\\\$f ; \\\\\\
+	done\\
+
+}
+EOF
+
+
+for file in ./../bfd/Makefile.in ./../bfd/doc/Makefile.in ./../binutils/doc/Makefile.in ./../etc/Makefile.in ./../gas/doc/Makefile.in ./../gprof/Makefile.in ./../ld/Makefile.in ./../libiberty/Makefile.in; do
+  if test ! -f ${file}.orig; then
+    cp -vf ${file} ${file}.orig
+    touch ${file}.orig -r ${file}
+  fi
+  sed -f ./script.sed ${file}.orig > ./file.out
+  update ./file.out ${file}
+  touch ${file} -r ${file}.orig
+done
+
+rm -vf ./file.out ./script.sed
+
+
+
+#
+#  3: Adjust the config.in headers.
+#
+
+cat > script.sed << EOF
+# DJGPP 2.03 needs the snprintf prototype.
+# DJGPP 2.03 has _strtold but not strtold.
+/^#undef HAVE_DECL_SNPRINTF$/ c\\
+#include <sys/version.h>\\
+#if __DJGPP__ == 2 && __DJGPP_MINOR__ < 4\\
+# define HAVE_DECL_SNPRINTF 0\\
+# undef  strtold\\
+# define strtold  _strtold\\
+#else\\
+#undef HAVE_DECL_SNPRINTF\\
+#endif
+
+$ a\\
+#ifdef __DJGPP__\\
+# if defined (__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8))\\
+#  define __gnuc_extension__  __extension__\\
+# else\\
+#  define __gnuc_extension__\\
+# endif\\
+\\
+# undef  IS_SLASH\\
+# define IS_SLASH(c)                ((c) == '/' || (c) == '\\\\\\\\')\\
+# undef  IS_DIRECTORY_SEPARATOR\\
+# define IS_DIRECTORY_SEPARATOR(c)  (IS_SLASH(c) || (c) == ':')\\
+\\
+# include <libc/unconst.h>\\
+# define STRIP_FULL_PATH_AND_EXTENSION(file_name)   \\\\\\
+  (__gnuc_extension__                               \\\\\\
+    ({                                              \\\\\\
+       char *_dst, *_src;                           \\\\\\
+       _dst = _src = unconst((file_name), char *);  \\\\\\
+       while (*_src++)                              \\\\\\
+         ;                                          \\\\\\
+       while ((_src - _dst) && (*--_src != '.'))    \\\\\\
+         ;                                          \\\\\\
+       for (*_src = '\\\\0'; (_src - _dst); _src--)    \\\\\\
+         if (IS_DIRECTORY_SEPARATOR(*_src))         \\\\\\
+           break;                                   \\\\\\
+       if (_src - _dst)                             \\\\\\
+         while ((*_dst++ = *++_src))                \\\\\\
+           ;                                        \\\\\\
+       (file_name);                                 \\\\\\
+    })                                              \\\\\\
+  )\\
+#else\\
+# define STRIP_FULL_PATH_AND_EXTENSION(file_name)  (file_name)\\
+#endif
+EOF
+
+
+for file in ../bfd/config.in ../binutils/config.in ../gold/config.in ../libiberty/config.in; do
+  if test ! -f ${file}.orig; then
+    cp -vf ${file} ${file}.orig
+    touch ${file}.orig -r ${file}
+  fi
+  sed -f ./script.sed ${file}.orig > ./file.out
+  update ./file.out ${file}
+  touch ${file} -r ${file}.orig
+done
+rm -vf ./file.out ./script.sed
+
+
+cat > script.sed << EOF
+# DJGPP 2.03 needs the snprintf prototype.
+# DJGPP 2.03 has _strtold but not strtold.
+$ a\\
+\\
+#ifdef __DJGPP__\\
+# include <sys/version.h>\\
+# if __DJGPP__ == 2 && __DJGPP_MINOR__ < 4\\
+/* Define to 1 if you have the declaration of snprintf, and to 0 if you\\
+   do not. */\\
+#  define HAVE_DECL_SNPRINTF 0\\
+#  undef  strtold\\
+#  define strtold  _strtold\\
+# endif\\
+\\
+# if defined (__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8))\\
+#  define __gnuc_extension__  __extension__\\
+# else\\
+#  define __gnuc_extension__\\
+# endif\\
+\\
+# undef  IS_SLASH\\
+# define IS_SLASH(c)                ((c) == '/' || (c) == '\\\\\\\\')\\
+# undef  IS_DIRECTORY_SEPARATOR\\
+# define IS_DIRECTORY_SEPARATOR(c)  (IS_SLASH(c) || (c) == ':')\\
+\\
+# include <libc/unconst.h>\\
+# define STRIP_FULL_PATH_AND_EXTENSION(file_name)   \\\\\\
+  (__gnuc_extension__                               \\\\\\
+    ({                                              \\\\\\
+       char *_dst, *_src;                           \\\\\\
+       _dst = _src = unconst((file_name), char *);  \\\\\\
+       while (*_src++)                              \\\\\\
+         ;                                          \\\\\\
+       while ((_src - _dst) && (*--_src != '.'))    \\\\\\
+         ;                                          \\\\\\
+       for (*_src = '\\\\0'; (_src - _dst); _src--)    \\\\\\
+         if (IS_DIRECTORY_SEPARATOR(*_src))         \\\\\\
+           break;                                   \\\\\\
+       if (_src - _dst)                             \\\\\\
+         while ((*_dst++ = *++_src))                \\\\\\
+           ;                                        \\\\\\
+       (file_name);                                 \\\\\\
+    })                                              \\\\\\
+  )\\
+#else\\
+# define STRIP_FULL_PATH_AND_EXTENSION(file_name)  (file_name)\\
+#endif
+EOF
+
+if [ "x${DXE3_SUPPORT_ENABLED}" = "xyes" ]; then
+  cat >> script.sed << EOF
+# Enable DXE3 support in the linker.\\
+$ a\\
+\\
+#if defined(__DJGPP__) && __DJGPP__ == 2 && __DJGPP_MINOR__ >= 4\\
+/* Enable resolution of multiple symbol definition introduced by\\
+   the import libraries by the linker if DXE3 support is provided\\
+   by libc.a.  */\\
+# define HAVE_DXE3_SUPPORT 1\\
+#endif\\
+EOF
+fi
+
+for file in ../gas/config.in ../gprof/gconfig.in ../ld/config.in ../opcodes/config.in; do
+  if test ! -f ${file}.orig; then
+    cp -vf ${file} ${file}.orig
+    touch ${file}.orig -r ${file}
+  fi
+  sed -f ./script.sed ${file}.orig > ./file.out
+  update ./file.out ${file}
+  touch ${file} -r ${file}.orig
+done
+rm -vf ./file.out ./script.sed
+
+
+
+#
+#  4: Configure and build the libs and programs.
+#
+
+touch start_build.txt
+
+echo
+echo Configuring the progs and libs.
+echo See build_log.txt file for output.
+
+
+echo Using: > build_log.txt
+gcc --version >> build_log.txt
+as --version >> build_log.txt
+echo >> build_log.txt
+ld --version >> build_log.txt
+echo >> build_log.txt
+echo >> build_log.txt
+echo >> build_log.txt
+
+echo Configuring the progs and libs for DJGPP. >> build_log.txt
+echo >> build_log.txt
+
+../configure  --disable-dependency-tracking ${NLS_SUPPORT} \
+              --with-mpc='/dev/env/DJDIR' --with-mpfr='/dev/env/DJDIR' --with-gmp='/dev/env/DJDIR' \
+              --enable-install-bfd --enable-install-libiberty \
+              --enable-build-warnings=-Wimplicit,-Wcomment,-Wformat,-Wparentheses,-Wpointer-arith >> build_log.txt  2>&1
+
+echo >> build_log.txt
+echo ################################################################################ >> build_log.txt
+echo >> build_log.txt
+
+
+# Remove target alias from tooldir and scriptdir paths so
+# that the linker scripts and binaries are installed in
+# their DJGPP specific canonical places.
+sed "/^.*tooldir = /s|/.*$||" ./Makefile > file.out
+mv -vf ./file.out ./Makefile
+
+
+echo
+echo Building the progs and libs.
+echo See build_log.txt file for output.
+echo Building the progs and libs for DJGPP. >> build_log.txt
+echo >> build_log.txt
+make >> build_log.txt  2>&1
+
+touch stop_build.txt
diff -aprNU5 binutils-2.25.orig/gas/as.c binutils-2.25/gas/as.c
--- binutils-2.25.orig/gas/as.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/gas/as.c	2014-12-24 17:50:54 +0100
@@ -1134,11 +1134,11 @@ main (int argc, char ** argv)
 
 #ifdef HOST_SPECIAL_INIT
   HOST_SPECIAL_INIT (argc, argv);
 #endif
 
-  myname = argv[0];
+  myname = STRIP_FULL_PATH_AND_EXTENSION(argv[0]);
   xmalloc_set_program_name (myname);
 
   expandargv (&argc, &argv);
 
   START_PROGRESS (myname, 0);
diff -aprNU5 binutils-2.25.orig/gas/config/obj-coff-seh.c binutils-2.25/gas/config/obj-coff-seh.c
--- binutils-2.25.orig/gas/config/obj-coff-seh.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/gas/config/obj-coff-seh.c	2014-12-24 17:50:54 +0100
@@ -62,11 +62,11 @@ get_pxdata_name (segT seg, const char *b
   else if (dot < dollar)
     name = dot;
   else
     name = dollar;
 
-  sname = concat (base_name, name, NULL);
+  sname = concat (base_name, name, (char *)NULL);
 
   return sname;
 }
 
 /* Allocate a seh_seg_list structure.  */
diff -aprNU5 binutils-2.25.orig/gas/dw2gencfi.c binutils-2.25/gas/dw2gencfi.c
--- binutils-2.25.orig/gas/dw2gencfi.c	2014-10-14 07:32:02 +0100
+++ binutils-2.25/gas/dw2gencfi.c	2014-12-24 17:50:54 +0100
@@ -137,11 +137,11 @@ get_debugseg_name (segT seg, const char
 	name = dot;
       else
 	name = dollar;
     }
 
-  return concat (base_name, name, NULL);
+  return concat (base_name, name, (char *)NULL);
 }
 
 /* Allocate a dwcfi_seg_list structure.  */
 
 static struct dwcfi_seg_list *
diff -aprNU5 binutils-2.25.orig/gprof/gprof.c binutils-2.25/gprof/gprof.c
--- binutils-2.25.orig/gprof/gprof.c	2014-10-14 07:32:04 +0100
+++ binutils-2.25/gprof/gprof.c	2014-12-24 17:50:54 +0100
@@ -196,11 +196,11 @@ main (int argc, char **argv)
 #ifdef ENABLE_NLS
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 #endif
 
-  whoami = argv[0];
+  whoami = STRIP_FULL_PATH_AND_EXTENSION(argv[0]);
   xmalloc_set_program_name (whoami);
 
   expandargv (&argc, &argv);
 
   while ((ch = getopt_long (argc, argv,
diff -aprNU5 binutils-2.25.orig/ld/ldfile.c binutils-2.25/ld/ldfile.c
--- binutils-2.25.orig/ld/ldfile.c	2014-10-14 07:32:04 +0100
+++ binutils-2.25/ld/ldfile.c	2014-12-24 17:50:54 +0100
@@ -62,10 +62,128 @@ typedef struct search_arch
 
 static search_dirs_type **search_tail_ptr = &search_head;
 static search_arch_type *search_arch_head;
 static search_arch_type **search_arch_tail_ptr = &search_arch_head;
 
+
+#ifdef __DJGPP__
+/*  Map library long filename to an library short filename
+    according to the filename table stored in /dev/env/DJDIR/lib/libnames.tab.  */
+
+static bfd_boolean
+map_LFN_to_SFN (const char **filename)
+{
+  static char **table = NULL;
+  static int last_index = 0;
+
+
+  /*
+   *  Initialize library name table from libnames.tab content.
+   */
+  if (!table)
+  {
+    FILE *map = fopen ("/dev/env/DJDIR/lib/libnames.tab", "r");
+
+    if (map)
+    {
+      char line[128];
+      int i = 0;
+
+      while (fscanf(map, "%[^\n]\n", line) != EOF)
+      {
+        if (line[0] == '#')
+          continue;
+        else
+          i++;
+      }
+
+      if (i)
+      {
+        last_index = 2 * i;
+        table = xmalloc(last_index * sizeof(char *));
+
+        i = 0;
+        rewind(map);
+        while (fscanf(map, "%[^\n]\n", line) != EOF)
+        {
+          if (line[0] != '#')
+          {
+            char long_name[FILENAME_MAX + 1], short_name[FILENAME_MAX + 1];
+
+            sscanf(line, "%s %s", long_name, short_name);
+            table[i++] = concat(long_name, (const char *) NULL);
+            table[i++] = concat(short_name, (const char *) NULL);
+          }
+        }
+      }
+
+      fclose(map);
+    }
+    else if (verbose)
+      info_msg(_("cannot find \"/dev/env/DJDIR/lib/libnames.tab\"\n"));
+  }
+
+
+  /*
+   *  Map library LFN to SFN using the table read from libnames.tab content.
+   */
+  if (table)
+  {
+    char *extension, *libname, *prefix = concat(*filename, (const char *)NULL);
+    char line[128];
+    int i;
+
+    /*  Strip library prefix and suffix.  */
+    for (libname = prefix, i = 0; libname[i]; i++)
+      ;
+
+#define IS_DOT_A_SUFFIX(filename)  ((filename)[--i] == 'a' && (filename)[--i] == '.')
+#define IS_LIB_PREFIX(filename)    ((filename)[--i] == 'b' && (filename)[--i] == 'i' && (filename)[--i] == 'l')
+    while (i)
+      if (IS_DOT_A_SUFFIX(libname))
+      {
+        libname[i] = '\0';
+        extension = libname + i;
+        break;
+      }
+    while (i)
+      if (IS_LIB_PREFIX(libname))
+      {
+        if (i == 0)
+        {
+          libname += 3;
+          break;
+        }
+        if (libname[--i] == '/')
+        {
+          libname += i + 4;
+          break;
+        }
+      }
+#undef IS_DOT_A_SUFFIX
+#undef IS_LIB_PREFIX
+
+    for (i = 0; i < last_index; i++)
+      if (strcmp(libname, table[i++]) == 0)
+      {
+        /*  Create a short filename for the library.  */
+        *libname = '\0';
+        *extension = '.';
+        *filename = concat(prefix, table[i], extension, (const char *)NULL);
+        if (verbose)
+          info_msg(_("mapped \"%s\" to \"%s\"\n"), table[i - 1], table[i]);
+
+        return TRUE;
+      }
+
+    free(prefix);
+  }
+
+  return FALSE;
+}
+#endif  /* __DJGPP__ */
+
 /* Test whether a pathname, after canonicalization, is the same or a
    sub-directory of the sysroot directory.  */
 
 static bfd_boolean
 is_sysrooted_pathname (const char *name)
@@ -120,12 +238,23 @@ ldfile_add_library_path (const char *nam
 
 bfd_boolean
 ldfile_try_open_bfd (const char *attempt,
 		     lang_input_statement_type *entry)
 {
+#ifdef __DJGPP__
+  bfd_boolean already_tried_SFN = FALSE;
+
+again:
+#endif  /* __DJGPP__ */
+
   entry->the_bfd = bfd_openr (attempt, entry->target);
 
+#ifdef __DJGPP__
+  if (!entry->the_bfd && !already_tried_SFN && (already_tried_SFN = map_LFN_to_SFN(&attempt)))
+    goto again;
+#endif  /* __DJGPP__ */
+
   if (verbose)
     {
       if (entry->the_bfd == NULL)
 	info_msg (_("attempt to open %s failed\n"), attempt);
       else
@@ -370,11 +499,11 @@ ldfile_open_file_search (const char *arc
       if (entry->flags.maybe_archive && !entry->flags.full_name_provided)
 	string = concat (search->name, slash, lib, entry->filename,
 			 arch, suffix, (const char *) NULL);
       else
 	string = concat (search->name, slash, entry->filename,
-			 (const char *) 0);
+			 (const char *) NULL);
 
       if (ldfile_try_open_bfd (string, entry))
 	{
 	  entry->filename = string;
 	  return TRUE;
diff -aprNU5 binutils-2.25.orig/ld/ldmain.c binutils-2.25/ld/ldmain.c
--- binutils-2.25.orig/ld/ldmain.c	2014-10-14 07:32:04 +0100
+++ binutils-2.25/ld/ldmain.c	2014-12-24 17:50:54 +0100
@@ -200,11 +200,11 @@ main (int argc, char **argv)
   setlocale (LC_CTYPE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  program_name = argv[0];
+  program_name = STRIP_FULL_PATH_AND_EXTENSION(argv[0]);
   xmalloc_set_program_name (program_name);
 
   START_PROGRESS (program_name, 0);
 
   expandargv (&argc, &argv);
@@ -954,10 +954,31 @@ multiple_definition (struct bfd_link_inf
       || (nsec->output_section != NULL
 	  && ! bfd_is_abs_section (nsec)
 	  && bfd_is_abs_section (nsec->output_section)))
     return TRUE;
 
+#if defined(HAVE_DXE3_SUPPORT) && HAVE_DXE3_SUPPORT == 1
+  /*  DJGPP specific resolution of multiple symbol definitions.
+      A symbol defined in an object file or in an static library
+      and at the same time in an import library belonging to a
+      DXE3 module will be replaced by the symbol provided by the
+      import library.  If more than one import library provides
+      the same symbol the first one will be used and all other
+      ones will be ignored.
+      A symbol from an import library is identified by its "dxe_tmp.o"
+      file name.  */
+
+#define IS_IMPORT_LIBRARY_SYMBOL(name)  ((name)[0] == 'd' && (name)[1] == 'x' && (name)[2] == 'e' && (name)[3] == '_' && \
+                                         (name)[4] == 't' && (name)[5] == 'm' && (name)[6] == 'p' && (name)[7] == '.' && \
+                                         (name)[8] == 'o')
+
+    if (h->type == bfd_link_hash_defined && IS_IMPORT_LIBRARY_SYMBOL(nsec->owner->filename))
+      return TRUE;
+
+#undef IS_IMPORT_LIBRARY_SYMBOL
+#endif /*  HAVE_DXE3_SUPPORT  */
+
   name = h->root.string;
   if (nbfd == NULL)
     {
       nbfd = obfd;
       nsec = osec;
diff -aprNU5 binutils-2.25.orig/ld/libnames.tab binutils-2.25/ld/libnames.tab
--- binutils-2.25.orig/ld/libnames.tab	1970-01-01 01:00:00 +0100
+++ binutils-2.25/ld/libnames.tab	2014-12-24 17:50:54 +0100
@@ -0,0 +1,23 @@
+#
+#  Table to map libraries long file name to short file names.
+#  The entry is:
+#    LFN   SFN
+#  The library name is the name stripped from its directory name,
+#  stripped from its "lib" prefix and its ".a" suffix.
+#
+#
+#  E.g.: for the library
+#
+#    /dev/env/DJDIR/lib/foobar-1.2.3/libverylongname-1.2.3.a
+#
+#  the mapping entry will look like this:
+#
+#    verylongname-1.2.3   vln123
+#
+
+
+#  LFN           SFN
+
+gettextlib     gtxtlib
+gettextpo      gtxtpo
+gettextsrc     gtxtsrc
diff -aprNU5 binutils-2.25.orig/ld/scripttempl/i386go32.sc binutils-2.25/ld/scripttempl/i386go32.sc
--- binutils-2.25.orig/ld/scripttempl/i386go32.sc	2014-10-14 07:32:04 +0100
+++ binutils-2.25/ld/scripttempl/i386go32.sc	2014-12-24 17:50:54 +0100
@@ -45,18 +45,27 @@ SECTIONS
   }
   .data ${RELOCATING+ ${DATA_ALIGNMENT}} : {
     ${RELOCATING+djgpp_first_ctor = . ;
     *(SORT(.ctors.*))
     *(.ctor)
+    *(.ctors)
     djgpp_last_ctor = . ;}
     ${RELOCATING+djgpp_first_dtor = . ;
     *(SORT(.dtors.*))
     *(.dtor)
+    *(.dtors)
     djgpp_last_dtor = . ;}
+    __environ = . ;
+    PROVIDE(_environ = .) ;
+    LONG(0) ;
     *(.data)
     ${RELOCATING+*(.data.*)}
 
+    /* Ugly workaround to prevent entire .bss to have attribute CONTENT */
+    /* for C++ executables. */
+    *(${RELOCATING+ .bss.*})
+
     ${RELOCATING+*(.gcc_exc*)}
     ${RELOCATING+___EH_FRAME_BEGIN__ = . ;}
     ${RELOCATING+*(.eh_fram*)}
     ${RELOCATING+___EH_FRAME_END__ = . ;}
     ${RELOCATING+LONG(0);}
@@ -67,15 +76,17 @@ SECTIONS
   }
   ${CONSTRUCTING+${RELOCATING-$CTOR}}
   ${CONSTRUCTING+${RELOCATING-$DTOR}}
   .bss ${RELOCATING+ SIZEOF(.data) + ADDR(.data)} :
   { 					
-    *(.bss${RELOCATING+ .bss.* .gnu.linkonce.b.*})
+    *(.bss${RELOCATING+ .gnu.linkonce.b.*})
     *(COMMON)
     ${RELOCATING+ end = . ; PROVIDE(_end = .) ;}
     ${RELOCATING+ . = ALIGN(${SEGMENT_SIZE});}
   }
+  /* Discard LTO sections.  */
+  /DISCARD/ : { *(gnu.lto_*) } 
   /* Stabs debugging sections.  */
   .stab 0 : { *(.stab) }
   .stabstr 0 : { *(.stabstr) }
 EOF
 
diff -aprNU5 binutils-2.25.orig/libiberty/cp-demangle.c binutils-2.25/libiberty/cp-demangle.c
--- binutils-2.25.orig/libiberty/cp-demangle.c	2014-10-14 07:32:04 +0100
+++ binutils-2.25/libiberty/cp-demangle.c	2014-12-24 17:50:54 +0100
@@ -5841,11 +5841,11 @@ d_demangle_callback (const char *mangled
       DCT_GLOBAL_CTORS,
       DCT_GLOBAL_DTORS
     }
   type;
   struct d_info di;
-  struct demangle_component *dc;
+  struct demangle_component *dc = NULL;
   int status;
 
   if (mangled[0] == '_' && mangled[1] == 'Z')
     type = DCT_MANGLED;
   else if (strncmp (mangled, "_GLOBAL_", 8) == 0
diff -aprNU5 binutils-2.25.orig/libiberty/make-relative-prefix.c binutils-2.25/libiberty/make-relative-prefix.c
--- binutils-2.25.orig/libiberty/make-relative-prefix.c	2013-11-04 15:33:40 +0100
+++ binutils-2.25/libiberty/make-relative-prefix.c	2014-12-24 17:50:54 +0100
@@ -80,10 +80,11 @@ relative prefix can be found, return @co
 #if defined (_WIN32) || defined (__MSDOS__) \
     || defined (__DJGPP__) || defined (__OS2__)
 #  define HAVE_DOS_BASED_FILE_SYSTEM
 #  define HAVE_HOST_EXECUTABLE_SUFFIX
 #  define HOST_EXECUTABLE_SUFFIX ".exe"
+#  define FILENAME_COMPARE strcasecmp
 #  ifndef DIR_SEPARATOR_2 
 #    define DIR_SEPARATOR_2 '\\'
 #  endif
 #  define PATH_SEPARATOR ';'
 #else
@@ -95,10 +96,13 @@ relative prefix can be found, return @co
 #else
 #  define IS_DIR_SEPARATOR(ch) \
 	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
 #endif
 
+#ifndef FILENAME_COMPARE
+#  define FILENAME_COMPARE strcmp
+#endif
 #define DIR_UP ".."
 
 static char *save_string (const char *, int);
 static char **split_directories	(const char *, int *);
 static void free_split_directories (char **);
@@ -332,11 +336,11 @@ make_relative_prefix_1 (const char *prog
      we can do.  */
   if (prog_num == bin_num)
     {
       for (i = 0; i < bin_num; i++)
 	{
-	  if (strcmp (prog_dirs[i], bin_dirs[i]) != 0)
+	  if (FILENAME_COMPARE (prog_dirs[i], bin_dirs[i]) != 0)
 	    break;
 	}
 
       if (prog_num <= 0 || i == bin_num)
 	goto bailout;
@@ -348,11 +352,11 @@ make_relative_prefix_1 (const char *prog
 
   /* Find how many directories are in common between bin_prefix & prefix.  */
   n = (prefix_num < bin_num) ? prefix_num : bin_num;
   for (common = 0; common < n; common++)
     {
-      if (strcmp (bin_dirs[common], prefix_dirs[common]) != 0)
+      if (FILENAME_COMPARE (bin_dirs[common], prefix_dirs[common]) != 0)
 	break;
     }
 
   /* If there are no common directories, there can be no relative prefix.  */
   if (common == 0)
diff -aprNU5 binutils-2.25.orig/libiberty/make-temp-file.c binutils-2.25/libiberty/make-temp-file.c
--- binutils-2.25.orig/libiberty/make-temp-file.c	2013-11-04 15:33:40 +0100
+++ binutils-2.25/libiberty/make-temp-file.c	2014-12-24 17:50:54 +0100
@@ -53,16 +53,31 @@ extern int mkstemps (char *, int);
 /* '/' works just fine on MS-DOS based systems.  */
 #ifndef DIR_SEPARATOR
 #define DIR_SEPARATOR '/'
 #endif
 
+#if defined (_WIN32) || defined (__MSDOS__) \
+    || defined (__DJGPP__) || defined (__OS2__)
+#  define HAVE_DOS_BASED_FILE_SYSTEM
+#  ifndef DIR_SEPARATOR_2 
+#    define DIR_SEPARATOR_2 '\\'
+#  endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+#  define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else
+#  define IS_DIR_SEPARATOR(ch) \
+     (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif
+
 /* Name of temporary file.
    mktemp requires 6 trailing X's.  */
 #define TEMP_FILE "ccXXXXXX"
 #define TEMP_FILE_LEN (sizeof(TEMP_FILE) - 1)
 
-#if !defined(_WIN32) || defined(__CYGWIN__)
+#if !defined(_WIN32) || defined(__CYGWIN__) || defined(__DJGPP__)
 
 /* Subroutine of choose_tmpdir.
    If BASE is non-NULL, return it.
    Otherwise it checks if DIR is a usable directory.
    If success, DIR is returned.
@@ -105,11 +120,11 @@ files in.
 char *
 choose_tmpdir (void)
 {
   if (!memoized_tmpdir)
     {
-#if !defined(_WIN32) || defined(__CYGWIN__)
+#if !defined(_WIN32) || defined(__CYGWIN__) || defined(__DJGPP__)
       const char *base = 0;
       char *tmpdir;
       unsigned int len;
       
 #ifdef VMS
@@ -141,11 +156,12 @@ choose_tmpdir (void)
       /* Append DIR_SEPARATOR to the directory we've chosen
 	 and return it.  */
       len = strlen (base);
       tmpdir = XNEWVEC (char, len + 2);
       strcpy (tmpdir, base);
-      tmpdir[len] = DIR_SEPARATOR;
+      if (len > 0 && !IS_DIR_SEPARATOR(tmpdir[len - 1]))
+        tmpdir[len] = DIR_SEPARATOR;
       tmpdir[len+1] = '\0';
       memoized_tmpdir = tmpdir;
 #else /* defined(_WIN32) && !defined(__CYGWIN__) */
       DWORD len;
 
diff -aprNU5 binutils-2.25.orig/libiberty/pex-common.c binutils-2.25/libiberty/pex-common.c
--- binutils-2.25.orig/libiberty/pex-common.c	2014-10-14 07:32:04 +0100
+++ binutils-2.25/libiberty/pex-common.c	2014-12-24 17:50:54 +0100
@@ -115,11 +115,11 @@ temp_file (struct pex_obj *obj, int flag
 
           if (len >= 6
               && strcmp (obj->tempbase + len - 6, "XXXXXX") == 0)
             name = xstrdup (obj->tempbase);
           else
-            name = concat (obj->tempbase, "XXXXXX", NULL);
+            name = concat (obj->tempbase, "XXXXXX", (char *)NULL);
 
           out = mkstemps (name, 0);
           if (out < 0)
             {
               free (name);
@@ -136,11 +136,11 @@ temp_file (struct pex_obj *obj, int flag
   else if ((flags & PEX_SUFFIX) != 0)
     {
       if (obj->tempbase == NULL)
         name = make_temp_file (name);
       else
-        name = concat (obj->tempbase, name, NULL);
+        name = concat (obj->tempbase, name, (char *)NULL);
     }
 
   return name;
 }
 
@@ -220,11 +220,11 @@ pex_run_in_environment (struct pex_obj *
     {
       if (outname == NULL)
 	out = STDOUT_FILE_NO;
       else if ((flags & PEX_SUFFIX) != 0)
 	{
-	  outname = concat (obj->tempbase, outname, NULL);
+	  outname = concat (obj->tempbase, outname, (char *)NULL);
 	  outname_allocated = 1;
 	}
       obj->next_input = -1;
     }
   else if ((obj->flags & PEX_USE_PIPES) == 0)
diff -aprNU5 binutils-2.25.orig/libiberty/stack-limit.c binutils-2.25/libiberty/stack-limit.c
--- binutils-2.25.orig/libiberty/stack-limit.c	2013-11-04 15:33:40 +0100
+++ binutils-2.25/libiberty/stack-limit.c	2014-12-24 17:50:54 +0100
@@ -49,11 +49,11 @@ stack_limit_increase (unsigned long pref
 #if defined(HAVE_SETRLIMIT) && defined(HAVE_GETRLIMIT) \
     && defined(RLIMIT_STACK) && defined(RLIM_INFINITY)
   struct rlimit rlim;
   if (getrlimit (RLIMIT_STACK, &rlim) == 0
       && rlim.rlim_cur != RLIM_INFINITY
-      && rlim.rlim_cur < pref
+      && rlim.rlim_cur < (signed long) pref
       && (rlim.rlim_max == RLIM_INFINITY || rlim.rlim_cur < rlim.rlim_max))
     {
       rlim.rlim_cur = pref;
       if (rlim.rlim_max != RLIM_INFINITY && rlim.rlim_cur > rlim.rlim_max)
 	rlim.rlim_cur = rlim.rlim_max;



2015-06-01 Juan Manuel Guerrero  <juan.guerrero@gmx.de>

	* bfd/cofflink.c (_bfd_coff_generic_relocate_section): Do not ignore the
	relocation if the output section has been discarded.




diff -aprNU5 binutils-2.25.orig/bfd/cofflink.c binutils-2.25/bfd/cofflink.c
--- binutils-2.25.orig/bfd/cofflink.c	2014-12-24 19:20:40 +0000
+++ binutils-2.25/bfd/cofflink.c	2015-06-01 00:02:26 +0000
@@ -2977,13 +2977,16 @@ _bfd_coff_generic_relocate_section (bfd
 	    }
 	  else
 	    {
 	      sec = sections[symndx];
 
+	      /* This does not work for the DJGPP port.  May be it does not work for any stock coff system.  */
+#if 0
 	      /* If the output section has been discarded then ignore this reloc.  */
 	      if (sec->output_section->vma == 0)
 		continue;
+#endif
 
               val = (sec->output_section->vma
 		     + sec->output_offset
 		     + sym->n_value);
 	      if (! obj_pe (input_bfd))
