1.1 --- a/make/windows/makefiles/adlc.make Mon Dec 19 14:16:23 2011 -0800
1.2 +++ b/make/windows/makefiles/adlc.make Tue Dec 20 00:55:02 2011 -0800
1.3 @@ -53,6 +53,17 @@
1.4 /I "$(WorkSpace)\src\os\windows\vm" \
1.5 /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm"
1.6
1.7 +!if "$(Platform_arch_model)" == "$(Platform_arch)"
1.8 +SOURCES_AD=\
1.9 + $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad \
1.10 + $(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm/windows_$(Platform_arch_model).ad
1.11 +!else
1.12 +SOURCES_AD=\
1.13 + $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad \
1.14 + $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch).ad \
1.15 + $(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm/windows_$(Platform_arch_model).ad
1.16 +!endif
1.17 +
1.18 # NOTE! If you add any files here, you must also update GENERATED_NAMES_IN_DIR
1.19 # and ProjectCreatorIDEOptions in projectcreator.make.
1.20 GENERATED_NAMES=\
1.21 @@ -105,7 +116,6 @@
1.22 $(ADLC) $(ADLCFLAGS) $(Platform_arch_model).ad
1.23 mv $(GENERATED_NAMES) $(AdlcOutDir)/
1.24
1.25 -$(Platform_arch_model).ad: $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad $(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm/windows_$(Platform_arch_model).ad
1.26 +$(Platform_arch_model).ad: $(SOURCES_AD)
1.27 rm -f $(Platform_arch_model).ad
1.28 - cat $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad \
1.29 - $(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm/windows_$(Platform_arch_model).ad >$(Platform_arch_model).ad
1.30 + cat $(SOURCES_AD) >$(Platform_arch_model).ad
