diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index c3b708501..294cab906 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,14 @@
+2005-07-18  Richard Sandiford  <richard@codesourcery.com>
+
+	* mips/array.ld (.sdata): Include .gnu.linkonce.s.*, not
+	.gnu.linkonce.s*.
+	(.sbss): Include .sbss.* and .gnu.linkonce.sb.*.
+	* mips/cfe.ld, mips/ddb-kseg0.ld, mips/ddb.ld, mips/dve.ld,
+	* mips/idt32.ld, mips/idt64.ld, mips/idtecoff.ld, mips/idt.ld,
+	* mips/jmr3904app-java.ld, mips/jmr3904app.ld,
+	* mips/jmr3904dram-java.ld, mips/jmr3904dram.ld,
+	* mips/lsi.ld, mips/nullmon.ld, mips/pmon.ld: As for mips/array.ld.
+
 2005-07-18  Shaun Jackman  <sjackman@gmail.com>
 
 	* libgloss/arm/libcfunc.c (abort): Call _exit instead of the RDI swi.
diff --git a/libgloss/mips/array.ld b/libgloss/mips/array.ld
index 6856842ce..0652c6ee4 100644
--- a/libgloss/mips/array.ld
+++ b/libgloss/mips/array.ld
@@ -158,13 +158,15 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
    edata  =  .;
    _edata  =  .;
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/cfe.ld b/libgloss/mips/cfe.ld
index cfbecdc5e..116f54f16 100644
--- a/libgloss/mips/cfe.ld
+++ b/libgloss/mips/cfe.ld
@@ -115,7 +115,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
    PROVIDE (edata  =  .);
@@ -123,6 +123,8 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/ddb-kseg0.ld b/libgloss/mips/ddb-kseg0.ld
index d9fec5a20..4dd7d70b6 100644
--- a/libgloss/mips/ddb-kseg0.ld
+++ b/libgloss/mips/ddb-kseg0.ld
@@ -109,7 +109,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -117,6 +117,8 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/ddb.ld b/libgloss/mips/ddb.ld
index 4770a38fe..8c7fb2c2d 100644
--- a/libgloss/mips/ddb.ld
+++ b/libgloss/mips/ddb.ld
@@ -109,7 +109,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -117,6 +117,8 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/dve.ld b/libgloss/mips/dve.ld
index 3496fe8ca..3324f97aa 100644
--- a/libgloss/mips/dve.ld
+++ b/libgloss/mips/dve.ld
@@ -110,7 +110,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -118,6 +118,8 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/idt.ld b/libgloss/mips/idt.ld
index f74481e17..39778a053 100644
--- a/libgloss/mips/idt.ld
+++ b/libgloss/mips/idt.ld
@@ -116,7 +116,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
    PROVIDE (edata  =  .);
@@ -124,6 +124,8 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/idt32.ld b/libgloss/mips/idt32.ld
index b7974c14c..01426c02e 100644
--- a/libgloss/mips/idt32.ld
+++ b/libgloss/mips/idt32.ld
@@ -118,7 +118,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
   PROVIDE (edata  =  .);
@@ -126,6 +126,8 @@ SECTIONS
   _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/idt64.ld b/libgloss/mips/idt64.ld
index 0b25ecf1b..119976f6f 100644
--- a/libgloss/mips/idt64.ld
+++ b/libgloss/mips/idt64.ld
@@ -117,7 +117,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
   PROVIDE (edata  =  .);
@@ -125,6 +125,8 @@ SECTIONS
   _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/idtecoff.ld b/libgloss/mips/idtecoff.ld
index 11894383f..118570c5a 100644
--- a/libgloss/mips/idtecoff.ld
+++ b/libgloss/mips/idtecoff.ld
@@ -75,7 +75,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -83,6 +83,8 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/jmr3904app-java.ld b/libgloss/mips/jmr3904app-java.ld
index c35a552e9..e1a828e3e 100644
--- a/libgloss/mips/jmr3904app-java.ld
+++ b/libgloss/mips/jmr3904app-java.ld
@@ -75,7 +75,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -83,6 +83,8 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/jmr3904app.ld b/libgloss/mips/jmr3904app.ld
index 24b0aad35..3a7c37ed2 100644
--- a/libgloss/mips/jmr3904app.ld
+++ b/libgloss/mips/jmr3904app.ld
@@ -108,7 +108,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -116,6 +116,8 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/jmr3904dram-java.ld b/libgloss/mips/jmr3904dram-java.ld
index 34fb1fda5..f748aef86 100644
--- a/libgloss/mips/jmr3904dram-java.ld
+++ b/libgloss/mips/jmr3904dram-java.ld
@@ -77,7 +77,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -85,6 +85,8 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/jmr3904dram.ld b/libgloss/mips/jmr3904dram.ld
index 88e1da13b..47a3475d1 100644
--- a/libgloss/mips/jmr3904dram.ld
+++ b/libgloss/mips/jmr3904dram.ld
@@ -74,7 +74,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -82,6 +82,8 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/lsi.ld b/libgloss/mips/lsi.ld
index 227eb8564..20d0a3967 100644
--- a/libgloss/mips/lsi.ld
+++ b/libgloss/mips/lsi.ld
@@ -109,13 +109,15 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
    edata  =  .;
    _edata  =  .;
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/nullmon.ld b/libgloss/mips/nullmon.ld
index 80dec6638..7b595ff61 100644
--- a/libgloss/mips/nullmon.ld
+++ b/libgloss/mips/nullmon.ld
@@ -110,7 +110,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -118,6 +118,8 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
diff --git a/libgloss/mips/pmon.ld b/libgloss/mips/pmon.ld
index 894f539ea..99b099c19 100644
--- a/libgloss/mips/pmon.ld
+++ b/libgloss/mips/pmon.ld
@@ -110,7 +110,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s*)
+    *(.gnu.linkonce.s.*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -118,6 +118,8 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {