source: rtems/contrib/crossrpms/patches/binutils-2.17-rtems-20060711.diff @ 9807f04

bfd/cpu-m68k.c

@@ -202 +202 @@
   if (a->mach <= bfd_mach_m68060 && b->mach <= bfd_mach_m68060)
     /* Merge m68k machine. */
     return a->mach > b->mach ? a : b;
+  else if (a->mach == bfd_mach_cpu32 && b->mach == bfd_mach_cpu32)
+    /* CPU32 is compatible with itself. */
+    return a;
   else if (a->mach >= bfd_mach_mcf_isa_a_nodiv
            && b->mach >= bfd_mach_mcf_isa_a_nodiv)
     {

bfd/version.h

@@ -1 @@
-#define BFD_VERSION_DATE 20060623
+#define BFD_VERSION_DATE 20060711
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING @bfd_version_string@

ld/ChangeLog

@@ +1 @@
+2006-07-04  Daniel Jacobowitz  <dan@codesourcery.com>
+
+        Backport:
+        2006-05-19  Alan Modra  <amodra@bigpond.net.au>
+        * ldlang.c (lang_size_sections_1): Don't check mem regions for
+        os->ignored sections.
+
 2006-06-12  Fred Fish  <fnf@specifix.com>
 
         * emulparams/elf32bmip.sh (OTHER_SECTIONS): Keep the

binutils-2.17

@@ -4207 +4207 @@
                     /* If a loadable section is using the default memory
                        region, and some non default memory regions were
                        defined, issue an error message.  */
-                    if (!IGNORE_SECTION (os->bfd_section)
+                    if (!os->ignored
+                        && !IGNORE_SECTION (os->bfd_section)
                         && ! link_info.relocatable
                         && check_regions
                         && strcmp (os->region->name,

ld/testsuite/ChangeLog

@@ +1 @@
+2006-07-04  Daniel Jacobowitz  <dan@codesourcery.com>
+
+        Backport:
+        2006-05-19  Alan Modra  <amodra@bigpond.net.au>
+        * ld-scripts/empty-orphan.d: Update again.
+
+        * ld-scripts/empty-orphan.t: Discard .reginfo.
+        * ld-scripts/empty-orphan.d: Update.
+
 2006-06-12  Daniel Jacobowitz  <dan@codesourcery.com>
 
         Backport:

ld/testsuite/ld-m68k/m68k.exp

@@ -53 +53 @@
 run_dump_test "merge-error-1e"
 run_dump_test "merge-ok-1a"
 run_dump_test "merge-ok-1b"
+run_dump_test "merge-ok-1c"

ld/testsuite/ld-m68k/merge-ok-1c.d

@@ +1 @@
+#source: merge-error-1a.s -march=cpu32
+#source: merge-error-1b.s -march=cpu32
+#ld: -r
+#objdump: -p
+#...
+private flags = 810000: \[cpu32\]

ld/testsuite/ld-scripts/empty-orphan.d

@@ -1 +1 @@
 #source: empty-orphan.s
 #ld: -T empty-orphan.t
-#error: no memory region specified for loadable section
+#readelf: -l --wide
+#...
+ +LOAD +[x0-9a-f]+ [x0]+70000000 [x0]+70000000 [x0]+(2|4|8|10|20|40|80) .*
+#pass

ld/testsuite/ld-scripts/empty-orphan.t

@@ -17 +17 @@
    .text : { *(.text) } > text_mem : text_phdr
    .data : { *(.data) } > data_mem : data_phdr
    .bss : { *(.bss) } > data_mem : data_phdr
+   /DISCARD/ : { *(.reginfo) }
    /* .orphan_data is an orphan */
 }