diff options
author | px4dev <px4@purgatory.org> | 2012-12-29 12:57:29 -0800 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2012-12-29 12:57:29 -0800 |
commit | d5da457e292d5c4276774c3da85b3805d3d2bbb7 (patch) | |
tree | b45407dadd2c4a153295daf421c07e15ebf231a7 /nuttx | |
parent | 35c82ff2fc63ab823770f9776e6b6a0f81cd4452 (diff) | |
download | px4-firmware-d5da457e292d5c4276774c3da85b3805d3d2bbb7.tar.gz px4-firmware-d5da457e292d5c4276774c3da85b3805d3d2bbb7.tar.bz2 px4-firmware-d5da457e292d5c4276774c3da85b3805d3d2bbb7.zip |
Fix PX4IO to run C++ static ctors
Diffstat (limited to 'nuttx')
-rwxr-xr-x | nuttx/configs/px4io/common/ld.script | 9 | ||||
-rwxr-xr-x | nuttx/configs/px4io/io/defconfig | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/nuttx/configs/px4io/common/ld.script b/nuttx/configs/px4io/common/ld.script index 17f816acf..69c2f9cb2 100755 --- a/nuttx/configs/px4io/common/ld.script +++ b/nuttx/configs/px4io/common/ld.script @@ -74,6 +74,15 @@ SECTIONS _etext = ABSOLUTE(.); } > flash + /* + * Init functions (static constructors and the like) + */ + .init_section : { + _sinit = ABSOLUTE(.); + KEEP(*(.init_array .init_array.*)) + _einit = ABSOLUTE(.); + } > flash + .ARM.extab : { *(.ARM.extab*) } > flash diff --git a/nuttx/configs/px4io/io/defconfig b/nuttx/configs/px4io/io/defconfig index 794568a58..74433e86c 100755 --- a/nuttx/configs/px4io/io/defconfig +++ b/nuttx/configs/px4io/io/defconfig @@ -345,7 +345,7 @@ CONFIG_DEBUG_INPUT=n CONFIG_MSEC_PER_TICK=1 CONFIG_HAVE_CXX=y -CONFIG_HAVE_CXXINITIALIZE=n +CONFIG_HAVE_CXXINITIALIZE=y CONFIG_MM_REGIONS=1 CONFIG_MM_SMALL=y CONFIG_ARCH_LOWPUTC=y |