Changeset 3374

Timestamp:

May 27, 2007, 1:17:48 PM (18 years ago)

Author:

bird

Message:

Perparing for 0.6.3.

Location:

branches/libc-0.6

Files:

• Makefile (modified) (63 diffs)
• src/emx/src/lib/libc.smak (modified) (1 diff)
• src/emx/src/lib/libc062.def (copied) (copied from branches/libc-0.6/src/emx/src/lib/libc.def ) (2 diffs)
• src/emx/version.smak (modified) (1 diff)

branches/libc-0.6/Makefile

@@ -10 +10 @@
 #
 
-                        
+
 ###############################################################################
 ##   Global Variables
@@ -54 +54 @@
 BUILD_DEBUGINFO = -g
 BUILD_ENABLE_SYMBOLS = --enable-symbols
-endif   
+endif
 
 
@@ -61 +61 @@
 export GCC_VERSION_SHORT        ?= 335
 ifdef OFFICIAL_BIRD_VERSION
-export GCC_RELEASE_ID           ?= csd2
+export GCC_RELEASE_ID           ?= csd3
 else
 export GCC_RELEASE_ID           ?= x
@@ -75 +75 @@
 export EMX_CVS_VENDOR                   ?= EMX
 export EMX_CVS_REL                              ?= EMX_0-9D-FIX04
-export LIBC_VERSION             ?= 0.6.2
-export LIBC_VERSION_SHORT       ?= 062
+export LIBC_VERSION             ?= 0.6.3
+export LIBC_VERSION_SHORT       ?= 063
 
 # innotek version and timestamp
@@ -90 +90 @@
 endif
 
-                        
-#                       
+
+#
 # For builds on Linux Host builds we do the environment setup here.
 # This is essentially a mimicking of what we do on OS/2.
@@ -127 +127 @@
 endif
 
-                                                        
+
 
 
@@ -152 +152 @@
 
 # old bootstrap building.
-bootstrap all-boostrap: 
+bootstrap all-boostrap:
         mkdir -p $(PATH_OBJ)
         $(NICE) $(MAKE) $(MAKEOPT) -j 1 -C . all-bootstrap-logged 2>&1 | $(UNIXROOT)/usr/bin/tee $(PATH_OBJ)/build-`date +"%Y%m%d-%H%M%S"`.log
@@ -178 +178 @@
 # banners
 #
-                
+
 all-banner-start:
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
         @echo "+ Make started: $(shell date)"
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-                
+
 all-banner-stage1:
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
@@ -193 +193 @@
         @echo "+ Stage 2 - starting: $(shell date)"
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-        
+
 all-banner-builtunix-initial:
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
         @echo "+ Initializing builtunix tree"
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-                
+
 all-banner-builtunix-stage2:
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
@@ -208 +208 @@
         @echo "+ Install - starting: $(shell date)"
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-        
+
 all-banner-install-done:
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
@@ -218 +218 @@
         @echo "+ symlinks - staring: $(shell date)"
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-                
+
 all-banner-symlinks-done:
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
@@ -228 +228 @@
         @echo "+ symlinks unlinking - staring: $(shell date)"
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-                
+
 all-banner-symlinks-unlink-done:
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
         @echo "+ symlinks unlinking - done: $(shell date)"
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-                                                                
-                
+
+
 #
 # Sanity and environment dumps - to make it easier to figure out make bugs.
@@ -240 +240 @@
 
 .PHONY: all-env
-all-env:        
+all-env:
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
         @echo "Variables:"
@@ -306 +306 @@
         -ls -la $(PATH_BIN)/
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-        
-        
+
+
 .PHONY: all-sanity
 all-sanity:
@@ -340 +340 @@
 endif
         @echo "ok"
-        
+
 
 #
 # Preload tools we commonly use this speeds up stuff.
-#                                                                       
+#
 PRELOADED_TOOLS = bin/sh.exe bin/echo.exe bin/true.exe usr/bin/test.exe usr/bin/expr.exe \
      usr/bin/gawk.exe bin/sed.exe bin/rm.exe bin/cat.exe bin/cp.exe bin/mkdir.exe bin/rm.exe
-        
+
 .PHONY: all-preload-unload all-preload
 all-preload:
@@ -363 +363 @@
 endif
         @echo ""
-        
+
 all-preload-unload:
 ifeq "$(BUILD_PLATFORM)" "OS2"
@@ -379 +379 @@
 .PHONY: all-versionstamps
 all-versionstamps: $(PATH_OBJ)/.ts.versionstamped
-$(PATH_OBJ)/.ts.versionstamped: 
+$(PATH_OBJ)/.ts.versionstamped:
 #       echo '#define INNOTEK_VERSION  "$(INNOTEK_VERSION)"' > include/innotekversion.h
         $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) "INNOTEK_VERSION=$(INNOTEK_VERSION)" gcc-versionstamps binutils-versionstamps emx-versionstamps
@@ -390 +390 @@
 #       A rebuild with the new toolsuite is usually required when there is ABI
 #       changes and other vital changes done to the tools.
-#       
+#
 
 .PHONY: all-stage1 all-stage1-it
@@ -408 +408 @@
                 all-gcc \
                 all-emx
-                
+
 .PHONY: all-stage2 all-stage2-it
 all-stage2: $(PATH_OBJ)/.all-stage2
@@ -435 +435 @@
         @echo "+ Saving Stage 1 - done: $(shell date)"
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-        
+
 all-stage2-it: \
                 all-banner-stage2 \
@@ -468 +468 @@
                 fi; \
         done
-endif   
-
-        
+endif
+
+
 #
 # Generate all the diffs we have to supply.
@@ -479 +479 @@
         binutils-diff \
         emx-diff \
-        
-                                                                                
-        
-        
+
+
+
+
 
 ###############################################################################
@@ -505 +505 @@
         @echo "+ Quick Bootstrap started:            $(shell date)"
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-.PHONY: all-quick-logged        
+.PHONY: all-quick-logged
 all-quick-logged: \
         all-quick-banner-start \
@@ -524 +524 @@
         @echo "+ Quick Bootstrap Ended Successfully: $(shell date)"
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-        
+
 .PHONY: all-quick-builtunix-initial
 all-quick-builtunix-initial: $(PATH_OBJ)/.quick-builtunix-initial
@@ -534 +534 @@
         $(MAKE) $(MAKEOPT) -f $(MAKEFILE) all-quick-builtunix-initial-it
         touch $@
-                
+
 
 # This build type is used for release builds.
@@ -579 +579 @@
         $(MAKE) $(MAKEOPT) -f $(MAKEFILE) all-double-quick-builtunix-initial-it
         touch $@
-        
+
 # stage1
 .PHONY: all-double-quick-stage1 all-double-quick-stage1-it
@@ -596 +596 @@
         @echo "+ Double Quick Bootstrap Stage 1 - done:     $(shell date)"
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-        touch $@        
-        
-# save stage1   
+        touch $@
+
+# save stage1
 .PHONY: all-double-quick-save-stage1 all-double-quick-save-stage1-it
 all-double-quick-save-stage1: $(PATH_OBJ)/.doublequick-stage1-saved
@@ -618 +618 @@
         touch $@
 
-# stage2        
+# stage2
 .PHONY: all-double-quick-stage2 all-double-quick-stage2-it
 all-double-quick-stage2: $(PATH_OBJ)/.doublequick-stage2
@@ -634 +634 @@
         @echo "+ Double Quick Bootstrap Stage 2 - done:     $(shell date)"
         @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-        touch $@        
-        
-                
-# step 1 builds the base libraries.     
+        touch $@
+
+
+# step 1 builds the base libraries.
 .PHONY: all-quick-step1 all-quick-step1-it
 all-quick-step1: $(PATH_OBJ)/.quick-step1
@@ -715 +715 @@
 
 
-# Installs the stuff we've built.                       
+# Installs the stuff we've built.
 .PHONY: all-quick-install
 all-quick-install: \
@@ -725 +725 @@
                 all-strip-install \
                 all-banner-install-done
-                
-        
+
+
 ###############################################################################
 ###############################################################################
@@ -736 +736 @@
 ###############################################################################
 ###############################################################################
-                
+
 all-builtunix-initial: \
                 all-banner-builtunix-initial \
@@ -745 +745 @@
                 $(PATH_BUILTTOOLS)/omfhack/realar.exe \
                 $(PATH_BUILTTOOLS)/omfhack/ranlib.exe
-                
+
 all-builtunix-clean: \
                 all-preload-unload
         rm -Rf $(PATH_BUILTUNIX)
-        
+
 all-builtunix-dirs:
         mkdir -p $(PATH_BUILTTOOLS)/bin $(PATH_BUILTTOOLS)/lib $(PATH_BUILTTOOLS)/include $(PATH_BUILTTOOLS)/omfhack
-        
+
 $(PATH_BUILTTOOLS)/bin/dllar.cmd $(PATH_BUILTTOOLS_TMP)/bin/dllar.cmd: $(PATH_TOP)/src/misc/dllar.cmd
         cp $< $@
@@ -765 +765 @@
 $(PATH_BUILTTOOLS_TMP)/omfhack:
         mkdir -p $@
-        
+
 all-builtunix-stage2: \
                 all-banner-builtunix-stage2 \
@@ -778 +778 @@
                 all-builtunix-clean
         mv -f $(PATH_BUILTUNIX_TMP) $(PATH_BUILTUNIX)
-        
+
 all-builtunix-stage2-libs:
         -for aoutlib in `find $(PATH_BUILTUNIX_TMP) -name "*.a" | sed -e 's/\.a$$//' `; \
@@ -823 +823 @@
                 all-symlinks-unlink-binutils \
                 all-banner-symlinks-unlink-done
-                
-                
+
+
 ifeq "$(BUILD_PLATFORM)" "OS2"
 TOOL_SYMLINK_FILE   = cp -p
@@ -837 +837 @@
 endif
 
-# ld is broken, so don't use it!        
+# ld is broken, so don't use it!
 # ld \
 
@@ -902 +902 @@
 include/xtensa-isa.h \
 
-        
+
 # Symlink binutils stuff to gcc.
 #       Note the test should've been "! -e", but that doesn' work in ash... :/
@@ -916 +916 @@
                         fi ; \
                 fi ; \
-        done    
+        done
         for dir in $(SYMLINKS_BINUTILS_TO_GCC_DIRS) ; do \
                 if [ ! -f "$(PATH_TOP)/src/gcc/.symlinked.`echo $${dir} | sed -e 's@/@_@g'`" ] ; then  \
@@ -951 +951 @@
         done
         -ls -a1 src/gcc/.sym*
-                                                
+
 
 ###############################################################################
@@ -1015 +1015 @@
         done
 
-        
+
 # build the components.
 .PHONY: gcc-bootstrap gcc-build gcc-install gcc-configure
@@ -1021 +1021 @@
         mkdir -p $(PATH_OBJ)/gcc
         $(MAKE) $(MAKEOPT) -j 1 -C $(PATH_OBJ)/gcc -f $(MAKEFILE) $@-it
-        
+
 # let the build/bootstrap create the gcc import .def file before kicking off a build.
 gcc-bootstrap gcc-build: src/gcc/gcc/config/i386/emx-libgcc_so_d.def
@@ -1039 +1039 @@
 gcc-bootstrap-it gcc-build-it: \
                 $(PATH_OBJ)/gcc/.ts.configured
-ifeq "$(BUILD_PLATFORM)" "OS2"          
+ifeq "$(BUILD_PLATFORM)" "OS2"
         unset GCCLOAD ; export LT_OS2_LDFLAGS="-Zomf -g" ; \
         $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc \
@@ -1051 +1051 @@
 else
         $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc $(subst build, all, $(patsubst gcc-%-it, %, $@))
-endif   
-                
+endif
+
 # configure it (invoked after directory change).
 #       We set CC to help configure finding it.
@@ -1103 +1103 @@
 
 
-# Install to builtunix directory.       
+# Install to builtunix directory.
 ##     WARNING! Another spec HACK!
 gcc-builtunix-stage2:
@@ -1114 +1114 @@
         gcc-autoconf-refresh \
         gcc-build
-        
+
 gcc-quick-installstage:
         rm -Rf $(PATH_BUILTUNIX_TMP)
@@ -1121 +1121 @@
         rm -Rf $(PATH_BUILTUNIX_TMP)
 
-                
+
 # Generate diffs for GCC - part of packing a release.
 .PHONY: gcc-diff $(ALL_PREFIX)/src/diffs/gcc-$(GCC_VERSION).diff
@@ -1207 +1207 @@
                 CFLAGS="$(BUILD_DEBUGINFO) $(BUILD_OPTIMIZE) -Zhigh-mem" \
                 LDFLAGS="$(BUILD_DEBUGINFO) -Zhigh-mem -Zstack 1024 -Zomf"
-                
+
 # configure it (invoked after directory change).
 #       We set CC to help configure finding it.
@@ -1269 +1269 @@
                 --program-suffix=-elf "
         touch $(PATH_OBJ)/binutils/.ts.configured
-                
-        
-        
+
+
+
 # Install the Binutils build
 #       Repeating the prefix doesn't hurt anybody.
@@ -1288 +1288 @@
         sed -e '/printf.*program_version/s/%s %s.*\\n/%s %s $(INNOTEK_VERSION)\\n/' \
                 $(PATH_TOP)/src/binutils/binutils/version.tmp.c > $(PATH_TOP)/src/binutils/binutils/version.c
-        rm -f $(PATH_TOP)/src/binutils/binutils/version.tmp.c           
+        rm -f $(PATH_TOP)/src/binutils/binutils/version.tmp.c
         if [ -f $(PATH_TOP)/src/gcc/binutils/version.c ]; then \
                 cp -f $(PATH_TOP)/src/gcc/binutils/version.c  $(PATH_TOP)/src/gcc/binutils/version.tmp.c && \
@@ -1300 +1300 @@
             -e '/fprintf.*GNU.*assembler.*version.*BFD.*/s/using BFD version %s.*/using BFD version %s $(INNOTEK_VERSION)"),/ ' \
                 $(PATH_TOP)/src/binutils/gas/as.tmp.c > $(PATH_TOP)/src/binutils/gas/as.c
-        rm -f $(PATH_TOP)/src/binutils/gas/as.tmp.c             
+        rm -f $(PATH_TOP)/src/binutils/gas/as.tmp.c
         if [ -f $(PATH_TOP)/src/gcc/gas/as.c ]; then \
                 cp -f $(PATH_TOP)/src/gcc/gas/as.c  $(PATH_TOP)/src/gcc/gas/as.tmp.c && \
@@ -1312 +1312 @@
         sed -e '/fprintf.*GNU.*ld.*version/s/(with BFD %s).*/(with BFD %s) $(INNOTEK_VERSION)\\n"),/' \
                 $(PATH_TOP)/src/binutils/ld/ldver.tmp.c > $(PATH_TOP)/src/binutils/ld/ldver.c
-        rm -f $(PATH_TOP)/src/binutils/ld/ldver.tmp.c           
+        rm -f $(PATH_TOP)/src/binutils/ld/ldver.tmp.c
         if [ -f $(PATH_TOP)/src/gcc/ld/ldver.c ]; then \
                 cp -f $(PATH_TOP)/src/gcc/ld/ldver.c $(PATH_TOP)/src/gcc/ld/ldver.tmp.c && \
@@ -1318 +1318 @@
                         $(PATH_TOP)/src/gcc/ld/ldver.tmp.c > $(PATH_TOP)/src/gcc/ld/ldver.c && \
                 rm -f $(PATH_TOP)/src/gcc/ld/ldver.tmp.c ; \
-        fi              
-        
+        fi
+
 
 # Quick bootstrap workers.
@@ -1337 +1337 @@
         rm -Rf $(PATH_BUILTUNIX_TMP)
 
-                                        
+
 # Generate diffs for Binutils (part of packing).
 .PHONY: binutils-diff $(ALL_PREFIX)/src/diffs/binutils-$(BINUTILS_VERSION).diff
@@ -1347 +1347 @@
 
 
-                                                        
-
-        
+
+
+
 
 
@@ -1364 +1364 @@
                 emx-build
         @echo "Successfully build EMX."
-        
-# Some helpers.         
+
+# Some helpers.
 # TODO: Change OUT and INS to the right ones. Currently not possible as
 #       doing such breaks the rules generating.
@@ -1378 +1378 @@
 EMX_MASM = $(PATH_TOP)/tools/x86.os2/masm/v6.0/binp/ml.exe
 EMX_DEFINES = "OUT=$(EMX_OUT)" "INS=$(EMX_INS)" "MODE=$(EMX_MODE)" "ASM=$(EMX_MASM) -c"
-                                                                        
+
 # build the components. (directory changer rules)
 .PHONY: emx-build emx-install emx-configure
@@ -1392 +1392 @@
         $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(ALL_PREFIX)/ install
 
-                                        
+
 # We pass down the INNOTEK_VERSION define when building EMX.
 emx-versionstamps:
         @echo "Version stamping EMX... nothing to do"
-                                                                        
+
 # Install the compiled emx stuff to builtunix.
 emx-builtunix-stage2:
         $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS_TMP)/  install
 
-# Quick bootstrap workers.                      
+# Quick bootstrap workers.
 emx-quick-libs:
         GCCLOAD=3 $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/src/emx/libonly.gmk -C $(PATH_TOP)/src/emx $(EMX_DEFINES) all
@@ -1407 +1407 @@
 emx-quick-libs-install:
         $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/src/emx/libonly.gmk -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS)/ install
-                                        
+
 emx-quick-rest:
         GCCLOAD=3 $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) all
-                        
+
 emx-quick-rest-install:
         $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS)/ install
-                                
+
 
 # Generate diffs for EMX (part of packing).
@@ -1423 +1423 @@
 
 
-        
-        
-        
+
+
+
 ###############################################################################
 ###############################################################################
@@ -1446 +1446 @@
         rm -f $(ZIPBASE).zip
         cd $(ALL_PREFIX)/.. ; zip $(ZIPFLAGS) $(ZIPBASE).zip *
-        
+
 packing-doc:
         rm -f $(ZIPBASE)-doc.zip
         cd $(ALL_PREFIX)/..; zip $(ZIPFLAGS) $(ZIPBASE)-doc.zip usr/doc/GCC-$(GCC_VERSION)/*
-        
+
 packing-libc:
         rm -f $(PATH_BIN)/libc-$(LIBC_VERSION)-$(GCC_RELEASE_ID).zip
@@ -1460 +1460 @@
                 packing-src-binutils \
                 packing-src-emx \
-        
+
 packing-src-gcc:
         rm -f $(ZIPBASE)-src-GCC.zip
         zip $(ZIPFLAGS) $(ZIPBASE)-src-GCC.zip src/gcc -x \*CVS\*
-                                        
+
 packing-src-binutils:
         rm -f $(ZIPBASE)-src-binutils.zip
         zip $(ZIPFLAGS) $(ZIPBASE)-src-binutils.zip src/binutils -x \*CVS\*
-        
+
 packing-src-emx:
         rm -f $(ZIPBASE)-src-emx.zip
         zip $(subst r,,$(ZIPFLAGS)) $(ZIPBASE)-src-emx.zip src/emx/* -x \*CVS\* -x \*testcase\* -x \*out\*
         zip $(ZIPFLAGS) $(ZIPBASE)-src-emx.zip src/emx/src/* src/emx/include/* src/emx/src/bsd/* -x \*CVS\*
-                                
-                
+
+
 ###############################################################################
 ###############################################################################
@@ -1501 +1501 @@
         cp $(PATH_TOP)/src/misc/dllar.cmd           $(ALL_PREFIX)/bin
         cp $(PATH_TOP)/src/misc/gccenv.cmd          $(ALL_PREFIX)/bin
-                        
+
 
 #
 # Checkout rule
-#       
+#
 checkout update up:
         cvs -q update -d -P 2>&1 | tee up.log

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

@@ -482 +482 @@
 libc-dll: $.omf/libc061.dll
 
+# libc062
+$.omf/libc062.dll: src/lib/libc062.def $.omf/fwdstub.obj $.omf/libc_dll.lib
+        gcc -Zomf -o $@ -nostdlib -Zdll $^
+$(INS)lib/libc062.dll: $.omf/libc062.dll
+        $(call CP,$<,$@)
+INS.FILES += $(INS)lib/libc062.dll
+libc-dll: $.omf/libc062.dll
+
 
 # Some parallel building hacks (kmk only as vanilla make doesn't support this syntax).

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

@@ -1 +1 @@
 ; $Id$
 ;
-; Legacy LIBC Exports Ordinals.
+; LIBC062 Forwarder DLL.
 ;
 ; Exports and ordinals listed here are treated as legacy stuff
@@ -19 +19 @@
 ;
 
+LIBRARY libc062
 EXPORTS
 ; data

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

@@ -7 +7 @@
 # Low part of version number
 ifdef OFFICIAL_BIRD_VERSION
-VL = 2
+VL = 3
 else
-VL = 2x
+VL = 3x
 endif