changeset 2653:2787ba758a1a

Revert to main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sat, 07 Oct 2017 16:28:54 -0700
parents e75618b257d0
children c5e686bd5a48
files common/autoconf/build-performance.m4 common/autoconf/libraries.m4 common/autoconf/platform.m4 common/autoconf/toolchain.m4
diffstat 4 files changed, 1 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/build-performance.m4	Sat Oct 07 16:00:22 2017 -0700
+++ b/common/autoconf/build-performance.m4	Sat Oct 07 16:28:54 2017 -0700
@@ -41,10 +41,6 @@
     # Looks like a MacOSX system
     NUM_CORES=`/usr/sbin/sysctl -n hw.ncpu`
     FOUND_CORES=yes
-  elif test -x /sbin/sysctl; then
-    # Looks like a BSD system
-    NUM_CORES=`/sbin/sysctl -n hw.ncpu`
-    FOUND_CORES=yes
   elif test "x$OPENJDK_BUILD_OS" = xaix ; then
     NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'`
     FOUND_CORES=yes
@@ -83,11 +79,6 @@
     MEMORY_SIZE=`/usr/sbin/sysctl -n hw.memsize`
     MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
     FOUND_MEM=yes
-  elif test -x /sbin/sysctl; then
-    # Looks like a BSD system
-    MEMORY_SIZE=`/sbin/sysctl -n hw.physmem`
-    MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
-    FOUND_MEM=yes
   elif test "x$OPENJDK_BUILD_OS" = xwindows; then
     # Windows, but without cygwin
     MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
--- a/common/autoconf/libraries.m4	Sat Oct 07 16:00:22 2017 -0700
+++ b/common/autoconf/libraries.m4	Sat Oct 07 16:28:54 2017 -0700
@@ -174,16 +174,6 @@
   LIBDL="$LIBS"
   AC_SUBST(LIBDL)
   LIBS="$save_LIBS"
-  
-  # The iconv library
-  ICONV_LIBS=-liconv
-  if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then
-    ICONV_CFLAGS="-I/usr/local/include"
-  else
-    ICONV_CFLAGS=
-  fi
-  AC_SUBST(ICONV_LIBS)
-  AC_SUBST(ICONV_CFLAGS)
 
   # Deprecated libraries, keep the flags for backwards compatibility
   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
--- a/common/autoconf/platform.m4	Sat Oct 07 16:00:22 2017 -0700
+++ b/common/autoconf/platform.m4	Sat Oct 07 16:28:54 2017 -0700
@@ -123,14 +123,6 @@
     *bsd*)
       VAR_OS=bsd
       VAR_OS_TYPE=unix
-      case "$1" in
-        *freebsd*)
-          VAR_OS_ENV=bsd.freebsd ;;
-        *openbsd*)
-          VAR_OS_ENV=bsd.openbsd ;;
-        *netbsd*)
-          VAR_OS_ENV=bsd.netbsd ;;
-      esac
       ;;
     *cygwin*)
       VAR_OS=windows
@@ -226,11 +218,6 @@
 
   AC_MSG_CHECKING([openjdk-target os-cpu])
   AC_MSG_RESULT([$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
-
-  if test "x$OPENJDK_TARGET_OS_ENV" != "x$OPENJDK_TARGET_OS"; then
-    AC_MSG_CHECKING([openjdk-target os-env])
-    AC_MSG_RESULT([$OPENJDK_TARGET_OS_ENV])
-  fi
 ])
 
 # Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behaviour
@@ -476,26 +463,6 @@
   else
     OPENJDK_MODULE_TARGET_OS_NAME="$OPENJDK_TARGET_OS"
   fi
-  if test "x$OPENJDK_TARGET_OS" = "xbsd"; then
-    case "${OPENJDK_TARGET_OS_ENV}" in
-      bsd.freebsd)
-        REQUIRED_OS_NAME=FreeBSD
-        REQUIRED_OS_VERSION=9.0
-        ;;
-      bsd.openbsd)
-        REQUIRED_OS_NAME=OpenBSD
-        REQUIRED_OS_VERSION=5.0
-        ;;
-      bsd.netbsd)
-        REQUIRED_OS_NAME=NetBSD
-        REQUIRED_OS_VERSION=6.0
-        ;;
-      *)
-        REQUIRED_OS_NAME=BSD
-        REQUIRED_OS_VERSION=1.0
-        ;;
-    esac
-  fi
 
   if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
     OPENJDK_MODULE_TARGET_OS_ARCH="amd64"
@@ -590,11 +557,6 @@
     JVM_LDFLAGS="$JVM_LDFLAGS ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
     JVM_ASFLAGS="$JVM_ASFLAGS ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
   fi
-  if test "x$OPENJDK_TARGET_OS" = xbsd; then
-    JVM_CFLAGS="$JVM_CFLAGS ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-    JVM_LDFLAGS="$JVM_LDFLAGS ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-    JVM_ASFLAGS="$JVM_ASFLAGS ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-  fi
 
   # Make compilation sanity check
   AC_CHECK_HEADERS([stdio.h], , [
--- a/common/autoconf/toolchain.m4	Sat Oct 07 16:00:22 2017 -0700
+++ b/common/autoconf/toolchain.m4	Sat Oct 07 16:28:54 2017 -0700
@@ -40,7 +40,6 @@
 VALID_TOOLCHAINS_linux="gcc clang"
 VALID_TOOLCHAINS_solaris="solstudio"
 VALID_TOOLCHAINS_macosx="gcc clang"
-VALID_TOOLCHAINS_bsd="clang gcc"
 VALID_TOOLCHAINS_aix="xlc"
 VALID_TOOLCHAINS_windows="microsoft"
 
@@ -172,10 +171,6 @@
   # Use indirect variable referencing
   toolchain_var_name=VALID_TOOLCHAINS_$OPENJDK_BUILD_OS
   VALID_TOOLCHAINS=${!toolchain_var_name}
-  if test "x$VALID_TOOLCHAINS" = x; then
-    # For portability, assume gcc and clang for unknown platforms
-    VALID_TOOLCHAINS="gcc clang"
-  fi
 
   if test "x$OPENJDK_TARGET_OS" = xmacosx; then
     if test -n "$XCODEBUILD"; then
@@ -676,7 +671,7 @@
 
   # objcopy is used for moving debug symbols to separate files when
   # full debug symbols are enabled.
-  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xbsd; then
+  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
     BASIC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
     # Only call fixup if objcopy was found.
     if test -n "$OBJCOPY"; then