Remove support for old v1 & v2 style GNU build notes.

[thirdparty/binutils-gdb.git] / binutils / objcopy.c

diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 90ae0bd46bd0ff421fdbaa55c35fa92d5e8783c7..041aceaeefe89defdde746ddb86f97bf1ef3b365 100644 (file)
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -2246,23 +2246,8 @@ merge_gnu_build_notes (bfd *          abfd,
          break;
 
        case 8:
-         if (! is_64bit (abfd))
-           {
-             start = bfd_get_32 (abfd, pnote->note.descdata);
-             end = bfd_get_32 (abfd, pnote->note.descdata + 4);
-           }
-         else
-           {
-             start = bfd_get_64 (abfd, pnote->note.descdata);
-             /* FIXME: For version 1 and 2 notes we should try to
-                calculate the end address by finding a symbol whose
-                value is START, and then adding in its size.
-
-                For now though, since v1 and v2 was not intended to
-                handle gaps, we chose an artificially large end
-                address.  */
-             end = (bfd_vma) -1;
-           }
+         start = bfd_get_32 (abfd, pnote->note.descdata);
+         end = bfd_get_32 (abfd, pnote->note.descdata + 4);
          break;
 
        case 16: