From a863c500ccbc6bc222ccd7a6424712b6eafb9215 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 18 May 1998 14:41:15 +0000
Subject: Updates from Pedro Romano.

---
 c/src/lib/libbsp/i386/pc386/startup/linkcmds | 16 ++++++++++------
 c/src/lib/libbsp/m68k/mvme162/include/bsp.h  |  8 ++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'c/src/lib/libbsp')

diff --git a/c/src/lib/libbsp/i386/pc386/startup/linkcmds b/c/src/lib/libbsp/i386/pc386/startup/linkcmds
index 1e0dcc57ff..f66952b04c 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/linkcmds
+++ b/c/src/lib/libbsp/i386/pc386/startup/linkcmds
@@ -41,9 +41,11 @@ SECTIONS
     *(.text)
     . = ALIGN (16);
 
-    *(.eh_fram)
+    *(.eh_frame)
     . = ALIGN (16);
 
+    *(.gnu.linkonce.t*)
+
     /*
      * C++ constructors
      */
@@ -57,20 +59,22 @@ SECTIONS
     *(.dtors)
     LONG(0)
     __DTOR_END__ = .;
-    _etext = ALIGN( 0x10 ) ;
-  }
-  .rodata ADDR( .text ) + SIZEOF( .text ):
-  {
+
     _rodata_start = . ;
     *(.rodata)
     _erodata = ALIGN( 0x10 ) ;
+
+    _etext = ALIGN( 0x10 ) ;
   }
-  .data ADDR( .rodata ) + SIZEOF( .rodata ):
+  .data ADDR( .text ) + SIZEOF( .text ):
   {
     _data_start = . ;
     *(.data)
+    *(.gnu.linkonce.d*)
+    *(.gcc_except_table)
     _edata = ALIGN( 0x10 ) ;
   }
+
   .bss ADDR( .data ) + SIZEOF( .data ):
   {
     _bss_start = . ;
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
index b362a2b94c..b28aa4c73f 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
@@ -54,7 +54,7 @@ extern "C" {
  * ----------------------------------
  */
 
-typedef volatile struct lcsr_regs {
+typedef volatile struct {
   unsigned long     slave_adr[2];
   unsigned long     slave_trn[2];
   unsigned long     slave_ctl;
@@ -86,7 +86,7 @@ typedef volatile struct lcsr_regs {
 
 #define lcsr      ((lcsr_regs * const) 0xFFF40000)
 
-typedef volatile struct mcchip_regs {
+typedef volatile struct {
 
   unsigned char     chipID;
   unsigned char     chipREV;
@@ -184,7 +184,7 @@ void char_put(int port, char ch);
 #define RX_DATA_AVAILABLE 0x01
 #define SCC_VECTOR        0x40
 
-typedef volatile struct scc_regs {
+typedef volatile struct {
   unsigned char pad1;
   volatile unsigned char          csr;
   unsigned char pad2;
@@ -209,7 +209,7 @@ typedef volatile struct scc_regs {
  * IO space and respond to address modifier codes $29 and $2D.
  * On FORCE CPU use address gcsr_vme and device /dev/vme16d32.
 */
-typedef volatile struct gcsr_regs {
+typedef volatile struct {
   unsigned char       chip_revision;
   unsigned char       chip_id;
   unsigned char       lmsig;
-- 
cgit v1.2.3