Merge pull request #48 from ev3dev-lang-java/feature/remove_softfloat

Remove SoftFloat-3e

Author: jabrena

packaging/debian/copyright

@@ -2278,39 +2278,6 @@ with JRE 8, JDK 8, and OpenJDK 8.
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to SoftFloat version 2b, which may be
-included with JRE 8, JDK 8, and OpenJDK 8 on Linux/ARM.
-
---- begin of LICENSE ---
-
-Use of any of this software is governed by the terms of the license below:
-
-SoftFloat was written by me, John R. Hauser. This work was made possible in
-part by the International Computer Science Institute, located at Suite 600,
-1947 Center Street, Berkeley, California 94704. Funding was partially
-provided by the National Science Foundation under grant MIP-9311980. The
-original version of this code was written as part of a project to build
-a fixed-point vector processor in collaboration with the University of
-California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL
-LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO
-FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER
-SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES,
-COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE
-SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, provided
-that the minimal documentation requirements stated in the source code are
-satisfied.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
 %% This notice is provided with respect to Sparkle 1.5,
 which may be included with JRE 8 on Mac OS X.
 
@@ -3632,42 +3599,3 @@ debian/dbg8.py:
 On Debian systems a full copy of the GNU General Public License, GPL, can be
 found in the file /usr/share/common-licenses/GPL-2.
 
--------------------------------------------------------------------------------
-
-
-License for Berkeley SoftFloat Release 3e
-
-John R. Hauser
-2018 January 20
-
-The following applies to the whole of SoftFloat Release 3e as well as to
-each source file individually.
-
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the
-University of California.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
-    this list of conditions, and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions, and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
- 3. Neither the name of the University nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
-DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

scripts/build.sh

@@ -5,13 +5,6 @@ cd "$(dirname ${BASH_SOURCE[0]})"
 source config.sh
 source "$BUILDDIR/metadata"
 
-if [ "$SFLT_NEEDED" == "true" ]; then
-  echo "[BUILD] Building softfloat support"
-  cd "$SFLTBUILD"
-  make
-  make DESTDIR="$SFLTPFX" install
-fi
-
 cd "$JDKDIR"
 
 # refresh patched build system
@@ -34,7 +27,6 @@ fi
 #   - Force softfloat runtime:  -D__SOFTFP__
 # Fix the "internal" string:   --with-version-string="<version>"
 # Use correct JNI path:        --with-jni-libpath=<dir1>:<dir2>...
-# Use softfloat libraries:     --with-softfloat-lib=<softfloat.a> --with-softfloat-include=<dirname softfloat.h>
 # Use AdoptOpenJDK CA certs:   --with-cacerts-file=<path>
 # Use correct debug level      --with-debug-level=<level>
 # Help to find freetype:       --with-freetype-lib=/usr/lib/arm-linux-gnueabi
@@ -65,7 +57,6 @@ if [ "$JDKPLATFORM" == "ev3" ]; then
                    --disable-warnings-as-errors \
                    --with-version-string="$JAVA_VERSION" \
                    $JNI_PATH_FLAGS \
-                   $SOFTFLOAT_FLAGS \
                    $VENDOR_FLAGS \
                    --with-cacerts-file="$CACERTFILE" \
                    --with-debug-level=$HOTSPOT_DEBUG \

scripts/config.sh

@@ -6,14 +6,6 @@ SCRIPTDIR="$( cd "$(dirname "$0")" ; pwd -P )"
 BUILDDIR="/build"
 # jdk repository directory
 JDKDIR="$BUILDDIR/jdk"
-# softfloat repository directory
-SFLTDIR="$BUILDDIR/sflt"
-# softfloat repository
-SFLTREPO="https://github.com/ev3dev-lang-java/softfloat-openjdk.git"
-# softfloat build directory
-SFLTBUILD="$SFLTDIR/build/Linux-ARM-VFPv2-GCC-OpenJDK"
-# softfloat license
-SFLTPFX="$SFLTDIR/output"
 # openjdk-build repo dir
 ABLDDIR="$BUILDDIR/openjdk-build"
 # openjdk-build repo
@@ -166,7 +158,6 @@ if [ "$JDKVER" == "9" ]; then
   IMAGEDIR="$JDKDIR/build/linux-arm-normal-${JDKVM}-${HOTSPOT_DEBUG}/images"
   HOTSPOT_ABI=arm926ejs
   JNI_PATH_FLAGS=
-  SOFTFLOAT_FLAGS=
   VENDOR_FLAGS=
 
 # OpenJDK 10
@@ -189,7 +180,6 @@ elif [ "$JDKVER" == "10" ]; then
   IMAGEDIR="$JDKDIR/build/linux-arm-normal-${JDKVM}-${HOTSPOT_DEBUG}/images"
   HOTSPOT_ABI=arm926ejs
   JNI_PATH_FLAGS=
-  SOFTFLOAT_FLAGS=
 
 # OpenJDK 11
 elif [ "$JDKVER" == "11" ]; then
@@ -217,7 +207,6 @@ elif [ "$JDKVER" == "11" ]; then
   IMAGEDIR="$JDKDIR/build/linux-arm-normal-${JDKVM}-${HOTSPOT_DEBUG}/images"
   HOTSPOT_ABI=arm926ejs
   JNI_PATH_FLAGS=
-  SOFTFLOAT_FLAGS=
 
 # OpenJDK 12
 elif [ "$JDKVER" == "12" ]; then
@@ -245,10 +234,6 @@ elif [ "$JDKVER" == "12" ]; then
   IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
   HOTSPOT_ABI=arm-sflt
   JNI_PATH_FLAGS="--with-jni-libpath=/usr/lib/$DEB_HOST_MULTIARCH/jni:/lib/$DEB_HOST_MULTIARCH:/usr/lib/$DEB_HOST_MULTIARCH:/usr/lib/jni:/lib:/usr/lib"
-  SOFTFLOAT_FLAGS="--with-sflt=$SFLTPFX"
-  if [ "$JDKPLATFORM" == "ev3" ]; then
-    SFLT_NEEDED=true
-  fi
 
 # OpenJDK 13
 elif [ "$JDKVER" == "13" ]; then
@@ -276,10 +261,6 @@ elif [ "$JDKVER" == "13" ]; then
   IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
   HOTSPOT_ABI=arm-sflt
   JNI_PATH_FLAGS="--with-jni-libpath=/usr/lib/$DEB_HOST_MULTIARCH/jni:/lib/$DEB_HOST_MULTIARCH:/usr/lib/$DEB_HOST_MULTIARCH:/usr/lib/jni:/lib:/usr/lib"
-  SOFTFLOAT_FLAGS="--with-sflt=$SFLTPFX"
-  if [ "$JDKPLATFORM" == "ev3" ]; then
-    SFLT_NEEDED=true
-  fi
 
 # OpenJDK Loom & Master+dev
 elif [ "$JDKVER" == "loom" ] || [ "$JDKVER" == "tip" ]; then
@@ -314,10 +295,6 @@ elif [ "$JDKVER" == "loom" ] || [ "$JDKVER" == "tip" ]; then
   IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
   HOTSPOT_ABI=arm-sflt
   JNI_PATH_FLAGS="--with-jni-libpath=/usr/lib/$DEB_HOST_MULTIARCH/jni:/lib/$DEB_HOST_MULTIARCH:/usr/lib/$DEB_HOST_MULTIARCH:/usr/lib/jni:/lib:/usr/lib"
-  SOFTFLOAT_FLAGS="--with-sflt=$SFLTPFX"
-  if [ "$JDKPLATFORM" == "ev3" ]; then
-    SFLT_NEEDED=true
-  fi
 
 # invalid or unset version
 else

scripts/fetch.sh

@@ -105,6 +105,12 @@ if [ ! -d "$JDKDIR" ]; then
     PATCHES="$PATCHES main"
   fi
 
+  # replacement for softfloat patch
+  if [ -f "$SCRIPTDIR/${PATCHVER}_nosflt.patch" ]; then
+    patch -p1 -i "$SCRIPTDIR/${PATCHVER}_nosflt.patch"
+    PATCHES="$PATCHES nosflt"
+  fi
+
   # debian library path
   if [ -f "$SCRIPTDIR/${PATCHVER}_lib.patch" ]; then
     patch -p1 -i "$SCRIPTDIR/${PATCHVER}_lib.patch"
@@ -147,13 +153,6 @@ else
 fi
 
 
-if [ ! -d "$SFLTDIR" ] && [ "$SFLT_NEEDED" == "true" ]; then
-  # clone the root project
-  echo "[FETCH] Cloning SoftFloat repo"
-  git clone --depth 1 "$SFLTREPO" "$SFLTDIR"
-fi
-
-
 if [ -d "$ABLDDIR" ]; then
   rm -rf "$ABLDDIR"
 fi

scripts/jdk11.patch

@@ -49,22 +49,6 @@ index 53d6d17de..f52495086 100644
        bool preserve_tmp = (reg == noreg);
        if(preserve_tmp) {
          reg = Rtemp;
-@@ -1239,10 +1239,11 @@ extern int  __aeabi_dcmpgt(double, double);
- 
- // Imported code from glibc soft-fp bundle for
- // calculation accuracy improvement. See CR 6757269.
--extern double __aeabi_fadd_glibc(float, float);
--extern double __aeabi_fsub_glibc(float, float);
--extern double __aeabi_dadd_glibc(double, double);
--extern double __aeabi_dsub_glibc(double, double);
-+#define __aeabi_fadd_glibc __aeabi_fadd
-+#define __aeabi_fsub_glibc __aeabi_fsub
-+#define __aeabi_dadd_glibc __aeabi_dadd
-+#define __aeabi_dsub_glibc __aeabi_dsub
-+
- };
- #endif // __SOFTFP__
- 
 diff --git a/src/hotspot/cpu/arm/vm_version_arm_32.cpp b/src/hotspot/cpu/arm/vm_version_arm_32.cpp
 index df0fb2ecf..f15dabd45 100644
 --- a/src/hotspot/cpu/arm/vm_version_arm_32.cpp

scripts/jdk11_nosflt.patch

@@ -0,0 +1,20 @@
+diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
+index 53d6d17de..f52495086 100644
+--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
++++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
+@@ -1239,10 +1239,11 @@ extern int  __aeabi_dcmpgt(double, double);
+ 
+ // Imported code from glibc soft-fp bundle for
+ // calculation accuracy improvement. See CR 6757269.
+-extern double __aeabi_fadd_glibc(float, float);
+-extern double __aeabi_fsub_glibc(float, float);
+-extern double __aeabi_dadd_glibc(double, double);
+-extern double __aeabi_dsub_glibc(double, double);
++#define __aeabi_fadd_glibc __aeabi_fadd
++#define __aeabi_fsub_glibc __aeabi_fsub
++#define __aeabi_dadd_glibc __aeabi_dadd
++#define __aeabi_dsub_glibc __aeabi_dsub
++
+ };
+ #endif // __SOFTFP__
+