提交 b7328313 编写于 作者: B bernard

Add cplusplus initialization for ARMCC; Fix printf issue in _sys_write.

上级 354d4334
/*
* File : crt_init.c
* This file is part of Device File System in RT-Thread RTOS
* COPYRIGHT (C) 2008-2011, RT-Thread Development Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Change Logs:
* Date Author Notes
* 2014-12-03 Bernard Add copyright header.
* 2014-12-29 Bernard Add cplusplus initialization for ARMCC.
*/
#include <rtthread.h> #include <rtthread.h>
#ifdef __CC_ARM
extern void $Super$$__cpp_initialize__aeabi_(void);
/* we need to change the cpp_initialize order */
void $Sub$$__cpp_initialize__aeabi_(void)
{
/* empty */
}
#endif
int cplusplus_system_init(void) int cplusplus_system_init(void)
{ {
#if defined(__GNUC__) && !defined(__CC_ARM) #if defined(__GNUC__) && !defined(__CC_ARM)
...@@ -16,9 +50,11 @@ int cplusplus_system_init(void) ...@@ -16,9 +50,11 @@ int cplusplus_system_init(void)
{ {
(*ctors_func)(); (*ctors_func)();
} }
#elif defined(__CC_ARM)
/* call armcc lib to initialize cplusplus */
$Super$$__cpp_initialize__aeabi_();
#endif #endif
return 0; return 0;
} }
INIT_COMPONENT_EXPORT(cplusplus_system_init); INIT_COMPONENT_EXPORT(cplusplus_system_init);
...@@ -169,7 +169,8 @@ int _sys_write(FILEHANDLE fh, const unsigned char *buf, unsigned len, int mode) ...@@ -169,7 +169,8 @@ int _sys_write(FILEHANDLE fh, const unsigned char *buf, unsigned len, int mode)
console_device = rt_console_get_device(); console_device = rt_console_get_device();
if (console_device != 0) rt_device_write(console_device, 0, buf, len); if (console_device != 0) rt_device_write(console_device, 0, buf, len);
return len;
return 0;
#endif #endif
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册