diff options
| author | DJ Delorie <dj@redhat.com> | 2015-12-18 00:22:52 +0300 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2015-12-18 00:22:52 +0300 |
| commit | 28d7af216e317a11c3bb4f32e2298ab3ba4036d9 (patch) | |
| tree | 9a47785754ee7ea4b8ded05241ba3b00949eb750 | |
| parent | 725532a3b2019ff7804a44b4cd97242e60a919b1 (diff) | |
Update CIO hooks to be more flexible.
Replace the one hook we had with two to avoid underscore issues.
* msp430/cio.c: Remove, replace with...
* msp430/cio.S: New, this.
| -rw-r--r-- | libgloss/ChangeLog | 5 | ||||
| -rw-r--r-- | libgloss/msp430/cio.S (renamed from libgloss/msp430/cio.c) | 25 |
2 files changed, 21 insertions, 9 deletions
diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index fbab75836..e247cbc03 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,8 @@ +2015-12-17 DJ Delorie <dj@redhat.com> + + * msp430/cio.c: Remove, replace with... + * msp430/cio.S: New, this. + 2015-12-16 Kevin Buettner <kevinb@redhat.com> * rl78/write.c (_write): Don't output CR when LF is encountered. diff --git a/libgloss/msp430/cio.c b/libgloss/msp430/cio.S index d5e3e7430..e7a268dbb 100644 --- a/libgloss/msp430/cio.c +++ b/libgloss/msp430/cio.S @@ -1,6 +1,6 @@ /* -Copyright (c) 2013 Red Hat, Inc. All rights reserved. +Copyright (c) 2014 Red Hat, Inc. All rights reserved. This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the BSD @@ -13,14 +13,21 @@ License and may only be used or replicated with the express permission of Red Hat, Inc. */ +#include "memmodel.h" -#include "cio.h" + .data -__CIOBUF__TYPE__ __CIOBUF__; + .global __CIOBUF__ +__CIOBUF__: + .global _CIOBUF_ +_CIOBUF_: + .space 75 -void -_libgloss_cio_hook (void) -{ - __asm__ __volatile__ (" .global C$$IO$$"); - __asm__ __volatile__ ("C$$IO$$: nop"); -} + .text + + .global _libgloss_cio_hook +_libgloss_cio_hook: + .global C$$IO$$ +C$$IO$$: + nop + ret_ |