changeset 2976:a1111c045a69

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sat, 24 Oct 2015 06:21:03 -0700
parents ad3f528335b4 6cbe1580e9e2
children 7e0c4a05eacf
files
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/Makefile	Tue Oct 06 12:17:30 2015 -0700
+++ b/test/Makefile	Sat Oct 24 06:21:03 2015 -0700
@@ -34,6 +34,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
   ARCH = $(shell uname -m)
--- a/test/tools/javah/ReadOldClass.sh	Tue Oct 06 12:17:30 2015 -0700
+++ b/test/tools/javah/ReadOldClass.sh	Sat Oct 24 06:21:03 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="/"
     ;;