Now supports C++ global constructors and exceptions.

3 files changed, 10 insertions, 3 deletions

diff --git a/c/src/lib/libbsp/sparc/erc32/bsp_specs b/c/src/lib/libbsp/sparc/erc32/bsp_specs
index 51f7ff15ac..9e0344ffc6 100644
--- a/c/src/lib/libbsp/sparc/erc32/bsp_specs
+++ b/c/src/lib/libbsp/sparc/erc32/bsp_specs
@@ -7,6 +7,9 @@
 *cpp:
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
+*endfile:
+crtend.o%s crtn.o%s
+
 *lib:
 %{!qrtems: %(old_lib)} %{qrtems: --start-group \
 %{!qrtems_debug: -lrtemsall} %{qrtems_debug: -lrtemsall_g} \
@@ -15,8 +18,8 @@
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: \
-%{!qrtems_debug: startsis.o%s} \
-%{qrtems_debug: startsis_g.o%s}}
+%{!qrtems_debug: startsis.o%s crti.o%s crtbegin.o%s} \
+%{qrtems_debug: startsis_g.o%s crti.o%s crtbegin.o%s}}
 
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.in b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.in
index b2f2215bd2..83ea0876cb 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.in
+++ b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.in
@@ -46,7 +46,9 @@ $(INSTALLDIRS):
 # (OPTIONAL) Add local stuff here using +=
 #
 
-DEFINES +=
+# USE_INIT_FINI tells main.c what C++ help we need.
+
+DEFINES += -DUSE_INIT_FINI
 CPPFLAGS +=
 CFLAGS +=
 
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/linkcmds b/c/src/lib/libbsp/sparc/erc32/startup/linkcmds
index 46c989888c..c7ed71d621 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/linkcmds
+++ b/c/src/lib/libbsp/sparc/erc32/startup/linkcmds
@@ -120,6 +120,8 @@ SECTIONS
 
     etext = ALIGN(0x10);
     _etext = .;
+    *(.init)
+    *(.fini)
     *(.lit)
     *(.shdata)
     _endtext = .;