make/common/shared/Platform.gmk

*** 1,7 ****
  #
! # Copyright (c) 1997, 20010, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 153,163 ****
--- 153,167 ----
  
  # Platform settings specific to Linux
  ifeq ($(SYSTEM_UNAME), Linux)
    PLATFORM = linux
    # Arch and OS name/version
+   ifdef CROSS_COMPILE_ARCH
+     mach := $(CROSS_COMPILE_ARCH)
+   else
      mach := $(shell uname -m)
+   endif
    archExpr = case "$(mach)" in \
                  i[3-9]86) \
                      echo i586 \
                      ;; \
                  ia64) \
*** 190,206 ****
        ARCH=sparc
      else
        ARCH=sparcv9
      endif
    else
!     # i586 is 32-bit, amd64 is 64-bit
      ifndef ARCH_DATA_MODEL
-       ifeq ($(ARCH), i586)
          ARCH_DATA_MODEL=32
!       else
          ARCH_DATA_MODEL=64
        endif
      endif
    endif
  
    # Need to maintain the jre/lib/i386 location for 32-bit Intel
    ifeq ($(ARCH), i586)
--- 194,212 ----
        ARCH=sparc
      else
        ARCH=sparcv9
      endif
    else
!     # Most archs are 32-bit
      ifndef ARCH_DATA_MODEL
        ARCH_DATA_MODEL=32
!       ifeq ($(ARCH), amd64)
          ARCH_DATA_MODEL=64
        endif
+       ifeq ($(ARCH), ia64)
+         ARCH_DATA_MODEL=64
+       endif
      endif
    endif
  
    # Need to maintain the jre/lib/i386 location for 32-bit Intel
    ifeq ($(ARCH), i586)