changeset 2566:d70894f69d55

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sun, 01 Feb 2015 21:04:46 -0800
parents 7a34ec7bb1c8 f8f95fcbcea3
children 30891b20979f
files
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/Makefile	Mon Dec 08 12:30:44 2014 -0800
+++ b/test/Makefile	Sun Feb 01 21:04:46 2015 -0800
@@ -36,6 +36,14 @@
     ARCH=i586
   endif
 endif
+ifneq ($(findstring $(OSNAME), BSD), )
+  PLATFORM = bsd
+  JT_PLATFORM = linux
+  ARCH = $(shell uname -p)
+  ifeq ($(ARCH), i386)
+    ARCH=i586
+  endif
+endif
 ifeq ($(OSNAME), Darwin)
   PLATFORM = bsd
   JT_PLATFORM = linux
--- a/test/tools/javah/ReadOldClass.sh	Mon Dec 08 12:30:44 2014 -0800
+++ b/test/tools/javah/ReadOldClass.sh	Sun Feb 01 21:04:46 2015 -0800
@@ -43,7 +43,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin | CYGWIN* )
+  SunOS | Linux | *BSD | Darwin | CYGWIN* )
     PS=":"
     FS="/"
     ;;