8211333: AArch64: Fix another build failure after JDK-8211029

[GoeLin]

I backport this to fix the build on windows aarch64. See also #841 (comment)

I had to do trivial resolves due to context. ahmedmuhsin did the same ones.

---

Progress

• Change must not contain extraneous whitespace
• Commit message must refer to an issue
• Change must be properly reviewed

Issue

• JDK-8211333: AArch64: Fix another build failure after JDK-8211029

Reviewers

• Andrew Haley (@theRealAph - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/844/head:pull/844
$ git checkout pull/844

Update a local copy of the PR:
$ git checkout pull/844
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/844/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 844

View PR using the GUI difftool:
$ git pr show -t 844

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/844.diff

[bridgekeeper]

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

This backport pull request has now been updated with issue from the original commit.

[mlbridge]

Webrevs

• 00: Full (1a2e137b)

[openjdk]

@GoeLin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8211333: AArch64: Fix another build failure after JDK-8211029

Reviewed-by: aph

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[GoeLin]

Thanks for the review!
/integrate

[openjdk]

Going to push as commit c0effc2.

[openjdk]

@GoeLin Pushed as commit c0effc2.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.