aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2016-09-02 11:54:50 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-10-19 10:52:36 +0200
commitd78610bc6616b811a8bba42f61ca42fa905b8d1d (patch)
tree84aec953c908c22b32aa98282a6d8c09aee1f772
parent388a3ace91bc8c876b4c96b369ecbaac89b47121 (diff)
downloadalpine_aports-d78610bc6616b811a8bba42f61ca42fa905b8d1d.tar.bz2
alpine_aports-d78610bc6616b811a8bba42f61ca42fa905b8d1d.tar.xz
alpine_aports-d78610bc6616b811a8bba42f61ca42fa905b8d1d.zip
community/openjdk7: disable arm32-jit
Build on armhf fails: ``` gcc -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DARM -DZERO_LIBARCH=\"arm\" -DPRODUCT -I. -I/home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/share/vm/prims -I/home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/share/vm -I/home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/share/vm/precompiled -I/home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/cpu/zero/vm -I/home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/os_cpu/linux_zero/vm -I/home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/os/linux/vm -I/home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/os/posix/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"24.111-b01\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"buildozer\"" -DHOTSPOT_LIB_ARCH=\"arm\" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea 2.6.7\"" -DDISTRIBUTION_ID="\"Custom build (Fri Sep 2 06:53:44 GMT 2016)\"" -c -Os -fomit-frame-pointer -pipe -fPIC -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_zero -DTARGET_ARCH_MODEL_zero -DTARGET_OS_ARCH_linux_zero -DTARGET_OS_ARCH_MODEL_linux_zero -DTARGET_COMPILER_gcc -I/usr/lib/libffi-3.2.1/include -std=gnu++98 -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -fno-delete-null-pointer-checks -fno-lifetime-dse -D_LITTLE_ENDIAN -pipe -g -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_zero -DTARGET_ARCH_MODEL_zero -DTARGET_OS_ARCH_linux_zero -DTARGET_OS_ARCH_MODEL_linux_zero -DTARGET_COMPILER_gcc -I/usr/lib/libffi-3.2.1/include -std=gnu++98 -fpic -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -fno-delete-null-pointer-checks -fno-lifetime-dse -D_LITTLE_ENDIAN -pipe -g -O3 -fno-strict-aliasing -DHOTSPOT_ASM -DVM_LITTLE_ENDIAN -DINCLUDE_TRACE=1 -Wpointer-arith -Wsign-compare -Os -fomit-frame-pointer -pipe -fPIC -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -o cppInterpreter_arm.o /home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S /home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/cpu/zero/vm/arm32JIT.cpp: In function 'void Thumb2_codegen(Thumb2_Info*, unsigned int)': /home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/cpu/zero/vm/arm32JIT.cpp:5720:7: error: duplicate case value case opc_fast_aldc_w: ^~~~ /home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/cpu/zero/vm/arm32JIT.cpp:5719:7: error: previously used here case opc_return_register_finalizer: ^~~~ /home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/cpu/zero/vm/arm32JIT.cpp:6985:7: error: duplicate case value case opc_return_register_finalizer: { ^~~~ /home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/cpu/zero/vm/arm32JIT.cpp:6877:5: error: previously used here case opc_fast_aldc_w: ^~~~ /home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/cpu/zero/vm/arm32JIT.cpp: In function 'void Thumb2_Initialize()': /home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/src/cpu/zero/vm/arm32JIT.cpp:8188:34: error: overloaded function with no contextual type information mov_imm(&codebuf, ARM_IP, (u32)fmod); ^~~~ make[7]: *** [/home/buildozer/aports/community/openjdk7/src/icedtea-2.6.7/openjdk-boot/hotspot/make/linux/makefiles/rules.make:150: arm32JIT.o] Error 1 ``` http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2942 (cherry picked from commit 88031301dd3828f5975c59054151ab369831c252)
-rw-r--r--community/openjdk7/APKBUILD4
1 files changed, 3 insertions, 1 deletions
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD
index 40019af7f9..4de209d525 100644
--- a/community/openjdk7/APKBUILD
+++ b/community/openjdk7/APKBUILD
@@ -6,7 +6,7 @@ _icedteaver=2.6.7
6# pkgver is <JDK version>.<JDK update> 6# pkgver is <JDK version>.<JDK update>
7# check icedtea JDK when updating 7# check icedtea JDK when updating
8pkgver=7.111.$_icedteaver 8pkgver=7.111.$_icedteaver
9pkgrel=0 9pkgrel=1
10pkgdesc="OpenJDK 7 via IcedTea" 10pkgdesc="OpenJDK 7 via IcedTea"
11url="http://icedtea.classpath.org/" 11url="http://icedtea.classpath.org/"
12arch="all" 12arch="all"
@@ -135,6 +135,7 @@ build() {
135 done 135 done
136 echo "icedtea patches: $DISTRIBUTION_PATCHES" 136 echo "icedtea patches: $DISTRIBUTION_PATCHES"
137 137
138 # --disable-arm32-jit: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2942
138 cd "$builddir" 139 cd "$builddir"
139 ./configure \ 140 ./configure \
140 --build=$CBUILD \ 141 --build=$CBUILD \
@@ -147,6 +148,7 @@ build() {
147 --with-parallel-jobs=${JOBS:-2} \ 148 --with-parallel-jobs=${JOBS:-2} \
148 --disable-dependency-tracking \ 149 --disable-dependency-tracking \
149 --disable-downloading \ 150 --disable-downloading \
151 --disable-arm32-jit \
150 --with-rhino=$srcdir/rhino$RHINO_VER/lib/rhino-$RHINO_VER.jar \ 152 --with-rhino=$srcdir/rhino$RHINO_VER/lib/rhino-$RHINO_VER.jar \
151 --with-openjdk-src-zip=$srcdir/openjdk-$_dropsver.tar.bz2 \ 153 --with-openjdk-src-zip=$srcdir/openjdk-$_dropsver.tar.bz2 \
152 --with-hotspot-src-zip=$srcdir/hotspot-$_dropsver.tar.bz2 \ 154 --with-hotspot-src-zip=$srcdir/hotspot-$_dropsver.tar.bz2 \