diff options
| -rw-r--r-- | nuttx/arch/mips/src/mips32/up_copystate.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/mips/src/pic32mx/pic32mx-head.S | 10 | ||||
| -rw-r--r-- | nuttx/configs/pcblogic-pic32mx/ostest/ld.script | 2 | ||||
| -rw-r--r-- | nuttx/configs/pic32-starterkit/ostest/ld.script | 2 | ||||
| -rw-r--r-- | nuttx/configs/sure-pic32mx/ostest/ld.script | 2 | ||||
| -rwxr-xr-x | nuttx/include/cxx/ctime | 1 |
6 files changed, 9 insertions, 10 deletions
diff --git a/nuttx/arch/mips/src/mips32/up_copystate.c b/nuttx/arch/mips/src/mips32/up_copystate.c index 0f5909aa2..1bafffd0e 100644 --- a/nuttx/arch/mips/src/mips32/up_copystate.c +++ b/nuttx/arch/mips/src/mips32/up_copystate.c @@ -70,7 +70,7 @@ void up_copystate(uint32_t *dest, uint32_t *src) { int i; - /* In the Cortex-M3 model, the state is copied from the stack to the TCB, + /* In the MIPS model, the state is copied from the stack to the TCB, * but only a reference is passed to get the state from the TCB. So the * following check avoids copying the TCB save area onto itself: */ diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-head.S b/nuttx/arch/mips/src/pic32mx/pic32mx-head.S index 065598ec6..3a9c6c0e0 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-head.S +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-head.S @@ -434,7 +434,7 @@ _bev_handler: move a0, sp /* Pass register save structure as the parameter 1 */ USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */ la t0, pic32mx_dobev /* Call up_dobev(regs) */ - jalr t0, ra + jalr ra, t0 di /* Disable interrupts */ RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */ EXCPT_EPILOGUE v0 /* Return to the context returned by up_dobev() */ @@ -456,7 +456,7 @@ _int_handler: move a0, sp /* Pass register save structure as the parameter 1 */ USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */ la t0, pic32mx_decodeirq /* Call pic32mx_decodeirq(regs) */ - jalr t0, ra + jalr ra, t0 di /* Disable interrupts */ RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */ EXCPT_EPILOGUE v0 /* Return to the context returned by pic32mx_decodeirq() */ @@ -479,7 +479,7 @@ _nmi_handler: move a0, sp /* Pass register save structure as the parameter 1 */ USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */ la t0, pic32mx_donmi /* Call up_donmi(regs) */ - jalr t0, ra + jalr ra, t0 di /* Disable interrupts */ RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */ EXCPT_EPILOGUE v0 /* Return to the context returned by pic32mx_donmi() */ @@ -505,13 +505,13 @@ __start_nuttx: /* Perform low level initialization */ la t0, pic32mx_lowinit - jalr t0, ra + jalr ra, t0 nop /* Call os_start */ la t0, os_start - jalr t0, ra + jalr ra, t0 nop /* Just in case main returns, go into an infinite loop */ diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/ld.script b/nuttx/configs/pcblogic-pic32mx/ostest/ld.script index 25df40f0a..79bd3783b 100644 --- a/nuttx/configs/pcblogic-pic32mx/ostest/ld.script +++ b/nuttx/configs/pcblogic-pic32mx/ostest/ld.script @@ -191,7 +191,7 @@ SECTIONS */ /* This causes failures if there are no RAM functions - .ramfunc /* ALIGN(2K) */ : + .ramfunc : { _sramfunc = ABSOLUTE(.); *(.ramfunc .ramfunc.*) diff --git a/nuttx/configs/pic32-starterkit/ostest/ld.script b/nuttx/configs/pic32-starterkit/ostest/ld.script index 9bdd45175..4f6b00cd4 100644 --- a/nuttx/configs/pic32-starterkit/ostest/ld.script +++ b/nuttx/configs/pic32-starterkit/ostest/ld.script @@ -191,7 +191,7 @@ SECTIONS */ /* This causes failures if there are no RAM functions - .ramfunc /* ALIGN(2K) */ : + .ramfunc : { _sramfunc = ABSOLUTE(.); *(.ramfunc .ramfunc.*) diff --git a/nuttx/configs/sure-pic32mx/ostest/ld.script b/nuttx/configs/sure-pic32mx/ostest/ld.script index 2da162586..e15af9f6c 100644 --- a/nuttx/configs/sure-pic32mx/ostest/ld.script +++ b/nuttx/configs/sure-pic32mx/ostest/ld.script @@ -191,7 +191,7 @@ SECTIONS */ /* This causes failures if there are no RAM functions - .ramfunc /* ALIGN(2K) */ : + .ramfunc : { _sramfunc = ABSOLUTE(.); *(.ramfunc .ramfunc.*) diff --git a/nuttx/include/cxx/ctime b/nuttx/include/cxx/ctime index f9ebaa937..f1915a452 100755 --- a/nuttx/include/cxx/ctime +++ b/nuttx/include/cxx/ctime @@ -59,7 +59,6 @@ namespace std using ::sigevent; using ::clock_settime; using ::clock_gettime; - using ::lock_getres; using ::mktime; using ::gmtime_r; using ::timer_create; |