infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-12 17:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8046471: Use OPENJDK_TARGET_CPU_ARCH instead of legacy value for hotspot ARCH

Browse Source 
Reviewed-by: erikj, dholmes
This commit is contained in:
Mikael Vidstedt 2014-06-18 12:35:32 -07:00
parent fe70c75531
commit abce44ab84
1 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
hotspot/make/linux/makefiles/defs.make
View File

@ -69,7 +69,7 @@ ifeq ($(ARCH), ia64)
endif
# sparc
ifeq ($(ARCH), sparc64)
ifneq (,$(findstring $(ARCH), sparc))
ifeq ($(ARCH_DATA_MODEL), 64)
ARCH_DATA_MODEL = 64
MAKE_ARGS += LP64=1
@ -83,30 +83,20 @@ ifeq ($(ARCH), sparc64)
HS_ARCH = sparc
endif
# amd64/x86_64
ifneq (,$(findstring $(ARCH), amd64 x86_64))
# i686/i586 and amd64/x86_64
ifneq (,$(findstring $(ARCH), amd64 x86_64 i686 i586))
ifeq ($(ARCH_DATA_MODEL), 64)
ARCH_DATA_MODEL = 64
MAKE_ARGS += LP64=1
PLATFORM = linux-amd64
VM_PLATFORM = linux_amd64
HS_ARCH = x86
else
ARCH_DATA_MODEL = 32
PLATFORM = linux-i586
VM_PLATFORM = linux_i486
HS_ARCH = x86
# We have to reset ARCH to i686 since SRCARCH relies on it
ARCH = i686
endif
endif
# i686/i586 ie 32-bit x86
ifneq (,$(findstring $(ARCH), i686 i586))
ARCH_DATA_MODEL = 32
PLATFORM = linux-i586
VM_PLATFORM = linux_i486
HS_ARCH = x86
HS_ARCH = x86
endif
# ARM
@ -118,20 +108,18 @@ ifeq ($(ARCH), arm)
endif
# PPC
ifeq ($(ARCH), ppc)
ARCH_DATA_MODEL = 32
PLATFORM = linux-ppc
VM_PLATFORM = linux_ppc
HS_ARCH = ppc
endif
ifneq (,$(findstring $(ARCH), ppc))
ifeq ($(ARCH_DATA_MODEL), 64)
MAKE_ARGS += LP64=1
PLATFORM = linux-ppc64
VM_PLATFORM = linux_ppc64
else
ARCH_DATA_MODEL = 32
PLATFORM = linux-ppc
VM_PLATFORM = linux_ppc
endif
# PPC64
ifeq ($(ARCH), ppc64)
ARCH_DATA_MODEL = 64
MAKE_ARGS += LP64=1
PLATFORM = linux-ppc64
VM_PLATFORM = linux_ppc64
HS_ARCH = ppc
HS_ARCH = ppc
endif
# On 32 bit linux we build server and client, on 64 bit just server.