Changeset 3933 for branches

Timestamp:

Oct 26, 2014, 2:47:28 PM (11 years ago)

Author:

bird

Message:

0.6: gearing up to 0.6.6

Location:

branches/libc-0.6/src/emx

Files:

• src/lib/libc.smak (modified) (7 diffs)
• src/lib/libc065.def (copied) (copied from branches/libc-0.6/src/emx/src/lib/libc.def ) (3 diffs)
• version.smak (modified) (2 diffs)

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

@@ -201 +201 @@
         $(call RM,$@)
         @$(call FECHO,$@,LIBRARY libc$(VH)$(VM)$(VL) INITINSTANCE TERMINSTANCE)
-        @$(call FECHO,$@,DESCRIPTION \"kLIBC version $(VERSION)\")
+        @$(call FECHO,$@,DESCRIPTION \"kLIBC version $(VERSION) $(INNOTEK_VERSION)\")
         @$(call FECHO,$@,DATA MULTIPLE)
         @$(call FECHO,$@,CODE SHARED)
@@ -470 +470 @@
         $(call RM,$@)
         cat $^ >> $@
-        @$(call FECHO,$@,DESCRIPTION \"kLIBC version $(VERSION)\")
+        @$(call FECHO,$@,DESCRIPTION \"kLIBC version $(VERSION) $(INNOTEK_VERSION)\")
 $.omf/libc06.dll: $.omf/libc06.def $.omf/fwdstub.obj $.omf/libc_dll.lib
         gcc -Zomf -o $@ -nostdlib -Zdll $^
@@ -483 +483 @@
         $(call RM,$@)
         cat $^ > $@
-        @$(call FECHO,$@,DESCRIPTION \"kLIBC version $(VERSION)\")
+        @$(call FECHO,$@,DESCRIPTION \"kLIBC version $(VERSION) $(INNOTEK_VERSION)\")
 $.omf/libc061.dll: $.omf/libc061.def $.omf/fwdstub.obj $.omf/libc_dll.lib
         gcc -Zomf -o $@ -nostdlib -Zdll $^
@@ -496 +496 @@
         $(call RM,$@)
         cat $^ > $@
-        @$(call FECHO,$@,DESCRIPTION \"kLIBC version $(VERSION)\")
+        @$(call FECHO,$@,DESCRIPTION \"kLIBC version $(VERSION) $(INNOTEK_VERSION)\")
 $.omf/libc062.dll: $.omf/libc062.def $.omf/fwdstub.obj $.omf/libc_dll.lib
         gcc -Zomf -o $@ -nostdlib -Zdll $^
@@ -509 +509 @@
         $(call RM,$@)
         cat $^ > $@
-        @$(call FECHO,$@,DESCRIPTION \"kLIBC version $(VERSION)\")
+        @$(call FECHO,$@,DESCRIPTION \"kLIBC version $(VERSION) $(INNOTEK_VERSION)\")
 $.omf/libc063.dll: $.omf/libc063.def $.omf/fwdstub.obj $.omf/libc_dll.lib
         gcc -Zomf -o $@ -nostdlib -Zdll $^
@@ -522 +522 @@
         $(call RM,$@)
         cat $^ > $@
-        @$(call FECHO,$@,DESCRIPTION \"kLIBC version $(VERSION)\")
+        @$(call FECHO,$@,DESCRIPTION \"kLIBC version $(VERSION) $(INNOTEK_VERSION)\")
 $.omf/libc064.dll: $.omf/libc064.def $.omf/fwdstub.obj $.omf/libc_dll.lib
         gcc -Zomf -o $@ -nostdlib -Zdll $^
@@ -531 +531 @@
 libc-dll: $.omf/libc064.dll
 
+# libc065
+$.omf/libc065.def: src/lib/libc065.def src/lib/libstdc++.def
+        $(call RM,$@)
+        cat $^ > $@
+        @$(call FECHO,$@,DESCRIPTION \"kLIBC version $(VERSION) $(INNOTEK_VERSION)\")
+$.omf/libc065.dll: $.omf/libc065.def $.omf/fwdstub.obj $.omf/libc_dll.lib
+        gcc -Zomf -o $@ -nostdlib -Zdll $^
+$(INS)lib/libc065.dll: $.omf/libc065.dll
+        if test -f $@; then rm -f $@ || (unlock $(subst /,\\,$@) && rm -f $@); fi
+        $(call CP,$<,$@)
+INS.FILES += $(INS)lib/libc065.dll
+libc-dll: $.omf/libc065.dll
+
 
 # Some parallel building hacks (kmk only as vanilla make doesn't support this syntax).

branches/libc-0.6/src/emx/src/lib/libc065.def

@@ -1 +1 @@
 ; $Id$
 ;
-; Legacy LIBC Exports Ordinals.
+; LIBC065 Forwarder DLL.
 ;
 ; Exports and ordinals listed here are treated as legacy stuff
@@ -19 +19 @@
 ;
 
+LIBRARY libc065
 EXPORTS
 ; data
@@ -1959 +1960 @@
     "__std_nanl" @1957
     "___libc_Back_signalLostPoke" @1958
-    
     "___libc_Back_fsPathConf" @1959
     "___libc_Back_ioPathConf" @1960
-    ; kLIBC 0.6.6
-    "___libc_Back_fsFileOwnerSet" @1961
-    "___libc_Back_fsFileOwnerSetFH" @1962
-    "___libc_Back_fsSymlinkOwnerSet" @1963
-    "___libc_Back_processGetDefaultShell" @1964
-    "__path2" @1965
-    "__searchenv2" @1966
-    "__searchenv2_has_suffix" @1967
-    "__searchenv2_one_file" @1968
-    "__searchenv2_value" @1969
 

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

@@ -7 +7 @@
 # Low part of version number
 ifdef OFFICIAL_BIRD_VERSION
-VL = 5
+VL = 6
 else
-VL = 5x
+VL = 6x
 endif
 
@@ -33 +33 @@
 # Copyright
 COPYRIGHT = Copyright (c) 2003-2005 InnoTek Systemberatung GmbH
+