equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
275 |
275 |
276 # Override hotspot cpu definitions for ARM platforms |
276 # Override hotspot cpu definitions for ARM platforms |
277 if test "x$OPENJDK_TARGET_CPU" = xarm; then |
277 if test "x$OPENJDK_TARGET_CPU" = xarm; then |
278 HOTSPOT_TARGET_CPU=arm_32 |
278 HOTSPOT_TARGET_CPU=arm_32 |
279 HOTSPOT_TARGET_CPU_DEFINE="ARM32" |
279 HOTSPOT_TARGET_CPU_DEFINE="ARM32" |
280 JVM_LDFLAGS="$JVM_LDFLAGS -fsigned-char" |
|
281 JVM_CFLAGS="$JVM_CFLAGS -DARM -fsigned-char" |
|
282 elif test "x$OPENJDK_TARGET_CPU" = xaarch64 && test "x$HOTSPOT_TARGET_CPU_PORT" = xarm64; then |
280 elif test "x$OPENJDK_TARGET_CPU" = xaarch64 && test "x$HOTSPOT_TARGET_CPU_PORT" = xarm64; then |
283 HOTSPOT_TARGET_CPU=arm_64 |
281 HOTSPOT_TARGET_CPU=arm_64 |
284 HOTSPOT_TARGET_CPU_ARCH=arm |
282 HOTSPOT_TARGET_CPU_ARCH=arm |
285 JVM_LDFLAGS="$JVM_LDFLAGS -fsigned-char" |
|
286 JVM_CFLAGS="$JVM_CFLAGS -DARM -fsigned-char" |
|
287 fi |
283 fi |
288 |
284 |
289 # Verify that dependencies are met for explicitly set features. |
285 # Verify that dependencies are met for explicitly set features. |
290 if HOTSPOT_CHECK_JVM_FEATURE(jvmti) && ! HOTSPOT_CHECK_JVM_FEATURE(services); then |
286 if HOTSPOT_CHECK_JVM_FEATURE(jvmti) && ! HOTSPOT_CHECK_JVM_FEATURE(services); then |
291 AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services']) |
287 AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services']) |