Skip to content

Commit da48003

Browse files
shqkingnick-arm
authored andcommitted
8255975: Fix AArch64 OpenJDK build failure with gcc-5
Reviewed-by: dholmes
1 parent 14e25e2 commit da48003

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
3-
* Copyright (c) 2014, 2019, Red Hat Inc. All rights reserved.
2+
* Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
3+
* Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
66
* This code is free software; you can redistribute it and/or modify it
@@ -97,19 +97,19 @@ void VM_Version::get_os_cpu_info() {
9797
uint64_t auxv = getauxval(AT_HWCAP);
9898
uint64_t auxv2 = getauxval(AT_HWCAP2);
9999

100-
static_assert(CPU_FP == HWCAP_FP);
101-
static_assert(CPU_ASIMD == HWCAP_ASIMD);
102-
static_assert(CPU_EVTSTRM == HWCAP_EVTSTRM);
103-
static_assert(CPU_AES == HWCAP_AES);
104-
static_assert(CPU_PMULL == HWCAP_PMULL);
105-
static_assert(CPU_SHA1 == HWCAP_SHA1);
106-
static_assert(CPU_SHA2 == HWCAP_SHA2);
107-
static_assert(CPU_CRC32 == HWCAP_CRC32);
108-
static_assert(CPU_LSE == HWCAP_ATOMICS);
109-
static_assert(CPU_DCPOP == HWCAP_DCPOP);
110-
static_assert(CPU_SHA3 == HWCAP_SHA3);
111-
static_assert(CPU_SHA512 == HWCAP_SHA512);
112-
static_assert(CPU_SVE == HWCAP_SVE);
100+
static_assert(CPU_FP == HWCAP_FP, "Flag CPU_FP must follow Linux HWCAP");
101+
static_assert(CPU_ASIMD == HWCAP_ASIMD, "Flag CPU_ASIMD must follow Linux HWCAP");
102+
static_assert(CPU_EVTSTRM == HWCAP_EVTSTRM, "Flag CPU_EVTSTRM must follow Linux HWCAP");
103+
static_assert(CPU_AES == HWCAP_AES, "Flag CPU_AES must follow Linux HWCAP");
104+
static_assert(CPU_PMULL == HWCAP_PMULL, "Flag CPU_PMULL must follow Linux HWCAP");
105+
static_assert(CPU_SHA1 == HWCAP_SHA1, "Flag CPU_SHA1 must follow Linux HWCAP");
106+
static_assert(CPU_SHA2 == HWCAP_SHA2, "Flag CPU_SHA2 must follow Linux HWCAP");
107+
static_assert(CPU_CRC32 == HWCAP_CRC32, "Flag CPU_CRC32 must follow Linux HWCAP");
108+
static_assert(CPU_LSE == HWCAP_ATOMICS, "Flag CPU_LSE must follow Linux HWCAP");
109+
static_assert(CPU_DCPOP == HWCAP_DCPOP, "Flag CPU_DCPOP must follow Linux HWCAP");
110+
static_assert(CPU_SHA3 == HWCAP_SHA3, "Flag CPU_SHA3 must follow Linux HWCAP");
111+
static_assert(CPU_SHA512 == HWCAP_SHA512, "Flag CPU_SHA512 must follow Linux HWCAP");
112+
static_assert(CPU_SVE == HWCAP_SVE, "Flag CPU_SVE must follow Linux HWCAP");
113113
_features = auxv & (
114114
HWCAP_FP |
115115
HWCAP_ASIMD |

0 commit comments

Comments
 (0)