Straighten out issues about who calls C++ initializers with CXXTEST or HELLOXX are built as NSH applications; Add an ofstream test to CXXTEST suggested by Michael; Update many defconfig fiels to that they set configurations to handle C++ constructors just as before these configuration changes
This commit is contained in:
parent
59e1d1c6cd
commit
add0a67995
@ -5019,4 +5019,9 @@
|
||||
controlling SPI-related discrete inputs and outputs. Taken from
|
||||
work by Alan Carvalho de Assis (2013-6-20).
|
||||
* arch/arm/src/kl/kl_dumpgpio.c: Now compiles (2013-6-20).
|
||||
|
||||
* configs/: Several defconfig files were changed that had
|
||||
CONFIG_HAVE_CXXINITIALIZE=y. Because of recent changes to
|
||||
apps/examples, these configurations may need to have
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y so that they behave as they did
|
||||
before, i.e., so that C++ initializers will be called when NSH starts
|
||||
up (2013-6-21).
|
||||
|
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* arch/arm/src/kl/kl_start.c
|
||||
* arch/arm/src/kl/kl_spi.c
|
||||
*
|
||||
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
|
@ -585,6 +585,7 @@ CONFIG_NX_KBD=y
|
||||
# Framed Window Borders
|
||||
#
|
||||
CONFIG_NXTK_BORDERWIDTH=3
|
||||
# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set
|
||||
CONFIG_NXTK_BORDERCOLOR1=0x8410
|
||||
CONFIG_NXTK_BORDERCOLOR2=0x4208
|
||||
CONFIG_NXTK_BORDERCOLOR3=0xc618
|
||||
@ -745,6 +746,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
|
||||
# CONFIG_EXAMPLES_MOUNT is not set
|
||||
# CONFIG_EXAMPLES_MTDPART is not set
|
||||
CONFIG_EXAMPLES_NSH=y
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
# CONFIG_EXAMPLES_NULL is not set
|
||||
CONFIG_EXAMPLES_NX=y
|
||||
CONFIG_EXAMPLES_NX_VPLANE=0
|
||||
|
@ -591,6 +591,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
|
||||
# CONFIG_EXAMPLES_MOUNT is not set
|
||||
# CONFIG_EXAMPLES_MTDPART is not set
|
||||
CONFIG_EXAMPLES_NSH=y
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
# CONFIG_EXAMPLES_NULL is not set
|
||||
# CONFIG_EXAMPLES_NX is not set
|
||||
# CONFIG_EXAMPLES_NXCONSOLE is not set
|
||||
|
@ -639,6 +639,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
|
||||
# CONFIG_EXAMPLES_MOUNT is not set
|
||||
# CONFIG_EXAMPLES_MTDPART is not set
|
||||
CONFIG_EXAMPLES_NSH=y
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
# CONFIG_EXAMPLES_NULL is not set
|
||||
# CONFIG_EXAMPLES_NX is not set
|
||||
# CONFIG_EXAMPLES_NXCONSOLE is not set
|
||||
|
@ -334,6 +334,10 @@ CONFIG_MMCSD=y
|
||||
CONFIG_MMCSD_SPI=y
|
||||
CONFIG_MTD=y
|
||||
|
||||
#
|
||||
# Settings for examplex/cxxtest
|
||||
CONFIG_EXAMPLES_CXXTEST_CXXINITIALIZE=y
|
||||
|
||||
#
|
||||
# Settings for examples/uip
|
||||
CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80a02
|
||||
|
@ -326,6 +326,10 @@ CONFIG_NET_BROADCAST=n
|
||||
CONFIG_NET_DHCP_LIGHT=n
|
||||
CONFIG_NET_RESOLV_ENTRIES=4
|
||||
|
||||
#
|
||||
# Settings for examplex/helloxx
|
||||
CONFIG_EXAMPLES_HELLOXX_CXXINITIALIZE=y
|
||||
|
||||
#
|
||||
# Settings for examples/uip
|
||||
CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80a02
|
||||
|
@ -498,6 +498,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
|
||||
# CONFIG_EXAMPLES_MOUNT is not set
|
||||
# CONFIG_EXAMPLES_NRF24L01TERM is not set
|
||||
CONFIG_EXAMPLES_NSH=y
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
# CONFIG_EXAMPLES_NULL is not set
|
||||
# CONFIG_EXAMPLES_NX is not set
|
||||
# CONFIG_EXAMPLES_NXCONSOLE is not set
|
||||
|
@ -481,6 +481,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
|
||||
# CONFIG_EXAMPLES_MOUNT is not set
|
||||
# CONFIG_EXAMPLES_NRF24L01TERM is not set
|
||||
CONFIG_EXAMPLES_NSH=y
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
# CONFIG_EXAMPLES_NULL is not set
|
||||
# CONFIG_EXAMPLES_NX is not set
|
||||
# CONFIG_EXAMPLES_NXCONSOLE is not set
|
||||
|
@ -706,6 +706,11 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
|
||||
CONFIG_NSH_MMCSDSLOTNO=0
|
||||
CONFIG_NSH_MMCSDMINOR=0
|
||||
|
||||
#
|
||||
# Settings for examples/nsh
|
||||
#
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
|
||||
#
|
||||
# I2C tool settings
|
||||
#
|
||||
|
@ -693,6 +693,11 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
|
||||
CONFIG_NSH_MMCSDSLOTNO=0
|
||||
CONFIG_NSH_MMCSDMINOR=0
|
||||
|
||||
#
|
||||
# Settings for examples/nsh
|
||||
#
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
|
||||
#
|
||||
# I2C tool settings
|
||||
#
|
||||
|
@ -706,6 +706,11 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
|
||||
CONFIG_NSH_MMCSDSLOTNO=0
|
||||
CONFIG_NSH_MMCSDMINOR=0
|
||||
|
||||
#
|
||||
# Settings for examples/nsh
|
||||
#
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
|
||||
#
|
||||
# I2C tool settings
|
||||
#
|
||||
|
@ -653,6 +653,11 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
|
||||
CONFIG_NSH_MMCSDSLOTNO=0
|
||||
CONFIG_NSH_MMCSDMINOR=0
|
||||
|
||||
#
|
||||
# Settings for examples/nsh
|
||||
#
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
|
||||
#
|
||||
# I2C tool settings
|
||||
#
|
||||
|
@ -548,6 +548,7 @@ CONFIG_EXAMPLES_CDCACM=y
|
||||
# CONFIG_EXAMPLES_MOUNT is not set
|
||||
# CONFIG_EXAMPLES_MODBUS is not set
|
||||
CONFIG_EXAMPLES_NSH=y
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
# CONFIG_EXAMPLES_NULL is not set
|
||||
# CONFIG_EXAMPLES_NX is not set
|
||||
# CONFIG_EXAMPLES_NXCONSOLE is not set
|
||||
|
@ -613,6 +613,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
|
||||
# CONFIG_EXAMPLES_MODBUS is not set
|
||||
# CONFIG_EXAMPLES_MOUNT is not set
|
||||
CONFIG_EXAMPLES_NSH=y
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
# CONFIG_EXAMPLES_NULL is not set
|
||||
# CONFIG_EXAMPLES_NX is not set
|
||||
# CONFIG_EXAMPLES_NXCONSOLE is not set
|
||||
|
@ -436,6 +436,7 @@ CONFIG_UCLIBCXX_HAVE_LIBSUPCXX=y
|
||||
# CONFIG_EXAMPLES_CDCACM is not set
|
||||
# CONFIG_EXAMPLES_COMPOSITE is not set
|
||||
CONFIG_EXAMPLES_CXXTEST=y
|
||||
CONFIG_EXAMPLES_CXXTEST_CXXINITIALIZE=y
|
||||
# CONFIG_EXAMPLES_DHCPD is not set
|
||||
# CONFIG_EXAMPLES_ELF is not set
|
||||
# CONFIG_EXAMPLES_FTPC is not set
|
||||
|
@ -547,6 +547,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
|
||||
# CONFIG_EXAMPLES_MOUNT is not set
|
||||
# CONFIG_EXAMPLES_MODBUS is not set
|
||||
CONFIG_EXAMPLES_NSH=y
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
# CONFIG_EXAMPLES_NULL is not set
|
||||
# CONFIG_EXAMPLES_NX is not set
|
||||
# CONFIG_EXAMPLES_NXCONSOLE is not set
|
||||
|
@ -665,6 +665,11 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
|
||||
CONFIG_NSH_MMCSDSLOTNO=0
|
||||
CONFIG_NSH_MMCSDMINOR=0
|
||||
|
||||
#
|
||||
# Settings for examples/nsh
|
||||
#
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
|
||||
#
|
||||
# Settings for examples/usbserial
|
||||
#
|
||||
|
@ -561,6 +561,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
|
||||
# CONFIG_EXAMPLES_MOUNT is not set
|
||||
# CONFIG_EXAMPLES_MODBUS is not set
|
||||
CONFIG_EXAMPLES_NSH=y
|
||||
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
|
||||
# CONFIG_EXAMPLES_NULL is not set
|
||||
# CONFIG_EXAMPLES_NX is not set
|
||||
# CONFIG_EXAMPLES_NXCONSOLE is not set
|
||||
|
Loading…
Reference in New Issue
Block a user