*** old/make/linux/makefiles/defs.make	Tue Sep 25 08:03:38 2012
--- new/make/linux/makefiles/defs.make	Tue Sep 25 08:03:32 2012

*** 27,38 ****
--- 27,44 ----
  # This file is included into make/defs.make.
  
  SLASH_JAVA ?= /java
  
  # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
  ARCH:=$(shell uname -m)
  PATH_SEP = :
+ 
+ # ARCH can be set explicitly in spec.gmk
+ ifndef ARCH
+   ARCH := $(shell uname -m)
+ endif
+ 
+ PATH_SEP ?= :
+ 
  ifeq ($(LP64), 1)
    ARCH_DATA_MODEL ?= 64
  else
    ARCH_DATA_MODEL ?= 32
  endif

*** 70,81 ****
--- 76,87 ----
      VM_PLATFORM      = linux_sparc
    endif
    HS_ARCH            = sparc
  endif
  
! # amd64/x86_64
! ifeq ($(ARCH), x86_64) 
! ifneq (,$(findstring $(ARCH), amd64 x86_64))
    ifeq ($(ARCH_DATA_MODEL), 64)
      ARCH_DATA_MODEL = 64
      MAKE_ARGS       += LP64=1
      PLATFORM        = linux-amd64
      VM_PLATFORM     = linux_amd64

*** 88,99 ****
--- 94,105 ----
      # We have to reset ARCH to i686 since SRCARCH relies on it
      ARCH            = i686   
    endif
  endif
  
! # i686/i586 ie 32-bit x86
! ifeq ($(ARCH), i686)
! ifneq (,$(findstring $(ARCH), i686 i586))
    ARCH_DATA_MODEL  = 32
    PLATFORM         = linux-i586
    VM_PLATFORM      = linux_i486
    HS_ARCH          = x86
  endif