Changeset 724
- Timestamp:
- Sep 24, 2003, 8:49:08 PM (22 years ago)
- Location:
- trunk/testcase/456
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/testcase/456/common.gmk
-
Property cvs2svn:cvs-rev
changed from
1.9
to1.10
r723 r724 14 14 TARGET_SRCEXT = c 15 15 endif 16 ifndef TARGET2_SRCEXT 17 TARGET2_SRCEXT = c 18 endif 16 19 ifndef TARGET_SOURCE 17 TARGET_SOURCE = $(TARGET).$(TARGET_SRCEXT) 20 TARGET_SOURCE = $(TARGET).$(TARGET_SRCEXT) 21 endif 22 ifndef TARGET2_SOURCE 23 TARGET2_SOURCE = $(TARGET2).$(TARGET2_SRCEXT) 18 24 endif 19 25 … … 30 36 endif 31 37 38 ifndef GCC 39 GCC = gcc 40 endif 41 ifndef GXX 42 GXX = g++ 43 endif 44 45 32 46 ifndef NOLINKING 33 47 TARGET_LINKED_VAC = $(PATH_TARGET)/$(TARGET).vac.exe \ … … 37 51 $(PATH_TARGET)/$(TARGET).gcc.dump \ 38 52 $(PATH_TARGET)/$(TARGET).gcc.hlldump 53 endif 54 55 ifdef TARGET2 56 TARGET2_VAC = $(PATH_TARGET)/$(TARGET2).vac.obj \ 57 $(PATH_TARGET)/$(TARGET2).vac.lst 58 TARGET2_GCC = $(PATH_TARGET)/$(TARGET2).gcc.s \ 59 $(PATH_TARGET)/$(TARGET2).gcc.o \ 60 $(PATH_TARGET)/$(TARGET2).gcc.obj \ 61 $(PATH_TARGET)/$(TARGET2).gcc.lst 62 63 TARGET2_LINK_VAC = $(PATH_TARGET)/$(TARGET2).vac.obj 64 TARGET2_LINK_GCC = $(PATH_TARGET)/$(TARGET2).gcc.obj 39 65 endif 40 66 … … 52 78 $(PATH_TARGET)/$(TARGET).vac.obj \ 53 79 $(PATH_TARGET)/$(TARGET).vac.lst \ 80 $(TARGET2_VAC) \ 54 81 $(TARGET_LINKED_VAC) 55 82 … … 59 86 $(PATH_TARGET)/$(TARGET).gcc.obj \ 60 87 $(PATH_TARGET)/$(TARGET).gcc.lst \ 88 $(TARGET2_GCC) \ 61 89 $(TARGET_LINKED_GCC) 62 90 … … 79 107 80 108 81 $(PATH_TARGET)/$(TARGET).vac.exe: $(PATH_TARGET)/$(TARGET).vac.obj 82 icc - Gd -Ti+ /Fm$(PATH_TARGET)/$(TARGET).vac.map /B/LINENUMBERS /B/DBGPACK -Fe$@ $<109 $(PATH_TARGET)/$(TARGET).vac.exe: $(PATH_TARGET)/$(TARGET).vac.obj $(TARGET2_LINK_VAC) 110 icc -Ti+ /Fm$(PATH_TARGET)/$(TARGET).vac.map /B/LINENUMBERS /B/DBGPACK -Fe$@ $< $(TARGET2_LINK_VAC) 83 111 84 $(PATH_TARGET)/$(TARGET).gcc.exe: $(PATH_TARGET)/$(TARGET).gcc.obj 112 $(PATH_TARGET)/$(TARGET).gcc.exe: $(PATH_TARGET)/$(TARGET).gcc.obj $(TARGET2_LINK_GCC) 85 113 ifeq "$(TARGET_SRCEXT)" ".c" 86 if gcc -g -Zomf -Zcrtdll -Zmap=$(PATH_TARGET)/$(TARGET).gcc.map -o $@ -Zlinker "/LINENUMBERS /MAP:FULL /PM:VIO" $<; then true; else rm -f $@; false; fi114 if $(GCC) -g -Zomf -Zcrtdll -Zmap=$(PATH_TARGET)/$(TARGET).gcc.map -o $@ -Zlinker "/LINENUMBERS /MAP:FULL /PM:VIO" $< $(TARGET2_LINK_GCC); then true; else rm -f $@; false; fi 87 115 else 88 if g++ -g -Zomf -Zcrtdll -Zmap=$(PATH_TARGET)/$(TARGET).gcc.map -o $@ -Zlinker "/LINENUMBERS /MAP:FULL /PM:VIO" $<; then true; else rm -f $@; false; fi116 if $(GXX) -g -Zomf -Zcrtdll -Zmap=$(PATH_TARGET)/$(TARGET).gcc.map -o $@ -Zlinker "/LINENUMBERS /MAP:FULL /PM:VIO" $< $(TARGET2_LINK_GCC); then true; else rm -f $@; false; fi 89 117 endif 90 91 118 92 119 93 120 $(PATH_TARGET)/$(TARGET).vac.obj: $(TARGET_SOURCE) 94 121 icc -c -Gd -Ti+ -Fo$@ $< 122 $(PATH_TARGET)/$(TARGET2).vac.obj: $(TARGET2_SOURCE) 123 icc -c -Gd -Ti+ -Fo$@ $< 124 95 125 96 126 $(PATH_TARGET)/$(TARGET).gcc.obj: $(PATH_TARGET)/$(TARGET).gcc.o $(EMXOMF_DEP) 97 127 $(EMXOMF) -o $@ $< > $@.emxomf 2>&1 98 128 cat $@.emxomf 129 $(PATH_TARGET)/$(TARGET2).gcc.obj: $(PATH_TARGET)/$(TARGET2).gcc.o $(EMXOMF_DEP) 130 $(EMXOMF) -o $@ $< > $@.emxomf 2>&1 131 cat $@.emxomf 99 132 100 133 $(PATH_TARGET)/$(TARGET).gcc.o: $(TARGET_SOURCE) 101 gcc -c -g -o $@ $< 134 $(GCC) -c -g -o $@ $< 135 $(PATH_TARGET)/$(TARGET2).gcc.o: $(TARGET2_SOURCE) 136 $(GCC) -c -g -o $@ $< 102 137 103 138 $(PATH_TARGET)/$(TARGET).gcc.s: $(TARGET_SOURCE) 104 gcc -S -g -o $@ $< 139 $(GCC) -S -g -o $@ $< 140 $(PATH_TARGET)/$(TARGET2).gcc.s: $(TARGET2_SOURCE) 141 $(GCC) -S -g -o $@ $< 105 142 106 143 107 144 108 $(PATH_TARGET)/$(TARGET).vac.lst: $(PATH_TARGET)/$(TARGET).vac.obj $(LISTOMF_DEP) 145 $(PATH_TARGET)/$(TARGET).vac.lst: $(PATH_TARGET)/$(TARGET).vac.obj $(LISTOMF_DEP) 146 -$(LISTOMF) -x $< > $@ 147 $(PATH_TARGET)/$(TARGET2).vac.lst: $(PATH_TARGET)/$(TARGET2).vac.obj $(LISTOMF_DEP) 109 148 -$(LISTOMF) -x $< > $@ 110 149 111 $(PATH_TARGET)/$(TARGET).gcc.lst: $(PATH_TARGET)/$(TARGET).gcc.obj $(LISTOMF_DEP) 150 $(PATH_TARGET)/$(TARGET).gcc.lst: $(PATH_TARGET)/$(TARGET).gcc.obj $(LISTOMF_DEP) 151 -$(LISTOMF) -x $< > $@ 152 $(PATH_TARGET)/$(TARGET2).gcc.lst: $(PATH_TARGET)/$(TARGET2).gcc.obj $(LISTOMF_DEP) 112 153 -$(LISTOMF) -x $< > $@ 113 154 … … 129 170 $(PATH_TARGET)/$(TARGET).gcc.dump \ 130 171 $(PATH_TARGET)/$(TARGET).gcc.hlldump 172 ifdef TARGET2_VAC 173 rm -f \ 174 $(PATH_TARGET)/$(TARGET2).gcc.o \ 175 $(PATH_TARGET)/$(TARGET2).gcc.s \ 176 $(PATH_TARGET)/$(TARGET2).gcc.obj \ 177 $(PATH_TARGET)/$(TARGET2).gcc.lst \ 178 $(PATH_TARGET)/$(TARGET2).vac.obj \ 179 $(PATH_TARGET)/$(TARGET2).vac.lst 180 endif 131 181 182 -
Property cvs2svn:cvs-rev
changed from
-
trunk/testcase/456/globalstatic.cpp
-
Property cvs2svn:cvs-rev
changed from
1.1
to1.2
r723 r724 4 4 virtual long GetJavaWrapper(void) 5 5 { 6 static const char *pszFunction = __FUNCTION__;7 return *pszFunction ;6 static const char *pszFunctionMethod = __FUNCTION__; 7 return *pszFunctionMethod; 8 8 } 9 9 }; … … 12 12 int main() 13 13 { 14 static const char *pszFunction = __FUNCTION__;14 static const char *pszFunctionMain = __FUNCTION__; 15 15 foo obj; 16 int rc = obj.GetJavaWrapper() + *pszFunction ;16 int rc = obj.GetJavaWrapper() + *pszFunctionMain; 17 17 return rc; 18 18 } -
Property cvs2svn:cvs-rev
changed from
Note:
See TracChangeset
for help on using the changeset viewer.