equal
deleted
inserted
replaced
190 # BUILDARCH - build directory |
190 # BUILDARCH - build directory |
191 # LIBARCH - directory name in JDK/JRE |
191 # LIBARCH - directory name in JDK/JRE |
192 |
192 |
193 # Use uname output for SRCARCH, but deal with platform differences. If ARCH |
193 # Use uname output for SRCARCH, but deal with platform differences. If ARCH |
194 # is not explicitly listed below, it is treated as x86. |
194 # is not explicitly listed below, it is treated as x86. |
195 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 zero,$(ARCH))) |
195 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc zero,$(ARCH))) |
196 ARCH/ = x86 |
196 ARCH/ = x86 |
197 ARCH/sparc = sparc |
197 ARCH/sparc = sparc |
198 ARCH/sparc64= sparc |
198 ARCH/sparc64= sparc |
199 ARCH/ia64 = ia64 |
199 ARCH/ia64 = ia64 |
200 ARCH/amd64 = x86 |
200 ARCH/amd64 = x86 |
201 ARCH/x86_64 = x86 |
201 ARCH/x86_64 = x86 |
|
202 ARCH/ppc64 = ppc |
|
203 ARCH/ppc = ppc |
|
204 ARCH/arm = arm |
202 ARCH/zero = zero |
205 ARCH/zero = zero |
203 |
206 |
204 # BUILDARCH is usually the same as SRCARCH, except for sparcv9 |
207 # BUILDARCH is usually the same as SRCARCH, except for sparcv9 |
205 BUILDARCH = $(SRCARCH) |
208 BUILDARCH = $(SRCARCH) |
206 ifeq ($(BUILDARCH), x86) |
209 ifeq ($(BUILDARCH), x86) |
221 LIBARCH/i486 = i386 |
224 LIBARCH/i486 = i386 |
222 LIBARCH/amd64 = amd64 |
225 LIBARCH/amd64 = amd64 |
223 LIBARCH/sparc = sparc |
226 LIBARCH/sparc = sparc |
224 LIBARCH/sparcv9 = sparcv9 |
227 LIBARCH/sparcv9 = sparcv9 |
225 LIBARCH/ia64 = ia64 |
228 LIBARCH/ia64 = ia64 |
|
229 LIBARCH/ppc64 = ppc |
|
230 LIBARCH/ppc = ppc |
|
231 LIBARCH/arm = arm |
226 LIBARCH/zero = $(ZERO_LIBARCH) |
232 LIBARCH/zero = $(ZERO_LIBARCH) |
227 |
233 |
228 LP64_ARCH = sparcv9 amd64 ia64 zero |
234 LP64_ARCH = sparcv9 amd64 ia64 zero |
229 endif |
235 endif |
230 |
236 |