make/linux/makefiles/defs.make

Print this page
rev 6626 : 8048232: Fix for 8046471 breaks PPC64 build
Reviewed-by: mikael


  91     PLATFORM        = linux-amd64
  92     VM_PLATFORM     = linux_amd64
  93   else
  94     ARCH_DATA_MODEL = 32
  95     PLATFORM        = linux-i586
  96     VM_PLATFORM     = linux_i486
  97   endif
  98 
  99   HS_ARCH           = x86
 100 endif
 101 
 102 # ARM
 103 ifeq ($(ARCH), arm)
 104   ARCH_DATA_MODEL  = 32
 105   PLATFORM         = linux-arm
 106   VM_PLATFORM      = linux_arm
 107   HS_ARCH          = arm
 108 endif
 109 
 110 # PPC
 111 ifneq (,$(findstring $(ARCH), ppc))


 112   ifeq ($(ARCH_DATA_MODEL), 64)
 113     MAKE_ARGS        += LP64=1
 114     PLATFORM         = linux-ppc64
 115     VM_PLATFORM      = linux_ppc64
 116   else
 117     ARCH_DATA_MODEL  = 32
 118     PLATFORM         = linux-ppc
 119     VM_PLATFORM      = linux_ppc
 120   endif
 121 
 122   HS_ARCH = ppc
 123 endif
 124 
 125 # On 32 bit linux we build server and client, on 64 bit just server.
 126 ifeq ($(JVM_VARIANTS),)
 127   ifeq ($(ARCH_DATA_MODEL), 32)
 128     JVM_VARIANTS:=client,server
 129     JVM_VARIANT_CLIENT:=true
 130     JVM_VARIANT_SERVER:=true
 131   else




  91     PLATFORM        = linux-amd64
  92     VM_PLATFORM     = linux_amd64
  93   else
  94     ARCH_DATA_MODEL = 32
  95     PLATFORM        = linux-i586
  96     VM_PLATFORM     = linux_i486
  97   endif
  98 
  99   HS_ARCH           = x86
 100 endif
 101 
 102 # ARM
 103 ifeq ($(ARCH), arm)
 104   ARCH_DATA_MODEL  = 32
 105   PLATFORM         = linux-arm
 106   VM_PLATFORM      = linux_arm
 107   HS_ARCH          = arm
 108 endif
 109 
 110 # PPC
 111 # Notice: after 8046471 ARCH will be 'ppc' for top-level ppc64 builds but
 112 # 'ppc64' for HotSpot-only ppc64 builds. Need to detect both variants here!
 113 ifneq (,$(findstring $(ARCH), ppc ppc64))
 114   ifeq ($(ARCH_DATA_MODEL), 64)
 115     MAKE_ARGS        += LP64=1
 116     PLATFORM         = linux-ppc64
 117     VM_PLATFORM      = linux_ppc64
 118   else
 119     ARCH_DATA_MODEL  = 32
 120     PLATFORM         = linux-ppc
 121     VM_PLATFORM      = linux_ppc
 122   endif
 123 
 124   HS_ARCH = ppc
 125 endif
 126 
 127 # On 32 bit linux we build server and client, on 64 bit just server.
 128 ifeq ($(JVM_VARIANTS),)
 129   ifeq ($(ARCH_DATA_MODEL), 32)
 130     JVM_VARIANTS:=client,server
 131     JVM_VARIANT_CLIENT:=true
 132     JVM_VARIANT_SERVER:=true
 133   else