Mercurial > hg > release > icedtea6-1.6

view patches/hotspot/original/icedtea-explicit-target-arch.patch @ 1702:6cb729c4a876

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the normal (non-Zero/Shark) HotSpot original build work. 2010-03-10 Andrew John Hughes <ahughes@redhat.com> Fix the normal (non-Zero/Shark) build with the original HotSpot. * Makefile.am: Move format-warnings, fortify-source, 6791168 and includedb patch to set applied to all HotSpots. Add bytecodeInterpreter XSL fix back for original HotSpot. * patches/hotspot/default/icedtea-explicit-target-arch.patch: Move HotSpot chunk to separate hs14-specific file. * patches/hotspot/original/icedtea-6791168.patch, * patches/hotspot/original/icedtea-explicit-target-arch.patch, * patches/hotspot/original/icedtea-includedb.patch: New variants for original HotSpot (hs11). * patches/hotspot/original/icedtea-shark.patch: Fixed to apply to original HotSpot. * patches/icedtea-bytecodeInterpreterWithChecks.patch: Readded, reverting part of Gary's patch of 2009-05-08. * patches/icedtea-explicit-target-arch.patch: Remove HotSpot chunk and specialise it in HotSpot subdirectories.
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 11 Mar 2010 22:57:54 +0000
parents patches/icedtea-explicit-target-arch.patch@4501bcea5ffd
children
line wrap: on
line source

Index: openjdk/hotspot/make/linux/makefiles/defs.make
===================================================================
--- openjdk.orig/hotspot/build/linux/makefiles/defs.make	2009-05-18 14:09:57.812930043 +0200
+++ openjdk/hotspot/build/linux/makefiles/defs.make	2009-05-18 14:30:46.318871170 +0200
@@ -29,7 +29,11 @@
 SLASH_JAVA ?= /java
 
 # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
-ARCH:=$(shell uname -m)
+ifndef CROSS_COMPILATION
+  ARCH:=$(shell uname -m)
+else
+  ARCH:=$(CROSS_TARGET_ARCH)
+endif
 PATH_SEP = :
 ifeq ($(LP64), 1)
   ARCH_DATA_MODEL ?= 64