summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-05 13:30:00 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-05 13:30:00 +0000
commit6dfde6fdb4a7d8cb1fc8a66d4dbd7056699f404e (patch)
treed162536cb472c6dcdda5b5a09dd151ee06942b6c
parentda1ae022722331326cbe3880b355ea9166e50de4 (diff)
downloadnuttx-6dfde6fdb4a7d8cb1fc8a66d4dbd7056699f404e.tar.gz
nuttx-6dfde6fdb4a7d8cb1fc8a66d4dbd7056699f404e.tar.bz2
nuttx-6dfde6fdb4a7d8cb1fc8a66d4dbd7056699f404e.zip
uClibc++ exceptions are working
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5312 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--nuttx/configs/sim/README.txt8
-rw-r--r--nuttx/configs/stm32f4discovery/README.txt3
-rw-r--r--nuttx/configs/stm32f4discovery/cxxtest/defconfig4
3 files changed, 9 insertions, 6 deletions
diff --git a/nuttx/configs/sim/README.txt b/nuttx/configs/sim/README.txt
index 39ace5495..c8bcb2cd7 100644
--- a/nuttx/configs/sim/README.txt
+++ b/nuttx/configs/sim/README.txt
@@ -215,9 +215,11 @@ cxxtest
b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process.
- 3. At present (2012/11/02), this example builds only with exceptions
- disabled (CONFIG_UCLIBCXX_EXCEPTIONS=n). And even then, it will
- not run.
+ 3. At present (2012/11/02), exceptions are disabled in this example
+ CONFIG_UCLIBCXX_EXCEPTIONS=n). It is probably not necessary to
+ disable exceptions.
+
+ 4. Unfortunately, this example will not run now.
The reason that the example will not run on the simulator has
to do with when static constructors are enabled: In the simulator
diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt
index 02fdbb07a..db423d65b 100644
--- a/nuttx/configs/stm32f4discovery/README.txt
+++ b/nuttx/configs/stm32f4discovery/README.txt
@@ -1035,8 +1035,7 @@ Where <subdir> is one of the following:
arm-none-eabi-ar.exe rcs libsupc++.a vterminate.o
- 4. At present (2012/11/02), this example builds only with exceptions
- disabled (CONFIG_UCLIBCXX_EXCEPTIONS=n).
+ 4. Exceptions are enabled and workking (CONFIG_UCLIBCXX_EXCEPTIONS=y)
elf:
---
diff --git a/nuttx/configs/stm32f4discovery/cxxtest/defconfig b/nuttx/configs/stm32f4discovery/cxxtest/defconfig
index 85b04c0ff..6648d3b13 100644
--- a/nuttx/configs/stm32f4discovery/cxxtest/defconfig
+++ b/nuttx/configs/stm32f4discovery/cxxtest/defconfig
@@ -73,6 +73,8 @@ CONFIG_ARCH_CHIP_STM32=y
CONFIG_ARCH_CORTEXM4=y
CONFIG_ARCH_FAMILY="armv7-m"
CONFIG_ARCH_CHIP="stm32"
+CONFIG_ARCH_HAVE_CMNVECTOR=y
+# CONFIG_ARMV7M_CMNVECTOR is not set
# CONFIG_ARCH_FPU is not set
CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set
@@ -414,7 +416,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
# uClibc++ Standard C++ Library
#
CONFIG_UCLIBCXX=y
-# CONFIG_UCLIBCXX_EXCEPTION is not set
+CONFIG_UCLIBCXX_EXCEPTION=y
CONFIG_UCLIBCXX_IOSTREAM_BUFSIZE=32
CONFIG_UCLIBCXX_HAVE_LIBSUPCXX=y