Changeset 294

Timestamp:

Jun 4, 2003, 11:17:41 PM (22 years ago)

Author:

bird

Message:

New testcase. Fixes.

Location:

trunk/testcase/456

Files:

• class.cpp (added)
• class.gmk (added)
• common.gmk (modified) (4 diffs, 1 prop)
• emptyc.c (added)
• emptyc.gmk (added)
• emptycpp.cpp (added)
• emptycpp.gmk (added)

trunk/testcase/456/common.gmk

@@ -18 +18 @@
 endif
 
+ifndef EMXOMF
+EMXOMF = emxomf.exe
+else
+EMXOMF_DEP = $(EMXOMF)
+endif
+
+ifndef LISTOMF
+LISTOMF = listomf.exe
+else
+LISTOMF_DEP = $(LISTOMF)
+endif
+
+
+
 $(TARGET): \
         $(PATH_TARGET)/$(TARGET).vac.obj \
         $(PATH_TARGET)/$(TARGET).vac.lst \
+        $(PATH_TARGET)/$(TARGET).gcc.s   \
         $(PATH_TARGET)/$(TARGET).gcc.o   \
         $(PATH_TARGET)/$(TARGET).gcc.obj \
-        $(PATH_TARGET)/$(TARGET).gcc.s   \
         $(PATH_TARGET)/$(TARGET).gcc.lst \
 
@@ -30 +44 @@
         icc -c -Ti+ -Fo$@ $<
 
-$(PATH_TARGET)/$(TARGET).gcc.obj: $(TARGET_SOURCE)
-        gcc -c -g -Zomf -o $@ $<
+$(PATH_TARGET)/$(TARGET).gcc.obj: $(PATH_TARGET)/$(TARGET).gcc.o $(EMXOMF_DEP)
+        $(EMXOMF) -o $@ $< > $@.emxomf 2>&1
+        cat $@.emxomf
         
 $(PATH_TARGET)/$(TARGET).gcc.o:   $(TARGET_SOURCE)
@@ -40 +55 @@
         
         
-$(PATH_TARGET)/$(TARGET).vac.lst: $(PATH_TARGET)/$(TARGET).vac.obj
-        listomf $< > $@
+$(PATH_TARGET)/$(TARGET).vac.lst: $(PATH_TARGET)/$(TARGET).vac.obj $(LISTOMF_DEP)
+        $(LISTOMF) $< > $@
 
-$(PATH_TARGET)/$(TARGET).gcc.lst: $(PATH_TARGET)/$(TARGET).gcc.obj
-        listomf $< > $@
+$(PATH_TARGET)/$(TARGET).gcc.lst: $(PATH_TARGET)/$(TARGET).gcc.obj $(LISTOMF_DEP)
+        $(LISTOMF) $< > $@
 
 clean:  
@@ -51 +66 @@
         $(PATH_TARGET)/$(TARGET).vac.lst \
         $(PATH_TARGET)/$(TARGET).gcc.o   \
+        $(PATH_TARGET)/$(TARGET).gcc.s   \
         $(PATH_TARGET)/$(TARGET).gcc.obj \
         $(PATH_TARGET)/$(TARGET).gcc.lst \