From 35b4db0f3040b76139e03af1e888cb7d04f197cf Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Wed, 3 Jan 2007 16:47:53 +0000 Subject: [PATCH] 2007-01-03 Kazu Hirata Merge from newlib-csl-20060320-branch: 2006-12-22 Nathan Sidwell * m68k/cf-crt0.S (__start): Adjust semihosting. --- libgloss/ChangeLog | 7 +++++++ libgloss/m68k/cf-crt0.S | 13 +++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index 7f02bb7ff..5b5a85f80 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,10 @@ +2007-01-03 Kazu Hirata + + Merge from newlib-csl-20060320-branch: + 2006-12-22 Nathan Sidwell + + * m68k/cf-crt0.S (__start): Adjust semihosting. + 2007-01-02 Kazu Hirata Merge from newlib-csl-20060320-branch: diff --git a/libgloss/m68k/cf-crt0.S b/libgloss/m68k/cf-crt0.S index 9a73ce19c..51a6aa700 100644 --- a/libgloss/m68k/cf-crt0.S +++ b/libgloss/m68k/cf-crt0.S @@ -29,17 +29,14 @@ __start: #if HOSTED /* INIT_SIM syscall. Allows changing sp & d1. */ move.l IMM(1),d0 - .align 4 - /* The halt sequence must be 'nop; halt' and aligned to a 4 byte - boundary. */ + /* The semihosting sequence is 'nop; halt;sentinel' aligned to + a 4 byte boundary. The sentinel is an ill formed instruction + (movec %sp,0). The debugger will adjust the pc, so it is never + executed. */ + .balignw 4,0x4e71 nop halt - - /* This sentinel instruction value must be immediately after - the halt instruction. The debugger will adjust the pc, so - that it is never executed. This instruction is - 'movec %sp,0'. */ .long 0x4e7bf000 #endif move.l d1,sp@-