Changeset 7c6ada9 for patches

Timestamp:

Jan 22, 2009, 4:15:28 PM (16 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

1f7883fe

Parents:

1d76a1c5

Message:

Updated Binutils Branch Update Patch to -4

File:

• patches/binutils-2.19-branch_update-4.patch (moved) (moved from patches/binutils-2.19-branch_update-3.patch ) (10 diffs)

patches/binutils-2.19-branch_update-4.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-08-2009
+Date: 01-22-2009
 Initial Package Version: 2.19
 Origin: Upstream
@@ -9 +9 @@
 diff -Naur binutils-2.19.orig/bfd/ChangeLog binutils-2.19/bfd/ChangeLog
 --- binutils-2.19.orig/bfd/ChangeLog    2008-10-16 06:20:48.000000000 -0700
-+++ binutils-2.19/bfd/ChangeLog 2008-12-23 02:06:46.000000000 -0800
-@@ -1,3 +1,31 @@
++++ binutils-2.19/bfd/ChangeLog 2009-01-14 01:13:49.000000000 -0800
+@@ -1,3 +1,37 @@
++2009-01-14  Joseph Myers  <joseph@codesourcery.com>
++
++       * elf32-arm.c (elf32_arm_final_link_relocate): Do not turn
++       branches to undefine weak symbols into branches to the next
++       instruction if creating PLT entries for those symbols.
++
 +2008-12-23  Nick Clifton  <nickc@redhat.com>
 +
@@ -42 +48 @@
  
         * configure.in: Bump version to 2.19
-diff -Naur binutils-2.19.orig/bfd/Makefile.in binutils-2.19/bfd/Makefile.in
---- binutils-2.19.orig/bfd/Makefile.in  2008-10-16 06:20:48.000000000 -0700
-+++ binutils-2.19/bfd/Makefile.in       2009-01-08 19:31:54.000000000 -0800
-@@ -271,7 +271,7 @@
- ACLOCAL_AMFLAGS = -I . -I .. -I ../config
- 
- # Uncomment the following line when doing a release.
--RELEASE = y
-+RELEASE=y
- INCDIR = $(srcdir)/../include
- CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
- MKDEP = gcc -MM
 diff -Naur binutils-2.19.orig/bfd/configure binutils-2.19/bfd/configure
 --- binutils-2.19.orig/bfd/configure    2008-10-16 06:20:42.000000000 -0700
@@ -78 +72 @@
  dnl These must be called before LT_INIT, because it may want
  dnl to call AC_CHECK_PROG.
-diff -Naur binutils-2.19.orig/bfd/elf.c binutils-2.19/bfd/elf.c
---- binutils-2.19.orig/bfd/elf.c        2008-10-09 05:18:23.000000000 -0700
-+++ binutils-2.19/bfd/elf.c     2008-12-23 02:06:46.000000000 -0800
-@@ -4606,7 +4606,61 @@
-        m != NULL;
-        m = m->next, p++)
-     {
--      if (m->count != 0)
-+      if (p->p_type == PT_GNU_RELRO)
-+       {
-+         const Elf_Internal_Phdr *lp;
-+
-+         BFD_ASSERT (!m->includes_filehdr && !m->includes_phdrs);
-+
-+         if (link_info != NULL)
-+           {
-+             /* During linking the range of the RELRO segment is passed
-+                in link_info.  */
-+             for (lp = phdrs; lp < phdrs + count; ++lp)
-+               {
-+                 if (lp->p_type == PT_LOAD
-+                     && lp->p_vaddr >= link_info->relro_start
-+                     && lp->p_vaddr < link_info->relro_end
-+                     && lp->p_vaddr + lp->p_filesz >= link_info->relro_end)
-+                   break;
-+               }
-+           }
-+         else
-+           {
-+             /* Otherwise we are copying an executable or shared
-+                library, but we need to use the same linker logic.  */
-+             for (lp = phdrs; lp < phdrs + count; ++lp)
-+               {
-+                 if (lp->p_type == PT_LOAD
-+                     && lp->p_paddr == p->p_paddr)
-+                   break;
-+               }
-+           }
-+
-+         if (lp < phdrs + count)
-+           {
-+             p->p_vaddr = lp->p_vaddr;
-+             p->p_paddr = lp->p_paddr;
-+             p->p_offset = lp->p_offset;
-+             if (link_info != NULL)
-+               p->p_filesz = link_info->relro_end - lp->p_vaddr;
-+             else if (m->p_size_valid)
-+               p->p_filesz = m->p_size;
-+             else
-+               abort ();
-+             p->p_memsz = p->p_filesz;
-+             p->p_align = 1;
-+             p->p_flags = (lp->p_flags & ~PF_W);
-+           }
-+         else if (link_info != NULL)
-+           {
-+             memset (p, 0, sizeof *p);
-+             p->p_type = PT_NULL;
-+           }
-+         else
-+           abort ();
-+       }
-+      else if (m->count != 0)
-        {
-          if (p->p_type != PT_LOAD
-              && (p->p_type != PT_NOTE
-@@ -4622,87 +4676,20 @@
-              p->p_filesz = sect->filepos - m->sections[0]->filepos;
-              if (hdr->sh_type != SHT_NOBITS)
-                p->p_filesz += hdr->sh_size;
--
--             if (p->p_type == PT_GNU_RELRO)
--               {
--                 /* When we get here, we are copying executable
--                    or shared library. But we need to use the same
--                    linker logic.  */
--                 Elf_Internal_Phdr *lp;
--
--                 for (lp = phdrs; lp < phdrs + count; ++lp)
--                   {
--                     if (lp->p_type == PT_LOAD
--                         && lp->p_paddr == p->p_paddr)
--                       break;
--                   }
--         
--                 if (lp < phdrs + count)
--                   {
--                     /* We should use p_size if it is valid since it
--                        may contain the first few bytes of the next
--                        SEC_ALLOC section.  */
--                     if (m->p_size_valid)
--                       p->p_filesz = m->p_size;
--                     else
--                       abort ();
--                     p->p_vaddr = lp->p_vaddr;
--                     p->p_offset = lp->p_offset;
--                     p->p_memsz = p->p_filesz;
--                     p->p_align = 1;
--                   }
--                 else
--                   abort ();
--               }
--             else
--               p->p_offset = m->sections[0]->filepos;
-+             p->p_offset = m->sections[0]->filepos;
-            }
-        }
--      else
-+      else if (m->includes_filehdr)
-        {
--         if (m->includes_filehdr)
--           {
--             p->p_vaddr = filehdr_vaddr;
--             if (! m->p_paddr_valid)
--               p->p_paddr = filehdr_paddr;
--           }
--         else if (m->includes_phdrs)
--           {
--             p->p_vaddr = phdrs_vaddr;
--             if (! m->p_paddr_valid)
--               p->p_paddr = phdrs_paddr;
--           }
--         else if (p->p_type == PT_GNU_RELRO)
--           {
--             Elf_Internal_Phdr *lp;
--
--             for (lp = phdrs; lp < phdrs + count; ++lp)
--               {
--                 if (lp->p_type == PT_LOAD
--                     && lp->p_vaddr <= link_info->relro_end
--                     && lp->p_vaddr >= link_info->relro_start
--                     && (lp->p_vaddr + lp->p_filesz
--                         >= link_info->relro_end))
--                   break;
--               }
--
--             if (lp < phdrs + count
--                 && link_info->relro_end > lp->p_vaddr)
--               {
--                 p->p_vaddr = lp->p_vaddr;
--                 p->p_paddr = lp->p_paddr;
--                 p->p_offset = lp->p_offset;
--                 p->p_filesz = link_info->relro_end - lp->p_vaddr;
--                 p->p_memsz = p->p_filesz;
--                 p->p_align = 1;
--                 p->p_flags = (lp->p_flags & ~PF_W);
--               }
--             else
--               {
--                 memset (p, 0, sizeof *p);
--                 p->p_type = PT_NULL;
--               }
--           }
-+         p->p_vaddr = filehdr_vaddr;
-+         if (! m->p_paddr_valid)
-+           p->p_paddr = filehdr_paddr;
-+       }
-+      else if (m->includes_phdrs)
-+       {
-+         p->p_vaddr = phdrs_vaddr;
-+         if (! m->p_paddr_valid)
-+           p->p_paddr = phdrs_paddr;
-        }
-     }
- 
+diff -Naur binutils-2.19.orig/bfd/doc/bfdver.texi binutils-2.19/bfd/doc/bfdver.texi
+--- binutils-2.19.orig/bfd/doc/bfdver.texi      2008-10-16 06:45:29.000000000 -0700
++++ binutils-2.19/bfd/doc/bfdver.texi   2009-01-14 01:00:24.000000000 -0800
+@@ -1,4 +1,4 @@
+-@set VERSION 2.19
++@set VERSION 2.19.0
+ @set VERSION_PACKAGE (GNU Binutils) 
+-@set UPDATED October 2008
++@set UPDATED December 2008
+ @set BUGURL @uref{http://www.sourceware.org/bugzilla/}
+diff -Naur binutils-2.19.orig/bfd/elf32-arm.c binutils-2.19/bfd/elf32-arm.c
+--- binutils-2.19.orig/bfd/elf32-arm.c  2008-08-26 07:40:18.000000000 -0700
++++ binutils-2.19/bfd/elf32-arm.c       2009-01-14 01:13:49.000000000 -0800
+@@ -6381,8 +6381,9 @@
+        int thumb2 = using_thumb2 (globals);
+ 
+        /* A branch to an undefined weak symbol is turned into a jump to
+-          the next instruction.  */
+-       if (h && h->root.type == bfd_link_hash_undefweak)
++          the next instruction unless a PLT entry will be created.  */
++       if (h && h->root.type == bfd_link_hash_undefweak
++           && !(splt != NULL && h->plt.offset != (bfd_vma) -1))
+          {
+            bfd_put_16 (input_bfd, 0xe000, hit_data);
+            bfd_put_16 (input_bfd, 0xbf00, hit_data + 2);
 diff -Naur binutils-2.19.orig/bfd/elf32-avr.c binutils-2.19/bfd/elf32-avr.c
 --- binutils-2.19.orig/bfd/elf32-avr.c  2008-08-08 22:35:12.000000000 -0700
@@ -402 +256 @@
                             outrel.r_addend += relocation;
                             if (tls_ty & (TLS_GD | TLS_DTPREL | TLS_TPREL))
+diff -Naur binutils-2.19.orig/bfd/elf.c binutils-2.19/bfd/elf.c
+--- binutils-2.19.orig/bfd/elf.c        2008-10-09 05:18:23.000000000 -0700
++++ binutils-2.19/bfd/elf.c     2008-12-23 02:06:46.000000000 -0800
+@@ -4606,7 +4606,61 @@
+        m != NULL;
+        m = m->next, p++)
+     {
+-      if (m->count != 0)
++      if (p->p_type == PT_GNU_RELRO)
++       {
++         const Elf_Internal_Phdr *lp;
++
++         BFD_ASSERT (!m->includes_filehdr && !m->includes_phdrs);
++
++         if (link_info != NULL)
++           {
++             /* During linking the range of the RELRO segment is passed
++                in link_info.  */
++             for (lp = phdrs; lp < phdrs + count; ++lp)
++               {
++                 if (lp->p_type == PT_LOAD
++                     && lp->p_vaddr >= link_info->relro_start
++                     && lp->p_vaddr < link_info->relro_end
++                     && lp->p_vaddr + lp->p_filesz >= link_info->relro_end)
++                   break;
++               }
++           }
++         else
++           {
++             /* Otherwise we are copying an executable or shared
++                library, but we need to use the same linker logic.  */
++             for (lp = phdrs; lp < phdrs + count; ++lp)
++               {
++                 if (lp->p_type == PT_LOAD
++                     && lp->p_paddr == p->p_paddr)
++                   break;
++               }
++           }
++
++         if (lp < phdrs + count)
++           {
++             p->p_vaddr = lp->p_vaddr;
++             p->p_paddr = lp->p_paddr;
++             p->p_offset = lp->p_offset;
++             if (link_info != NULL)
++               p->p_filesz = link_info->relro_end - lp->p_vaddr;
++             else if (m->p_size_valid)
++               p->p_filesz = m->p_size;
++             else
++               abort ();
++             p->p_memsz = p->p_filesz;
++             p->p_align = 1;
++             p->p_flags = (lp->p_flags & ~PF_W);
++           }
++         else if (link_info != NULL)
++           {
++             memset (p, 0, sizeof *p);
++             p->p_type = PT_NULL;
++           }
++         else
++           abort ();
++       }
++      else if (m->count != 0)
+        {
+          if (p->p_type != PT_LOAD
+              && (p->p_type != PT_NOTE
+@@ -4622,87 +4676,20 @@
+              p->p_filesz = sect->filepos - m->sections[0]->filepos;
+              if (hdr->sh_type != SHT_NOBITS)
+                p->p_filesz += hdr->sh_size;
+-
+-             if (p->p_type == PT_GNU_RELRO)
+-               {
+-                 /* When we get here, we are copying executable
+-                    or shared library. But we need to use the same
+-                    linker logic.  */
+-                 Elf_Internal_Phdr *lp;
+-
+-                 for (lp = phdrs; lp < phdrs + count; ++lp)
+-                   {
+-                     if (lp->p_type == PT_LOAD
+-                         && lp->p_paddr == p->p_paddr)
+-                       break;
+-                   }
+-         
+-                 if (lp < phdrs + count)
+-                   {
+-                     /* We should use p_size if it is valid since it
+-                        may contain the first few bytes of the next
+-                        SEC_ALLOC section.  */
+-                     if (m->p_size_valid)
+-                       p->p_filesz = m->p_size;
+-                     else
+-                       abort ();
+-                     p->p_vaddr = lp->p_vaddr;
+-                     p->p_offset = lp->p_offset;
+-                     p->p_memsz = p->p_filesz;
+-                     p->p_align = 1;
+-                   }
+-                 else
+-                   abort ();
+-               }
+-             else
+-               p->p_offset = m->sections[0]->filepos;
++             p->p_offset = m->sections[0]->filepos;
+            }
+        }
+-      else
++      else if (m->includes_filehdr)
+        {
+-         if (m->includes_filehdr)
+-           {
+-             p->p_vaddr = filehdr_vaddr;
+-             if (! m->p_paddr_valid)
+-               p->p_paddr = filehdr_paddr;
+-           }
+-         else if (m->includes_phdrs)
+-           {
+-             p->p_vaddr = phdrs_vaddr;
+-             if (! m->p_paddr_valid)
+-               p->p_paddr = phdrs_paddr;
+-           }
+-         else if (p->p_type == PT_GNU_RELRO)
+-           {
+-             Elf_Internal_Phdr *lp;
+-
+-             for (lp = phdrs; lp < phdrs + count; ++lp)
+-               {
+-                 if (lp->p_type == PT_LOAD
+-                     && lp->p_vaddr <= link_info->relro_end
+-                     && lp->p_vaddr >= link_info->relro_start
+-                     && (lp->p_vaddr + lp->p_filesz
+-                         >= link_info->relro_end))
+-                   break;
+-               }
+-
+-             if (lp < phdrs + count
+-                 && link_info->relro_end > lp->p_vaddr)
+-               {
+-                 p->p_vaddr = lp->p_vaddr;
+-                 p->p_paddr = lp->p_paddr;
+-                 p->p_offset = lp->p_offset;
+-                 p->p_filesz = link_info->relro_end - lp->p_vaddr;
+-                 p->p_memsz = p->p_filesz;
+-                 p->p_align = 1;
+-                 p->p_flags = (lp->p_flags & ~PF_W);
+-               }
+-             else
+-               {
+-                 memset (p, 0, sizeof *p);
+-                 p->p_type = PT_NULL;
+-               }
+-           }
++         p->p_vaddr = filehdr_vaddr;
++         if (! m->p_paddr_valid)
++           p->p_paddr = filehdr_paddr;
++       }
++      else if (m->includes_phdrs)
++       {
++         p->p_vaddr = phdrs_vaddr;
++         if (! m->p_paddr_valid)
++           p->p_paddr = phdrs_paddr;
+        }
+     }
+ 
+diff -Naur binutils-2.19.orig/bfd/Makefile.in binutils-2.19/bfd/Makefile.in
+--- binutils-2.19.orig/bfd/Makefile.in  2008-10-16 06:20:48.000000000 -0700
++++ binutils-2.19/bfd/Makefile.in       2009-01-22 16:10:32.431360245 -0800
+@@ -271,7 +271,7 @@
+ ACLOCAL_AMFLAGS = -I . -I .. -I ../config
+ 
+ # Uncomment the following line when doing a release.
+-RELEASE = y
++RELEASE=y
+ INCDIR = $(srcdir)/../include
+ CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
+ MKDEP = gcc -MM
 diff -Naur binutils-2.19.orig/bfd/version.h binutils-2.19/bfd/version.h
 --- binutils-2.19.orig/bfd/version.h    2008-10-16 05:51:57.000000000 -0700
-+++ binutils-2.19/bfd/version.h 2009-01-08 16:00:10.000000000 -0800
++++ binutils-2.19/bfd/version.h 2009-01-22 16:00:14.000000000 -0800
 @@ -1,4 +1,4 @@
 -#define BFD_VERSION_DATE 20081016
-+#define BFD_VERSION_DATE 20090109
++#define BFD_VERSION_DATE 20090123
  #define BFD_VERSION @bfd_version@
  #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
@@ -501 +532 @@
 diff -Naur binutils-2.19.orig/gas/ChangeLog binutils-2.19/gas/ChangeLog
 --- binutils-2.19.orig/gas/ChangeLog    2008-10-16 05:52:03.000000000 -0700
-+++ binutils-2.19/gas/ChangeLog 2009-01-08 16:16:11.000000000 -0800
-@@ -1,3 +1,12 @@
++++ binutils-2.19/gas/ChangeLog 2009-01-14 01:00:24.000000000 -0800
+@@ -1,3 +1,29 @@
++2009-01-14  Jakub Jelinek  <jakub@redhat.com>
++
++       * Makefile.am (ehopt.o): Add struc-symbol.h.
++       * Makefile.in: Regenerated.
++       * ehopt.c: Include struc-symbol.h.
++       (check_eh_frame): For very small O_constant DW_CFA_advance_loc4
++       create correct DW_CFA_advance_loc.  Handle O_subtract only
++       for code alignment factor 1, otherwise handle O_divide or
++       O_right_shift of O_subtract and O_constant.
++       (eh_frame_estimate_size_before_relax): Always divide by ca.
++       (eh_frame_convert_frag): Likewise.
++
++2009-01-14  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
++
++       * dw2gencfi.c (output_cfi_insn): Scale DW_CFA_advance_loc1,
++       DW_CFA_advance_loc2 and DW_CFA_advance_loc4 outputs.
++
 +2009-01-08  Adam Nemet  <anemet@caviumnetworks.com>
 +
@@ -534 +582 @@
  /* MIPS PIC level.  */
  
+diff -Naur binutils-2.19.orig/gas/dw2gencfi.c binutils-2.19/gas/dw2gencfi.c
+--- binutils-2.19.orig/gas/dw2gencfi.c  2008-10-16 05:52:09.000000000 -0700
++++ binutils-2.19/gas/dw2gencfi.c       2009-01-14 01:00:24.000000000 -0800
+@@ -1,5 +1,5 @@
+ /* dw2gencfi.c - Support for generating Dwarf2 CFI information.
+-   Copyright 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
++   Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+    Contributed by Michal Ludvig <mludvig@suse.cz>
+ 
+    This file is part of GAS, the GNU Assembler.
+@@ -972,20 +972,20 @@
+ 
+            if (scaled <= 0x3F)
+              out_one (DW_CFA_advance_loc + scaled);
+-           else if (delta <= 0xFF)
++           else if (scaled <= 0xFF)
+              {
+                out_one (DW_CFA_advance_loc1);
+-               out_one (delta);
++               out_one (scaled);
+              }
+-           else if (delta <= 0xFFFF)
++           else if (scaled <= 0xFFFF)
+              {
+                out_one (DW_CFA_advance_loc2);
+-               out_two (delta);
++               out_two (scaled);
+              }
+            else
+              {
+                out_one (DW_CFA_advance_loc4);
+-               out_four (delta);
++               out_four (scaled);
+              }
+          }
+        else
+diff -Naur binutils-2.19.orig/gas/ehopt.c binutils-2.19/gas/ehopt.c
+--- binutils-2.19.orig/gas/ehopt.c      2007-11-06 09:15:10.000000000 -0800
++++ binutils-2.19/gas/ehopt.c   2009-01-14 01:00:25.000000000 -0800
+@@ -1,5 +1,6 @@
+ /* ehopt.c--optimize gcc exception frame information.
+-   Copyright 1998, 2000, 2001, 2003, 2005, 2007 Free Software Foundation, Inc.
++   Copyright 1998, 2000, 2001, 2003, 2005, 2007, 2008
++   Free Software Foundation, Inc.
+    Written by Ian Lance Taylor <ian@cygnus.com>.
+ 
+    This file is part of GAS, the GNU Assembler.
+@@ -21,6 +22,7 @@
+ 
+ #include "as.h"
+ #include "subsegs.h"
++#include "struc-symbol.h"
+ 
+ /* We include this ELF file, even though we may not be assembling for
+    ELF, since the exception frame information is always in a format
+@@ -398,13 +400,10 @@
+             subtracted were in the same frag and the expression was
+             reduced to a constant.  We can do the optimization entirely
+             in this function.  */
+-         if (d->cie_info.code_alignment > 0
+-             && exp->X_add_number % d->cie_info.code_alignment == 0
+-             && exp->X_add_number / d->cie_info.code_alignment < 0x40)
++         if (exp->X_add_number < 0x40)
+            {
+              d->loc4_frag->fr_literal[d->loc4_fix]
+-               = DW_CFA_advance_loc
+-                 | (exp->X_add_number / d->cie_info.code_alignment);
++               = DW_CFA_advance_loc | exp->X_add_number;
+              /* No more bytes needed.  */
+              return 1;
+            }
+@@ -419,23 +418,39 @@
+              *pnbytes = 2;
+            }
+        }
+-      else if (exp->X_op == O_subtract)
++      else if (exp->X_op == O_subtract && d->cie_info.code_alignment == 1)
+        {
+          /* This is a case we can optimize.  The expression was not
+             reduced, so we can not finish the optimization until the end
+             of the assembly.  We set up a variant frag which we handle
+             later.  */
+-         int fr_subtype;
+-
+-         if (d->cie_info.code_alignment > 0)
+-           fr_subtype = d->cie_info.code_alignment << 3;
+-         else
+-           fr_subtype = 0;
+-
+-         frag_var (rs_cfa, 4, 0, fr_subtype, make_expr_symbol (exp),
++         frag_var (rs_cfa, 4, 0, 1 << 3, make_expr_symbol (exp),
+                    d->loc4_fix, (char *) d->loc4_frag);
+          return 1;
+        }
++      else if ((exp->X_op == O_divide
++               || exp->X_op == O_right_shift)
++              && d->cie_info.code_alignment > 1)
++       {
++         if (exp->X_add_symbol->bsym
++             && exp->X_op_symbol->bsym
++             && exp->X_add_symbol->sy_value.X_op == O_subtract
++             && exp->X_op_symbol->sy_value.X_op == O_constant
++             && ((exp->X_op == O_divide
++                  ? exp->X_op_symbol->sy_value.X_add_number
++                  : (offsetT) 1 << exp->X_op_symbol->sy_value.X_add_number)
++                 == (offsetT) d->cie_info.code_alignment))
++           {
++             /* This is a case we can optimize as well.  The expression was
++                not reduced, so we can not finish the optimization until the
++                end of the assembly.  We set up a variant frag which we
++                handle later.  */
++             frag_var (rs_cfa, 4, 0, d->cie_info.code_alignment << 3,
++                       make_expr_symbol (&exp->X_add_symbol->sy_value),
++                       d->loc4_fix, (char *) d->loc4_frag);
++             return 1;
++           }
++       }
+       break;
+ 
+     case state_error:
+@@ -459,7 +474,9 @@
+ 
+   diff = resolve_symbol_value (frag->fr_symbol);
+ 
+-  if (ca > 0 && diff % ca == 0 && diff / ca < 0x40)
++  assert (ca > 0);
++  diff /= ca;
++  if (diff < 0x40)
+     ret = 0;
+   else if (diff < 0x100)
+     ret = 1;
+@@ -496,21 +513,21 @@
+ {
+   offsetT diff;
+   fragS *loc4_frag;
+-  int loc4_fix;
++  int loc4_fix, ca;
+ 
+   loc4_frag = (fragS *) frag->fr_opcode;
+   loc4_fix = (int) frag->fr_offset;
+ 
+   diff = resolve_symbol_value (frag->fr_symbol);
+ 
++  ca = frag->fr_subtype >> 3;
++  assert (ca > 0);
++  diff /= ca;
+   switch (frag->fr_subtype & 7)
+     {
+     case 0:
+-      {
+-       int ca = frag->fr_subtype >> 3;
+-       assert (ca > 0 && diff % ca == 0 && diff / ca < 0x40);
+-       loc4_frag->fr_literal[loc4_fix] = DW_CFA_advance_loc | (diff / ca);
+-      }
++      assert (diff < 0x40);
++      loc4_frag->fr_literal[loc4_fix] = DW_CFA_advance_loc | diff;
+       break;
+ 
+     case 1:
+diff -Naur binutils-2.19.orig/gas/Makefile.am binutils-2.19/gas/Makefile.am
+--- binutils-2.19.orig/gas/Makefile.am  2008-10-02 01:07:17.000000000 -0700
++++ binutils-2.19/gas/Makefile.am       2009-01-14 01:00:24.000000000 -0800
+@@ -2159,7 +2159,8 @@
+ dw2gencfi.o: dw2gencfi.c dw2gencfi.h $(INCDIR)/elf/dwarf2.h \
+   subsegs.h $(INCDIR)/obstack.h
+ ecoff.o: ecoff.c ecoff.h
+-ehopt.o: ehopt.c subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h
++ehopt.o: ehopt.c subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h \
++  struc-symbol.h
+ expr.o: expr.c $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h
+ flonum-copy.o: flonum-copy.c
+ flonum-konst.o: flonum-konst.c
+diff -Naur binutils-2.19.orig/gas/Makefile.in binutils-2.19/gas/Makefile.in
+--- binutils-2.19.orig/gas/Makefile.in  2008-10-02 01:07:17.000000000 -0700
++++ binutils-2.19/gas/Makefile.in       2009-01-14 01:00:24.000000000 -0800
+@@ -3002,7 +3002,8 @@
+ dw2gencfi.o: dw2gencfi.c dw2gencfi.h $(INCDIR)/elf/dwarf2.h \
+   subsegs.h $(INCDIR)/obstack.h
+ ecoff.o: ecoff.c ecoff.h
+-ehopt.o: ehopt.c subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h
++ehopt.o: ehopt.c subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h \
++  struc-symbol.h
+ expr.o: expr.c $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h
+ flonum-copy.o: flonum-copy.c
+ flonum-konst.o: flonum-konst.c
 diff -Naur binutils-2.19.orig/gas/testsuite/ChangeLog binutils-2.19/gas/testsuite/ChangeLog
 --- binutils-2.19.orig/gas/testsuite/ChangeLog  2008-09-17 02:00:45.000000000 -0700
@@ -547 +780 @@
  
         * gas/all/gas.exp: Don't run redef tests on a bunch of targets.
-diff -Naur binutils-2.19.orig/gas/testsuite/gas/mips/mips.exp binutils-2.19/gas/testsuite/gas/mips/mips.exp
---- binutils-2.19.orig/gas/testsuite/gas/mips/mips.exp  2008-09-06 01:47:00.000000000 -0700
-+++ binutils-2.19/gas/testsuite/gas/mips/mips.exp       2009-01-08 16:16:12.000000000 -0800
-@@ -398,6 +398,9 @@
-     run_dump_test_arches "abs"         [mips_arch_list_matching mips1]
-     run_dump_test_arches "add"         [mips_arch_list_matching mips1]
-     run_dump_test_arches "and"         [mips_arch_list_matching mips1]
-+    run_dump_test_arches "mips1-fp"    [mips_arch_list_matching mips1]
-+    run_list_test_arches "mips1-fp" "-32 -msoft-float" \
-+                                       [mips_arch_list_matching mips1]
-     run_dump_test "break20"
-     run_dump_test "trap20"
- 
 diff -Naur binutils-2.19.orig/gas/testsuite/gas/mips/mips1-fp.d binutils-2.19/gas/testsuite/gas/mips/mips1-fp.d
 --- binutils-2.19.orig/gas/testsuite/gas/mips/mips1-fp.d        1969-12-31 16:00:00.000000000 -0800
@@ -594 +814 @@
 +       add.s   $f0,$f2,$f4
 +       cfc1    $2,$0
+diff -Naur binutils-2.19.orig/gas/testsuite/gas/mips/mips.exp binutils-2.19/gas/testsuite/gas/mips/mips.exp
+--- binutils-2.19.orig/gas/testsuite/gas/mips/mips.exp  2008-09-06 01:47:00.000000000 -0700
++++ binutils-2.19/gas/testsuite/gas/mips/mips.exp       2009-01-08 16:16:12.000000000 -0800
+@@ -398,6 +398,9 @@
+     run_dump_test_arches "abs"         [mips_arch_list_matching mips1]
+     run_dump_test_arches "add"         [mips_arch_list_matching mips1]
+     run_dump_test_arches "and"         [mips_arch_list_matching mips1]
++    run_dump_test_arches "mips1-fp"    [mips_arch_list_matching mips1]
++    run_list_test_arches "mips1-fp" "-32 -msoft-float" \
++                                       [mips_arch_list_matching mips1]
+     run_dump_test "break20"
+     run_dump_test "trap20"
+ 
 diff -Naur binutils-2.19.orig/ld/ChangeLog binutils-2.19/ld/ChangeLog
 --- binutils-2.19.orig/ld/ChangeLog     2008-10-09 05:18:31.000000000 -0700
@@ -2399 +2632 @@
               afptr++;
             }
+diff -Naur binutils-2.19.orig/ld/testsuite/ChangeLog binutils-2.19/ld/testsuite/ChangeLog
+--- binutils-2.19.orig/ld/testsuite/ChangeLog   2008-10-02 03:08:04.000000000 -0700
++++ binutils-2.19/ld/testsuite/ChangeLog        2009-01-14 01:13:49.000000000 -0800
+@@ -1,3 +1,8 @@
++2009-01-14  Joseph Myers  <joseph@codesourcery.com>
++
++       * ld-arm/thumb2-bl-undefweak.d, ld-arm/thumb2-bl-undefweak.s: New.
++       * ld-arm/arm-elf.exp: Run thumb2-bl-undefweak test.
++
+ 2008-09-30  Alan Modra  <amodra@bigpond.net.au>
+ 
+        * ld-elf/extract-symbol-1sec.d: Correct section lma.
+diff -Naur binutils-2.19.orig/ld/testsuite/ld-arm/arm-elf.exp binutils-2.19/ld/testsuite/ld-arm/arm-elf.exp
+--- binutils-2.19.orig/ld/testsuite/ld-arm/arm-elf.exp  2008-08-26 04:46:41.000000000 -0700
++++ binutils-2.19/ld/testsuite/ld-arm/arm-elf.exp       2009-01-14 01:13:49.000000000 -0800
+@@ -184,6 +184,7 @@
+ run_dump_test "group-relocs-ldr-bad"
+ run_dump_test "group-relocs-ldrs-bad"
+ run_dump_test "group-relocs-ldc-bad"
++run_dump_test "thumb2-bl-undefweak"
+ run_dump_test "emit-relocs1"
+ 
+ # Exclude non-ARM-EABI targets.
 diff -Naur binutils-2.19.orig/opcodes/ChangeLog binutils-2.19/opcodes/ChangeLog
 --- binutils-2.19.orig/opcodes/ChangeLog        2008-10-02 01:07:19.000000000 -0700