Mercurial > hg > truffle
comparison make/defs.make @ 14883:54fa8e06831c
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 17 Mar 2014 16:43:34 +0100 |
parents | d8041d695d19 |
children | 4ca6dc0799b6 |
comparison
equal
deleted
inserted
replaced
14882:6b579d35f95e | 14883:54fa8e06831c |
---|---|
174 OS=bsd | 174 OS=bsd |
175 endif | 175 endif |
176 HOST := $(shell uname -n) | 176 HOST := $(shell uname -n) |
177 endif | 177 endif |
178 | 178 |
179 # If not SunOS, not Linux and not BSD, assume Windows | 179 # If not SunOS, not Linux not BSD and not AIX, assume Windows |
180 ifneq ($(OS), Linux) | 180 ifneq ($(OS), Linux) |
181 ifneq ($(OS), SunOS) | 181 ifneq ($(OS), SunOS) |
182 ifneq ($(OS), bsd) | 182 ifneq ($(OS), bsd) |
183 OSNAME=windows | 183 ifneq ($(OS), AIX) |
184 OSNAME=windows | |
185 else | |
186 OSNAME=aix | |
187 endif | |
184 else | 188 else |
185 OSNAME=bsd | 189 OSNAME=bsd |
186 endif | 190 endif |
187 else | 191 else |
188 OSNAME=solaris | 192 OSNAME=solaris |
267 # BUILDARCH - build directory | 271 # BUILDARCH - build directory |
268 # LIBARCH - directory name in JDK/JRE | 272 # LIBARCH - directory name in JDK/JRE |
269 | 273 |
270 # Use uname output for SRCARCH, but deal with platform differences. If ARCH | 274 # Use uname output for SRCARCH, but deal with platform differences. If ARCH |
271 # is not explicitly listed below, it is treated as x86. | 275 # is not explicitly listed below, it is treated as x86. |
272 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc zero,$(ARCH))) | 276 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc ppc64 zero,$(ARCH))) |
273 ARCH/ = x86 | 277 ARCH/ = x86 |
274 ARCH/sparc = sparc | 278 ARCH/sparc = sparc |
275 ARCH/sparc64= sparc | 279 ARCH/sparc64= sparc |
276 ARCH/ia64 = ia64 | 280 ARCH/ia64 = ia64 |
277 ARCH/amd64 = x86 | 281 ARCH/amd64 = x86 |
293 ifeq ($(BUILDARCH), sparc) | 297 ifeq ($(BUILDARCH), sparc) |
294 ifdef LP64 | 298 ifdef LP64 |
295 BUILDARCH = sparcv9 | 299 BUILDARCH = sparcv9 |
296 endif | 300 endif |
297 endif | 301 endif |
302 ifeq ($(BUILDARCH), ppc) | |
303 ifdef LP64 | |
304 BUILDARCH = ppc64 | |
305 endif | |
306 endif | |
298 | 307 |
299 # LIBARCH is 1:1 mapping from BUILDARCH | 308 # LIBARCH is 1:1 mapping from BUILDARCH |
300 LIBARCH = $(LIBARCH/$(BUILDARCH)) | 309 LIBARCH = $(LIBARCH/$(BUILDARCH)) |
301 LIBARCH/i486 = i386 | 310 LIBARCH/i486 = i386 |
302 LIBARCH/amd64 = amd64 | 311 LIBARCH/amd64 = amd64 |
303 LIBARCH/sparc = sparc | 312 LIBARCH/sparc = sparc |
304 LIBARCH/sparcv9 = sparcv9 | 313 LIBARCH/sparcv9 = sparcv9 |
305 LIBARCH/ia64 = ia64 | 314 LIBARCH/ia64 = ia64 |
306 LIBARCH/ppc64 = ppc | 315 LIBARCH/ppc64 = ppc64 |
307 LIBARCH/ppc = ppc | 316 LIBARCH/ppc = ppc |
308 LIBARCH/arm = arm | 317 LIBARCH/arm = arm |
309 LIBARCH/zero = $(ZERO_LIBARCH) | 318 LIBARCH/zero = $(ZERO_LIBARCH) |
310 | 319 |
311 LP64_ARCH = sparcv9 amd64 ia64 zero | 320 LP64_ARCH = sparcv9 amd64 ia64 ppc64 zero |
312 endif | 321 endif |
313 | 322 |
314 # Required make macro settings for all platforms | 323 # Required make macro settings for all platforms |
315 MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR) | 324 MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR) |
316 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) | 325 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) |