Skip to content

Commit 72f8a49

Browse files
JakubVanekJakubVanek
committed
[patch] Simplify optimization patch
1 parent 930573f commit 72f8a49

File tree

6 files changed

+16
-91
lines changed

6 files changed

+16
-91
lines changed

‎scripts/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ echo "[BUILD] Configuring Java for target '$JDKPLATFORM'"
4545
if [ "$JDKPLATFORM" == "ev3" ]; then
4646
bash ./configure --with-boot-jdk="$HOSTJDK" \
4747
--openjdk-target=arm-linux-gnueabi \
48-
--with-abi-profile=arm-ev3 \
48+
--with-abi-profile=arm926ejs \
4949
--enable-headless-only \
5050
--with-freetype-lib=/usr/lib/arm-linux-gnueabi \
5151
--with-freetype-include=/usr/include \

‎scripts/jdk10.patch‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,26 @@ diff -r b09e56145e11 make/autoconf/flags.m4
66
[
77
AC_ARG_WITH(abi-profile, [AS_HELP_STRING([--with-abi-profile],
88
- [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
9-
+ [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt,arm-ev3,arm-rpi1,arm-rpi2,arm-rpi3,armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
9+
+ [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, arm926ejs,armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
1010

1111
if test "x$with_abi_profile" != x; then
1212
if test "x$OPENJDK_TARGET_CPU" != xarm && \
1313
@@ -51,6 +51,18 @@
1414
elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then
1515
ARM_FLOAT_TYPE=sflt
1616
ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
17-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-ev3; then
17+
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm926ejs; then
1818
+ ARM_FLOAT_TYPE=sflt
1919
+ ARM_ARCH_TYPE_FLAGS='-mcpu=arm926ej-s -marm'
20-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi1; then
21-
+ ARM_FLOAT_TYPE=vfp-hflt
22-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=arm1176jzf-s -marm'
23-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi2; then
24-
+ ARM_FLOAT_TYPE=vfp-hflt
25-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=cortex-a7 -marm'
26-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi3; then
27-
+ ARM_FLOAT_TYPE=vfp-hflt
28-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=cortex-a53 -marm'
2920
elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv5-vfp-sflt; then
3021
ARM_FLOAT_TYPE=vfp-sflt
3122
ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
3223
@@ -1378,6 +1390,14 @@
3324
if test "x$OPENJDK_$1_OS" = xlinux; then
3425
if test "x$OPENJDK_$1_CPU" = xx86; then
3526
$2JVM_ASFLAGS="[$]$2JVM_ASFLAGS -march=i586"
36-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-ev3; then
27+
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm926ejs; then
3728
+ $2JVM_ASFLAGS="-mcpu=arm926ej-s"
38-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi1; then
39-
+ $2JVM_ASFLAGS="-mcpu=arm1176jzf-s"
40-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi2; then
41-
+ $2JVM_ASFLAGS="-mcpu=cortex-a7"
42-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi3; then
43-
+ $2JVM_ASFLAGS="-mcpu=cortex-a53"
4429
fi
4530
elif test "x$OPENJDK_$1_OS" = xmacosx; then
4631
$2JVM_ASFLAGS="[$]$2JVM_ASFLAGS -x assembler-with-cpp -mno-omit-leaf-frame-pointer -mstack-alignment=16"

‎scripts/jdk11.patch‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,8 @@ index e10e58930..c72b9390c 100644
66
# Misuse EXTRA_CFLAGS to mimic old behavior
77
$2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS ${$2EXTRA_CFLAGS}"
88

9-
+ if test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-ev3; then
9+
+ if test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm926ejs; then
1010
+ $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS -mcpu=arm926ej-s"
11-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi1; then
12-
+ $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS -mcpu=arm1176jzf-s"
13-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi2; then
14-
+ $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS -mcpu=cortex-a7"
15-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi3; then
16-
+ $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS -mcpu=cortex-a53"
1711
+ fi
1812
+
1913
AC_SUBST($2JVM_ASFLAGS)
@@ -28,26 +22,17 @@ index 472e7a638..45445f23b 100644
2822
[
2923
AC_ARG_WITH(abi-profile, [AS_HELP_STRING([--with-abi-profile],
3024
- [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
31-
+ [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt,arm-ev3,arm-rpi1,arm-rpi2,arm-rpi3,armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
25+
+ [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, arm926ejs,armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
3226

3327
if test "x$with_abi_profile" != x; then
3428
if test "x$OPENJDK_TARGET_CPU" != xarm && \
3529
@@ -55,6 +55,18 @@ AC_DEFUN([FLAGS_SETUP_ABI_PROFILE],
3630
elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then
3731
ARM_FLOAT_TYPE=sflt
3832
ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
39-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-ev3; then
33+
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm926ejs; then
4034
+ ARM_FLOAT_TYPE=sflt
4135
+ ARM_ARCH_TYPE_FLAGS='-mcpu=arm926ej-s -marm'
42-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi1; then
43-
+ ARM_FLOAT_TYPE=vfp-hflt
44-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=arm1176jzf-s -marm'
45-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi2; then
46-
+ ARM_FLOAT_TYPE=vfp-hflt
47-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=cortex-a7 -marm'
48-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi3; then
49-
+ ARM_FLOAT_TYPE=vfp-hflt
50-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=cortex-a53 -marm'
5136
elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv5-vfp-sflt; then
5237
ARM_FLOAT_TYPE=vfp-sflt
5338
ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'

‎scripts/jdk12.patch‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,17 @@ diff -Naur a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
66
[
77
AC_ARG_WITH(abi-profile, [AS_HELP_STRING([--with-abi-profile],
88
- [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
9-
+ [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt,arm-ev3,arm-rpi1,arm-rpi2,arm-rpi3,armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
9+
+ [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, arm926ejs,armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
1010

1111
if test "x$with_abi_profile" != x; then
1212
if test "x$OPENJDK_TARGET_CPU" != xarm && \
1313
@@ -55,6 +55,18 @@
1414
elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then
1515
ARM_FLOAT_TYPE=sflt
1616
ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
17-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-ev3; then
17+
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm926ejs; then
1818
+ ARM_FLOAT_TYPE=sflt
1919
+ ARM_ARCH_TYPE_FLAGS='-mcpu=arm926ej-s -marm'
20-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi1; then
21-
+ ARM_FLOAT_TYPE=vfp-hflt
22-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=arm1176jzf-s -marm'
23-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi2; then
24-
+ ARM_FLOAT_TYPE=vfp-hflt
25-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=cortex-a7 -marm'
26-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi3; then
27-
+ ARM_FLOAT_TYPE=vfp-hflt
28-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=cortex-a53 -marm'
2920
elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv5-vfp-sflt; then
3021
ARM_FLOAT_TYPE=vfp-sflt
3122
ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
@@ -36,14 +27,8 @@ diff -Naur a/make/autoconf/flags-other.m4 b/make/autoconf/flags-other.m4
3627
# Misuse EXTRA_CFLAGS to mimic old behavior
3728
$2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS ${$2EXTRA_CFLAGS}"
3829

39-
+ if test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-ev3; then
30+
+ if test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm926ejs; then
4031
+ $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS -mcpu=arm926ej-s"
41-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi1; then
42-
+ $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS -mcpu=arm1176jzf-s"
43-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi2; then
44-
+ $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS -mcpu=cortex-a7"
45-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi3; then
46-
+ $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS -mcpu=cortex-a53"
4732
+ fi
4833
+
4934
AC_SUBST($2JVM_ASFLAGS)

‎scripts/jdk9.patch‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,26 @@ index a96b74be7..aaa3de469 100644
77
[
88
AC_ARG_WITH(abi-profile, [AS_HELP_STRING([--with-abi-profile],
99
- [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
10-
+ [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt,arm-ev3,arm-rpi1,arm-rpi2,arm-rpi3,armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
10+
+ [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, arm926ejs,armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
1111

1212
if test "x$with_abi_profile" != x; then
1313
if test "x$OPENJDK_TARGET_CPU" != xarm && \
1414
@@ -51,6 +51,18 @@ AC_DEFUN([FLAGS_SETUP_ABI_PROFILE],
1515
elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then
1616
ARM_FLOAT_TYPE=sflt
1717
ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
18-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-ev3; then
18+
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm926ejs; then
1919
+ ARM_FLOAT_TYPE=sflt
2020
+ ARM_ARCH_TYPE_FLAGS='-mcpu=arm926ej-s -marm'
21-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi1; then
22-
+ ARM_FLOAT_TYPE=vfp-hflt
23-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=arm1176jzf-s -marm'
24-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi2; then
25-
+ ARM_FLOAT_TYPE=vfp-hflt
26-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=cortex-a7 -marm'
27-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi3; then
28-
+ ARM_FLOAT_TYPE=vfp-hflt
29-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=cortex-a53 -marm'
3021
elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv5-vfp-sflt; then
3122
ARM_FLOAT_TYPE=vfp-sflt
3223
ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
3324
@@ -1305,6 +1317,14 @@ $2LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB} ${$2JAVA_BASE_LDFLAGS}"
3425
if test "x$OPENJDK_$1_OS" = xlinux; then
3526
if test "x$OPENJDK_$1_CPU" = xx86; then
3627
$2JVM_ASFLAGS="[$]$2JVM_ASFLAGS -march=i586"
37-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-ev3; then
28+
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm926ejs; then
3829
+ $2JVM_ASFLAGS="-mcpu=arm926ej-s"
39-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi1; then
40-
+ $2JVM_ASFLAGS="-mcpu=arm1176jzf-s"
41-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi2; then
42-
+ $2JVM_ASFLAGS="-mcpu=cortex-a7"
43-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi3; then
44-
+ $2JVM_ASFLAGS="-mcpu=cortex-a53"
4530
fi
4631
elif test "x$OPENJDK_$1_OS" = xmacosx; then
4732
$2JVM_ASFLAGS="[$]$2JVM_ASFLAGS -x assembler-with-cpp -mno-omit-leaf-frame-pointer -mstack-alignment=16"

‎upstream/optimizations.patch‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,8 @@ diff -Naur a/make/autoconf/flags-other.m4 b/make/autoconf/flags-other.m4
55
# Misuse EXTRA_CFLAGS to mimic old behavior
66
$2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS ${$2EXTRA_CFLAGS}"
77

8-
+ if test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-ev3; then
8+
+ if test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm926ejs; then
99
+ $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS -mcpu=arm926ej-s"
10-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi1; then
11-
+ $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS -mcpu=arm1176jzf-s"
12-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi2; then
13-
+ $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS -mcpu=cortex-a7"
14-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi3; then
15-
+ $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS -mcpu=cortex-a53"
1610
+ fi
1711
+
1812
AC_SUBST($2JVM_ASFLAGS)
@@ -26,26 +20,17 @@ diff -Naur a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
2620
[
2721
AC_ARG_WITH(abi-profile, [AS_HELP_STRING([--with-abi-profile],
2822
- [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
29-
+ [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt,arm-ev3,arm-rpi1,arm-rpi2,arm-rpi3,armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
23+
+ [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, arm926ejs,armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
3024

3125
if test "x$with_abi_profile" != x; then
3226
if test "x$OPENJDK_TARGET_CPU" != xarm && \
3327
@@ -55,6 +55,18 @@
3428
elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then
3529
ARM_FLOAT_TYPE=sflt
3630
ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
37-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-ev3; then
31+
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm926ejs; then
3832
+ ARM_FLOAT_TYPE=sflt
3933
+ ARM_ARCH_TYPE_FLAGS='-mcpu=arm926ej-s -marm'
40-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi1; then
41-
+ ARM_FLOAT_TYPE=vfp-hflt
42-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=arm1176jzf-s -marm'
43-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi2; then
44-
+ ARM_FLOAT_TYPE=vfp-hflt
45-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=cortex-a7 -marm'
46-
+ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-rpi3; then
47-
+ ARM_FLOAT_TYPE=vfp-hflt
48-
+ ARM_ARCH_TYPE_FLAGS='-mcpu=cortex-a53 -marm'
4934
elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv5-vfp-sflt; then
5035
ARM_FLOAT_TYPE=vfp-sflt
5136
ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'

0 commit comments

Comments
 (0)