Changeset 984 for trunk/Makefile

Timestamp:

Jan 11, 2004, 11:51:09 PM (22 years ago)

Author:

bird

Message:

Addjusted compiler & linker options.

File:

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

trunk/Makefile

@@ -46 +46 @@
 BUILD_DEBUGINFO = -s
 BUILD_ENABLE_SYMBOLS = --disable-symbols
+BUILD_OPTIMIZE  = -O2 -mcpu=pentium -mpreferred-stack-boundary=2 -malign-strings=0 -falign-loops=2 -falign-jumps=2 -falign-functions=2
 else
+BUILD_OPTIMIZE  = -O0
 BUILD_DEBUGINFO = -g
 BUILD_ENABLE_SYMBOLS = --enable-symbols
@@ -354 +356 @@
         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
 
+# put back in!
+#               all-emx
+
 all-stage1-it: \
                 all-banner-stage1 \
                 all-builttools-initial \
-        all-emx \
         all-binutils \
                 all-gcc
@@ -729 +733 @@
 ifeq "$(BUILD_PLATFORM)" "OS2"          
         unset GCCLOAD ; $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc \
-            LIBGCC2_DEBUG_CFLAGS="$(BUILD_DEBUGINFO) -Zhigh-mem " \
-                      CFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -O2" \
-                    CXXFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -O2" \
-                 BOOT_CFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -O2 -mcpu=pentium -mpreferred-stack-boundary=2 -malign-strings=0 -falign-loops=2 -falign-jumps=2 -falign-functions=2" \
-                     LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -Zexe -Zcrtdll -Zstack 1024" \
-                BOOT_LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -Zexe -Zcrtdll -Zstack 1024" \
+            LIBGCC2_DEBUG_CFLAGS="$(BUILD_DEBUGINFO) $(BUILD_OPTIMIZE) -Zhigh-mem " \
+                      CFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) $(BUILD_OPTIMIZE) -Zhigh-mem" \
+                    CXXFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) $(BUILD_OPTIMIZE) -Zhigh-mem" \
+                 BOOT_CFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) $(BUILD_OPTIMIZE) -Zhigh-mem" \
+                     LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -Zcrtdll -Zstack 1024 -Zomf" \
+                BOOT_LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -Zcrtdll -Zstack 1024 -Zomf" \
                 bootstrap
 else
@@ -742 +746 @@
 # configure it (invoked after directory change).
 #       We set CC to help configure finding it.
+#       We also set some LDFLAGS to get omf linking.
 gcc-configure-it $(PATH_OBJ)/gcc/.ts.configured: $(PATH_TOP)/src/gcc/configure
 ifeq "$(BUILD_PLATFORM)" "OS2"
         $(ASH) -c " \
                 export CC=\"gcc.exe\" ; \
+                export LDFLAGS=\"$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -Zcrtdll -Zstack 1024 -Zomf\" ; \
+                export BOOT_LDFLAGS=\"$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -Zcrtdll -Zstack 1024 -Zomf\" ; \
                 $< \
                 --enable-clh \
@@ -846 +853 @@
                 export     CXXFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g "; \
                 export  BOOT_CFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g "; \
-                export      LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zexe -Zcrtdll -Zstack 1024"; \
-                export BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zexe -Zcrtdll -Zstack 1024"; \
+                export      LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zcrtdll -Zstack 1024"; \
+                export BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zcrtdll -Zstack 1024"; \
                 $(subst \,/,$(COMSPEC)) ; \
                 mv -f $(PATH_BUILTTOOLS)/omfhackbin $(PATH_BUILTTOOLS)/omfhack
@@ -870 +877 @@
                     CXXFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g " \
                  BOOT_CFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g " \
-                     LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zexe -Zcrtdll -Zstack 1024" \
-                BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zexe -Zcrtdll -Zstack 1024" \
+                     LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zcrtdll -Zstack 1024" \
+                BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zcrtdll -Zstack 1024" \
                 -e all
         mv -f $(PATH_BUILTTOOLS)/omfhackbin $(PATH_BUILTTOOLS)/omfhack