[jdk16] Integrated: 8259560: Zero m68k: "static assertion failed: align" after JDK-8252049

[Aleksey Shipilev]

On Mon, 11 Jan 2021 13:07:41 GMT, Aleksey Shipilev <shade at openjdk.org> wrote:

> Debian folks report that Zero m68k (and seems only that arch) fails the static assert added by JDK-8252049. It affects at least JDK 16, but would affect more releases once JDK-8252049 is backported.
> 
> /<<PKGBUILDDIR>>/src/hotspot/share/oops/methodData.hpp: In constructor 'MethodData::CompilerCounters::CompilerCounters()':
> /<<PKGBUILDDIR>>/src/hotspot/share/oops/methodData.hpp:1987:55: error: static assertion failed: align
>  1987 | static_assert(sizeof(_trap_hist) % HeapWordSize == 0, "align");
>       |
> 
> I tried to massage the code so that `oops/methodData.hpp` is not touched when Zero is built (since Zero does not use compilers and related infra), but there are enough transitive dependencies to `oops/methodData.hpp` to make it quite messy. So instead I would just special-case it in place.

This pull request has now been integrated.

Changeset: a99df45b
Author:    Aleksey Shipilev <shade at openjdk.org>
URL:       https://git.openjdk.java.net/jdk16/commit/a99df45b
Stats:     9 lines in 2 files changed: 9 ins; 0 del; 0 mod

8259560: Zero m68k: "static assertion failed: align" after JDK-8252049

Reviewed-by: dholmes

-------------

PR: https://git.openjdk.java.net/jdk16/pull/102