Skip to content

Commit 4d52b05

Browse files
committed
Backport 0417fcf
1 parent 90d5293 commit 4d52b05

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/hotspot/cpu/aarch64/macroAssembler_aarch64_log.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565

6666
// Table with p(r) polynomial coefficients
6767
// and table representation of logarithm values (hi and low parts)
68-
__attribute__ ((aligned(64))) juint _L_tbl[] =
68+
ATTRIBUTE_ALIGNED(64) juint _L_tbl[] =
6969
{
7070
// coefficients of p(r) polynomial:
7171
// _coeff[]

src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ bool StubRoutines::aarch64::_completed = false;
6161
/**
6262
* crc_table[] from jdk/src/share/native/java/util/zip/zlib-1.2.5/crc32.h
6363
*/
64-
juint StubRoutines::aarch64::_crc_table[] ATTRIBUTE_ALIGNED(4096) =
64+
ATTRIBUTE_ALIGNED(4096) juint StubRoutines::aarch64::_crc_table[] =
6565
{
6666
// Table 0
6767
0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
@@ -288,11 +288,11 @@ juint StubRoutines::aarch64::_crc_table[] ATTRIBUTE_ALIGNED(4096) =
288288
};
289289

290290
// Accumulation coefficients for adler32 upper 16 bits
291-
jubyte StubRoutines::aarch64::_adler_table[] __attribute__ ((aligned(64))) = {
291+
ATTRIBUTE_ALIGNED(64) jubyte StubRoutines::aarch64::_adler_table[] = {
292292
16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
293293
};
294294

295-
juint StubRoutines::aarch64::_npio2_hw[] __attribute__ ((aligned(64))) = {
295+
ATTRIBUTE_ALIGNED(64) juint StubRoutines::aarch64::_npio2_hw[] = {
296296
// first, various coefficient values: 0.5, invpio2, pio2_1, pio2_1t, pio2_2,
297297
// pio2_2t, pio2_3, pio2_3t
298298
// This is a small optimization wich keeping double[8] values in int[] table
@@ -324,7 +324,7 @@ juint StubRoutines::aarch64::_npio2_hw[] __attribute__ ((aligned(64))) = {
324324

325325
// Coefficients for sin(x) polynomial approximation: S1..S6.
326326
// See kernel_sin comments in macroAssembler_aarch64_trig.cpp for details
327-
jdouble StubRoutines::aarch64::_dsin_coef[] __attribute__ ((aligned(64))) = {
327+
ATTRIBUTE_ALIGNED(64) jdouble StubRoutines::aarch64::_dsin_coef[] = {
328328
-1.66666666666666324348e-01, // 0xBFC5555555555549
329329
8.33333333332248946124e-03, // 0x3F8111111110F8A6
330330
-1.98412698298579493134e-04, // 0xBF2A01A019C161D5
@@ -335,7 +335,7 @@ jdouble StubRoutines::aarch64::_dsin_coef[] __attribute__ ((aligned(64))) = {
335335

336336
// Coefficients for cos(x) polynomial approximation: C1..C6.
337337
// See kernel_cos comments in macroAssembler_aarch64_trig.cpp for details
338-
jdouble StubRoutines::aarch64::_dcos_coef[] __attribute__ ((aligned(64))) = {
338+
ATTRIBUTE_ALIGNED(64) jdouble StubRoutines::aarch64::_dcos_coef[] = {
339339
4.16666666666666019037e-02, // c0x3FA555555555554C
340340
-1.38888888888741095749e-03, // 0xBF56C16C16C15177
341341
2.48015872894767294178e-05, // 0x3EFA01A019CB1590
@@ -350,7 +350,7 @@ jdouble StubRoutines::aarch64::_dcos_coef[] __attribute__ ((aligned(64))) = {
350350
// Converted to double to avoid unnecessary conversion in code
351351
// NOTE: table looks like original int table: {0xA2F983, 0x6E4E44,...} with
352352
// only (double) conversion added
353-
jdouble StubRoutines::aarch64::_two_over_pi[] __attribute__ ((aligned(64))) = {
353+
ATTRIBUTE_ALIGNED(64) jdouble StubRoutines::aarch64::_two_over_pi[] = {
354354
(double)0xA2F983, (double)0x6E4E44, (double)0x1529FC, (double)0x2757D1, (double)0xF534DD, (double)0xC0DB62,
355355
(double)0x95993C, (double)0x439041, (double)0xFE5163, (double)0xABDEBB, (double)0xC561B7, (double)0x246E3A,
356356
(double)0x424DD2, (double)0xE00649, (double)0x2EEA09, (double)0xD1921C, (double)0xFE1DEB, (double)0x1CB129,
@@ -365,7 +365,7 @@ jdouble StubRoutines::aarch64::_two_over_pi[] __attribute__ ((aligned(64))) = {
365365
};
366366

367367
// Pi over 2 value
368-
jdouble StubRoutines::aarch64::_pio2[] __attribute__ ((aligned(64))) = {
368+
ATTRIBUTE_ALIGNED(64) jdouble StubRoutines::aarch64::_pio2[] = {
369369
1.57079625129699707031e+00, // 0x3FF921FB40000000
370370
7.54978941586159635335e-08, // 0x3E74442D00000000
371371
5.39030252995776476554e-15, // 0x3CF8469880000000

0 commit comments

Comments
 (0)