Changeset 1259 for trunk/Makefile

Timestamp:

Feb 16, 2004, 11:11:14 PM (21 years ago)

Author:

bird

Message:

Added as-elf and ld-elf.

File:

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

trunk/Makefile

@@ -3 +3 @@
 # Top level makefile.
 #
-# InnoTek Systemberatung GmbHconfidential
+# InnoTek Systemberatung GmbH confidential
 #
 # Copyright (c) 2003 InnoTek Systemberatung GmbH
@@ -1035 +1035 @@
 
 # build the components.
-.PHONY: binutils-build binutils-install binutils-configure
-binutils-build binutils-install binutils-configure:
+.PHONY: binutils-build binutils-install binutils-configure binutils-configure-elf
+binutils-build binutils-install binutils-configure binutils-configure-elf:
         mkdir -p $(PATH_OBJ)/binutils
         $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/binutils -f $(MAKEFILE) $@-it
@@ -1044 +1044 @@
 binutils-build-it: \
                 $(PATH_OBJ)/binutils/.ts.configured
-        unset GCCLOAD ; export LT_OS2_LDFLAGS="-Zomf -g" ; \
+        unset GCCLOAD ; export LT_OS2_LDFLAGS="-Zomf -g -Zmap" ; \
         $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/binutils \
                 CFLAGS="$(BUILD_DEBUGINFO) $(BUILD_OPTIMIZE) -Zhigh-mem" \
-                LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -Zcrtdll -Zstack 1024 -Zomf"
+                LDFLAGS="$(BUILD_DEBUGINFO) -Zhigh-mem -Zstack 1024 -Zomf"
+        unset GCCLOAD ; export LT_OS2_LDFLAGS="-Zomf -g -Zmap" ; \
+        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/binutils/gas-elf \
+                CFLAGS="$(BUILD_DEBUGINFO) $(BUILD_OPTIMIZE) -Zhigh-mem" \
+                LDFLAGS="$(BUILD_DEBUGINFO) -Zhigh-mem -Zstack 1024 -Zomf"
+        unset GCCLOAD ; export LT_OS2_LDFLAGS="-Zomf -g -Zmap" ; \
+        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/binutils/ld-elf \
+                CFLAGS="$(BUILD_DEBUGINFO) $(BUILD_OPTIMIZE) -Zhigh-mem" \
+                LDFLAGS="$(BUILD_DEBUGINFO) -Zhigh-mem -Zstack 1024 -Zomf"
                 
 # configure it (invoked after directory change).
@@ -1055 +1063 @@
 ifeq "$(BUILD_PLATFORM)" "OS2"
         $(ASH) -c " \
-                export CC=\"gcc.exe\" ; \
+                CC=\"gcc.exe\" \
+                CFLAGS=\"$(BUILD_DEBUGINFO) $(BUILD_OPTIMIZE) -Zhigh-mem\"  \
+                LDFLAGS=\"$(BUILD_DEBUGINFO) -Zhigh-mem -Zstack 1024 -Zomf\" \
                 $< \
                 --enable-clh \
@@ -1079 +1089 @@
                 --enable-languages=c,c++ "
 endif
-        mkdir -p libiberty
-# Not any longer.       
-#       $(ASH) -c "cd libiberty && \
-#               $(PATH_TOP)/src/gcc/libiberty/configure \
-#               --prefix=$(ALL_PREFIX) "
+        mkdir -p gas-elf
+        $(ASH) -c "cd gas-elf && \
+                CC=\"gcc.exe\" \
+                CFLAGS=\"$(BUILD_DEBUGINFO) $(BUILD_OPTIMIZE) -Zhigh-mem\" \
+                LDFLAGS=\"$(BUILD_DEBUGINFO) -Zhigh-mem -Zstack 1024 -Zomf\" \
+                $(PATH_TOP)/src/binutils/gas/configure \
+                --target=i386-pc-os2-elf \
+                --enable-shared=libgcc,bfd,opcodes \
+                --enable-nls \
+                --without-included-gettext \
+                --with-local-prefix=$(subst \,/,$(PATH_EMXPGCC)) \
+                --prefix=/gcc \
+                --with-gnu-as \
+                --program-suffix=-elf "
+        mkdir -p ld-elf
+        $(ASH) -c "cd ld-elf && \
+                CC=\"gcc.exe\" \
+                CFLAGS=\"$(BUILD_DEBUGINFO) $(BUILD_OPTIMIZE) -Zhigh-mem\"  \
+                LDFLAGS=\"$(BUILD_DEBUGINFO) -Zhigh-mem -Zstack 1024 -Zomf\" \
+                $(PATH_TOP)/src/binutils/ld/configure \
+                --target=i386-pc-os2-elf \
+                --enable-shared=libgcc,bfd,opcodes \
+                --enable-nls \
+                --without-included-gettext \
+                --with-local-prefix=$(subst \,/,$(PATH_EMXPGCC)) \
+                --prefix=/gcc \
+                --with-gnu-as \
+                --program-suffix=-elf "
         touch $(PATH_OBJ)/binutils/.ts.configured
+                
         
         
@@ -1090 +1124 @@
 #       Repeating the prefix doesn't hurt anybody.
 binutils-install-it:
+        cd gas-elf && $(MAKE) $(MAKEOPT) prefix=$(ALL_PREFIX) install
+        cd ld-elf  && $(MAKE) $(MAKEOPT) prefix=$(ALL_PREFIX) install
         $(MAKE) $(MAKEOPT) prefix=$(ALL_PREFIX) install
         mv -f $(ALL_PREFIX)/bin/ld.exe  $(ALL_PREFIX)/bin/ld-bad.exe