Changeset 565

Timestamp:

Aug 10, 2003, 4:50:14 AM (22 years ago)

Author:

bird

Message:

emxload fix. stack size (OMF problem).

File:

• trunk/Makefile (modified) (9 diffs, 1 prop)

trunk/Makefile

@@ -292 +292 @@
         @echo ""
         
-all-preload-unload-obj:
+all-preload-unload:
 ifeq "$(BUILD_PLATFORM)" "OS2"
-        -for prog in `emxload -l | sed -e 's|\\\|\/|g' -e 's@.*³[[:blank:]]*@@' | grep -i '$(PATH_OBJD)'`; \
-        do \
-                echo $$prog; \
-                emxload -u $$prog; \
-        done
-        -for prog in `emxload -l | sed -e 's|\\\|\/|g' -e 's@.*³[[:blank:]]*@@' | grep -i '$(PATH_TOPD)/src'`; \
-        do \
-                echo $$prog; \
-                emxload -u $$prog; \
-        done
+        emxload -qw
 endif
 
@@ -360 +351 @@
         @echo "+ Saving Stage 1 - Starting: $(shell date)"
         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
-        $(MAKE) -f $(MAKEFILE) all-preload-unload-obj
+        $(MAKE) -f $(MAKEFILE) all-preload-unload
         $(MAKE) -f $(MAKEFILE) all-builttools-stage2
         rm -Rf $(PATH_OBJ)/stage1
@@ -421 +412 @@
                 $(PATH_BUILTTOOLS)/omfhack/ar.exe \
                 $(PATH_BUILTTOOLS)/omfhack/realar.exe \
-                $(PATH_BUILTTOOLS)/omfhack/ranlib.exe 
+                $(PATH_BUILTTOOLS)/omfhack/ranlib.exe
                 
 all-builttools-clean: \
-                all-preload-unload-obj
+                all-preload-unload
         rm -Rf $(PATH_BUILTTOOLS)
         
@@ -688 +679 @@
                     CXXFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -O2" \
                  BOOT_CFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -O2 -mcpu=pentium -mpreferred-stack-boundary=2 -malign-strings=0 -falign-loops=2 -falign-jumps=2 -falign-functions=2" \
-                     LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zexe -Zcrtdll" \
-                BOOT_LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zexe -Zcrtdll" \
+                     LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zexe -Zcrtdll -Zstack 1024" \
+                BOOT_LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zexe -Zcrtdll -Zstack 1024" \
                 bootstrap
 else
@@ -782 +773 @@
         $(MAKE) -C $(PATH_OBJ)/gccomf -f $(MAKEFILE) $@-it
 
-   
+
 # Separate since we want the 'e' option
 gccomf-shell:                   
         mkdir -p $(PATH_OBJ)/gccomf
         $(MAKE) -e -C $(PATH_OBJ)/gccomf -f $(MAKEFILE) $@-it
-gccomf-shell-it: 
+gccomf-shell-it:
         chdir $(PATH_OBJ)/gccomf ; \
                 if test -d $(PATH_BUILTTOOLS)/omfhack; then mv -f $(PATH_BUILTTOOLS)/omfhack $(PATH_BUILTTOOLS)/omfhackbin; fi ; \
@@ -796 +787 @@
                 export     CXXFLAGS="$(OMFSPEC_HACK) -Zomf -g "; \
                 export  BOOT_CFLAGS="$(OMFSPEC_HACK) -Zomf -g "; \
-                export      LDFLAGS="$(OMFSPEC_HACK) -Zomf -g -Zexe -Zcrtdll"; \
-                export BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zomf -g -Zexe -Zcrtdll"; \
+                export      LDFLAGS="$(OMFSPEC_HACK) -Zomf -g -Zexe -Zcrtdll -Zstack 1024"; \
+                export BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zomf -g -Zexe -Zcrtdll -Zstack 1024"; \
                 $(subst \,/,$(COMSPEC)) ; \
                 mv -f $(PATH_BUILTTOOLS)/omfhackbin $(PATH_BUILTTOOLS)/omfhack
@@ -803 +794 @@
 
 # When changed directory
-#   We pass down alot of flags here, but currently we don't use half of them as 
+#   We pass down alot of flags here, but currently we don't use half of them as
 #   we're not booting the compiler.
 
@@ -819 +810 @@
                     CXXFLAGS="$(OMFSPEC_HACK) -Zomf -g " \
                  BOOT_CFLAGS="$(OMFSPEC_HACK) -Zomf -g " \
-                     LDFLAGS="$(OMFSPEC_HACK) -Zomf -g -Zexe -Zcrtdll" \
-                BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zomf -g -Zexe -Zcrtdll" \
-                all
+                     LDFLAGS="$(OMFSPEC_HACK) -Zomf -g -Zexe -Zcrtdll -Zstack 1024" \
+                BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zomf -g -Zexe -Zcrtdll -Zstack 1024" \
+                -e all
         mv -f $(PATH_BUILTTOOLS)/omfhackbin $(PATH_BUILTTOOLS)/omfhack
 else
@@ -1063 +1054 @@
 
                                         
-# easy, update same stuff in a bunch of files.
-# actually, nothing any long as the global innotekversion.h takes care of it
-# together with proper dependencies.
-EMX_FILE_VER = \
-emxbind/emxbind.h emxcat/emxcat.c emxdoc/emxdoc.c emxexp/emxexp.c emximp/emximp.c \
-emxload/emxload.c emxomf/emxaout.c emxomf/emxomf.c emxomf/emxomfar.c emxomf/emxomfld.c \
-emxomf/listomf.c emxstack/emxstack.c emxtsf/emxtsf.c os2/version.h
+# We pass down the INNOTEK_VERSION define when building EMX.
 emx-versionstamps:
-        @echo "Version stamping EMX..."
+        @echo "Version stamping EMX... nothing to do"
                                                                         
 # Install the compiled emx stuff to builttools.