From 28d7af216e317a11c3bb4f32e2298ab3ba4036d9 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Thu, 17 Dec 2015 16:22:52 -0500 Subject: 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. --- libgloss/ChangeLog | 5 +++++ libgloss/msp430/cio.S | 33 +++++++++++++++++++++++++++++++++ libgloss/msp430/cio.c | 26 -------------------------- 3 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 libgloss/msp430/cio.S delete mode 100644 libgloss/msp430/cio.c 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 + + * msp430/cio.c: Remove, replace with... + * msp430/cio.S: New, this. + 2015-12-16 Kevin Buettner * rl78/write.c (_write): Don't output CR when LF is encountered. diff --git a/libgloss/msp430/cio.S b/libgloss/msp430/cio.S new file mode 100644 index 000000000..e7a268dbb --- /dev/null +++ b/libgloss/msp430/cio.S @@ -0,0 +1,33 @@ +/* + +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 +License. This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY expressed or implied, including the implied warranties +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. A copy of this license +is available at http://www.opensource.org/licenses. Any Red Hat trademarks that +are incorporated in the source code or documentation are not subject to the BSD +License and may only be used or replicated with the express permission of +Red Hat, Inc. + +*/ +#include "memmodel.h" + + .data + + .global __CIOBUF__ +__CIOBUF__: + .global _CIOBUF_ +_CIOBUF_: + .space 75 + + .text + + .global _libgloss_cio_hook +_libgloss_cio_hook: + .global C$$IO$$ +C$$IO$$: + nop + ret_ diff --git a/libgloss/msp430/cio.c b/libgloss/msp430/cio.c deleted file mode 100644 index d5e3e7430..000000000 --- a/libgloss/msp430/cio.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - -Copyright (c) 2013 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 -License. This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY expressed or implied, including the implied warranties -of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. A copy of this license -is available at http://www.opensource.org/licenses. Any Red Hat trademarks that -are incorporated in the source code or documentation are not subject to the BSD -License and may only be used or replicated with the express permission of -Red Hat, Inc. - -*/ - -#include "cio.h" - -__CIOBUF__TYPE__ __CIOBUF__; - -void -_libgloss_cio_hook (void) -{ - __asm__ __volatile__ (" .global C$$IO$$"); - __asm__ __volatile__ ("C$$IO$$: nop"); -} -- cgit v1.2.3