changeset 2786:18022f264e4d

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sat, 18 Jul 2015 13:32:23 -0700
parents e27a094cb423 814541dd1ddb
children 6cbe1580e9e2
files
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/Makefile	Mon Jun 01 11:44:19 2015 -0700
+++ b/test/Makefile	Sat Jul 18 13:32:23 2015 -0700
@@ -36,6 +36,14 @@
     ARCH=i586
   endif
 endif
+ifneq ($(findstring BSD, $(OSNAME)), )
+  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 Jun 01 11:44:19 2015 -0700
+++ b/test/tools/javah/ReadOldClass.sh	Sat Jul 18 13:32:23 2015 -0700
@@ -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="/"
     ;;