From e8e357cc1df4c708169008420403c7114751b7b8 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 11 Mar 2015 10:25:51 -0600
Subject: [PATCH] PIC32MZ: Fixes from Kristopher Tate

---
 arch/mips/src/pic32mz/pic32mz-head.S               | 4 ++--
 arch/mips/src/pic32mz/pic32mz-irq.c                | 6 +++---
 configs/pic32mz-starterkit/scripts/mips-release.ld | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/mips/src/pic32mz/pic32mz-head.S b/arch/mips/src/pic32mz/pic32mz-head.S
index 1a100d0cfb1..c5674c44b0e 100644
--- a/arch/mips/src/pic32mz/pic32mz-head.S
+++ b/arch/mips/src/pic32mz/pic32mz-head.S
@@ -112,7 +112,7 @@
 
 	/* Exported symbols */
 
-	.globl	__reset
+	.global	__reset
 	.global __start
 	.global halt
 	.global	devcfg
@@ -371,7 +371,7 @@ __start:
 
 	la		sp, PIC32MZ_STACK_TOP
 
-	/* Initialize the globl pointer (gp).  _gp is initialized by the linker
+	/* Initialize the global pointer (gp).  _gp is initialized by the linker
 	 * script to point to the "middle" of the small variables region.
 	 */
 
diff --git a/arch/mips/src/pic32mz/pic32mz-irq.c b/arch/mips/src/pic32mz/pic32mz-irq.c
index 71fda0c4b71..82283976f6f 100644
--- a/arch/mips/src/pic32mz/pic32mz-irq.c
+++ b/arch/mips/src/pic32mz/pic32mz-irq.c
@@ -129,7 +129,7 @@ static uintptr_t pic32mz_iec(int irq)
 {
   if ((unsigned)irq < NR_IRQS)
     {
-      return PIC32MZ_INT_IEC_OFFSET(irq);
+      return PIC32MZ_INT_IEC(irq);
     }
 
   return 0;
@@ -143,7 +143,7 @@ static uintptr_t pic32mz_iecset(int irq)
 {
   if ((unsigned)irq < NR_IRQS)
     {
-      return PIC32MZ_INT_IECSET_OFFSET(irq);
+      return PIC32MZ_INT_IECSET(irq);
     }
 
   return 0;
@@ -157,7 +157,7 @@ static uintptr_t pic32mz_iecclr(int irq)
 {
   if ((unsigned)irq < NR_IRQS)
     {
-      return PIC32MZ_INT_IECCLR_OFFSET(irq);
+      return PIC32MZ_INT_IECCLR(irq);
     }
 
   return 0;
diff --git a/configs/pic32mz-starterkit/scripts/mips-release.ld b/configs/pic32mz-starterkit/scripts/mips-release.ld
index e553f033ea8..c70b5a2edc1 100644
--- a/configs/pic32mz-starterkit/scripts/mips-release.ld
+++ b/configs/pic32mz-starterkit/scripts/mips-release.ld
@@ -100,10 +100,10 @@ MEMORY
 	 * for use by MPLABX and 128 for DSP register storage.
 	 */
 
-	kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 512K - 640
+	kseg1_datamem (rw!x) : ORIGIN = 0xa0000200, LENGTH = 512K - 640
 }
 
-OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_FORMAT("elf32-tradlittlemips")
 OUTPUT_ARCH(mips)
 ENTRY(__start)
 
@@ -217,7 +217,7 @@ SECTIONS
 
 	_data_loaddr = LOADADDR(.data);
 
-	.eh_frame_hdr : { *(.eh_frame_hdr) }
+	.eh_frame_hdr : { *(.eh_frame_hdr) *(.eh_frame_entry .eh_frame_entry.*) }
 	.eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) }
 
 	/* RAM functions are positioned at the beginning of RAM so that