changeset 3061:7e0c4a05eacf

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Mon, 25 Jan 2016 21:17:09 -0800
parents 48d0c20256a3 a1111c045a69
children ff972486658b
files
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/Makefile	Tue Dec 22 12:14:51 2015 -0800
+++ b/test/Makefile	Mon Jan 25 21:17:09 2016 -0800
@@ -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 Dec 22 12:14:51 2015 -0800
+++ b/test/tools/javah/ReadOldClass.sh	Mon Jan 25 21:17:09 2016 -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="/"
     ;;