Changeset 2814 for branches/libc-0.6/src/emx

Timestamp:

Sep 10, 2006, 1:58:27 AM (19 years ago)

Author:

bird

Message:

Link libstdc++ into the libc dll. Fixes #124.

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/lib/libc.smak (modified) (6 diffs)
• src/lib/libstdc++.def (added)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -5 +5 @@
 2006-09-09: knut st. osmundsen <bird-gccos2-spam@anduin.net>
     - libc:
+        o #124: Link libstdc++ into the libc dll.
         o #125: Implemented nan(), nanl(), and nanf().
     - emxomfld:

branches/libc-0.6/src/emx/src/lib/libc.smak

@@ -187 +187 @@
                 $(LIBC.LIBS) \
                 $(filter %.lib,$(LIBC.DEPS)) \
-                -L$.omf -lgcc -lgcc_eh $(LIBC.STUBARG)
+                -L$.omf -lstdc++ -lgcc -lgcc_eh $(LIBC.STUBARG)
 ifeq ($(MODE),opt)
         cp $@ $(@:.dll=.dbg)
@@ -194 +194 @@
 
 # LIBC .def file
-$(LIBC.DEF): $(LIBC.LIBS) src/lib/libc.def version.smak
+$(LIBC.DEF): $(LIBC.LIBS) src/lib/libc.def src/lib/libstdc++.def version.smak
         $(call RM,$@)
         @$(call FECHO,$@,LIBRARY libc$(VH)$(VM)$(VL) INITINSTANCE TERMINSTANCE)
@@ -205 +205 @@
         mv -f $@.tmp $@
         krx.exe src/lib/dlllegacy.cmd -e "_DLL_InitTerm" $@ src/lib/libc.def
+        mv -f $@ $@.tmp
+        cat "src/lib/libstdc++.def" >> $@.tmp
+        mv -f $@.tmp $@
+    
 
 # LIBC import libraries with dllinit, libsocket and libsyslog.
@@ -238 +242 @@
                 $(LIBC.LOG.LIBS) \
                 $(filter %.lib,$(LIBC.LOG.DEPS)) \
-                -L$.omf -lgcc -lgcc_eh $(LIBC.STUBARG)
+                -L$.omf -lstdc++ -lgcc -lgcc_eh $(LIBC.STUBARG)
         echo $@
 
@@ -248 +252 @@
                 $(LIBC.PRF.LIBS) \
                 $(filter %.lib,$(LIBC.PRF.DEPS)) \
-                -L$.omf-prof -L$.omf -lgcc -lgcc_eh $(LIBC.STUBARG)
+                -L$.omf-prof -L$.omf -lstdc++ -lgcc -lgcc_eh $(LIBC.STUBARG)
         echo $@
 
@@ -268 +272 @@
                 $(LIBC.ELH.LIBS) \
                 $(filter %.lib,$(LIBC.ELH.DEPS)) \
-                -L$.omf -lgcc -lgcc_eh $(LIBC.STUBARG)
+                -L$.omf -lstdc++ -lgcc -lgcc_eh $(LIBC.STUBARG)
         echo $@