1.1 --- a/make/linux/makefiles/defs.make Thu Dec 10 14:51:53 2015 +0300
1.2 +++ b/make/linux/makefiles/defs.make Thu Dec 17 17:17:31 2015 -0800
1.3 @@ -69,7 +69,7 @@
1.4 endif
1.5
1.6 # sparc
1.7 -ifeq ($(ARCH), sparc64)
1.8 +ifneq (,$(findstring $(ARCH), sparc))
1.9 ifeq ($(ARCH_DATA_MODEL), 64)
1.10 ARCH_DATA_MODEL = 64
1.11 MAKE_ARGS += LP64=1
1.12 @@ -83,39 +83,33 @@
1.13 HS_ARCH = sparc
1.14 endif
1.15
1.16 -# amd64/x86_64
1.17 -ifneq (,$(findstring $(ARCH), amd64 x86_64))
1.18 +# i686/i586 and amd64/x86_64
1.19 +ifneq (,$(findstring $(ARCH), amd64 x86_64 i686 i586))
1.20 ifeq ($(ARCH_DATA_MODEL), 64)
1.21 ARCH_DATA_MODEL = 64
1.22 MAKE_ARGS += LP64=1
1.23 PLATFORM = linux-amd64
1.24 VM_PLATFORM = linux_amd64
1.25 - HS_ARCH = x86
1.26 else
1.27 ARCH_DATA_MODEL = 32
1.28 PLATFORM = linux-i586
1.29 VM_PLATFORM = linux_i486
1.30 - HS_ARCH = x86
1.31 - # We have to reset ARCH to i686 since SRCARCH relies on it
1.32 - ARCH = i686
1.33 endif
1.34 + HS_ARCH = x86
1.35 endif
1.36
1.37 -# i686/i586 ie 32-bit x86
1.38 -ifneq (,$(findstring $(ARCH), i686 i586))
1.39 - ARCH_DATA_MODEL = 32
1.40 - PLATFORM = linux-i586
1.41 - VM_PLATFORM = linux_i486
1.42 - HS_ARCH = x86
1.43 -endif
1.44 -
1.45 -# PPC64
1.46 -ifeq ($(ARCH), ppc64)
1.47 - ARCH_DATA_MODEL = 64
1.48 - MAKE_ARGS += LP64=1
1.49 - PLATFORM = linux-ppc64
1.50 - VM_PLATFORM = linux_ppc64
1.51 - HS_ARCH = ppc
1.52 +# PPC
1.53 +ifneq (,$(findstring $(ARCH), ppc))
1.54 + ifeq ($(ARCH_DATA_MODEL), 64)
1.55 + MAKE_ARGS += LP64=1
1.56 + PLATFORM = linux-ppc64
1.57 + VM_PLATFORM = linux_ppc64
1.58 + else
1.59 + ARCH_DATA_MODEL = 32
1.60 + PLATFORM = linux-ppc
1.61 + VM_PLATFORM = linux_ppc
1.62 + endif
1.63 + HS_ARCH = ppc
1.64 endif
1.65
1.66 # On 32 bit linux we build server and client, on 64 bit just server.
