hg: panama/dev: Resolve manual merge conflicts on assembler-aarch64.cpp

[ningsheng.jian at arm.com]

Changeset: 004feb79931c
Author:    njian
Date:      2020-08-20 15:31 +0800
URL:       https://hg.openjdk.java.net/panama/dev/rev/004feb79931c

Resolve manual merge conflicts on assembler-aarch64.cpp
Summary: Update aarch64-asmtest.py and regenerate code for assembler_aarch64.cpp

! src/hotspot/cpu/aarch64/aarch64-asmtest.py
! src/hotspot/cpu/aarch64/assembler_aarch64.cpp