Skip to content

8315020: The macro definition for LoongArch64 zero build is not accurate. #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

8315020: The macro definition for LoongArch64 zero build is not accurate. #489

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
681fcbb
Backport 725ec0ce1b463b21cd4c5287cf4ccbee53ec7349
xiangzhai Apr 28, 2024
6728fd3
Remove unnecessary ZERO_ARCHDEF
xiangzhai Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hotspot/src/os/linux/vm/os_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2008,11 +2008,11 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
static Elf32_Half running_arch_code=EM_68K;
#elif (defined AARCH64)
static Elf32_Half running_arch_code=EM_AARCH64;
#elif (defined LOONGARCH)
#elif (defined LOONGARCH64)
Copy link

@mirabilos mirabilos Apr 28, 2024 •
edited by bridgekeeper bot
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, this fixes the compile issue I reported.

static Elf32_Half running_arch_code=EM_LOONGARCH;
#else
#error Method os::dll_load requires that one of following is defined:\
IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64, LOONGARCH
IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64, LOONGARCH64
#endif

// Identify compatability class for VM's architecture and library's architecture
Expand Down