archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-16 00:54:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

8185567: fix hsdis cpu to architecture mapping on various Linux platforms

Browse source 
Add "arm" target to hsdis.c and fix several cpu to architecture mappings in Makefile

Reviewed-by: dholmes, vlivanov, tbell
This commit is contained in:
David Buck 2017-08-03 17:13:57 -04:00
parent 7c8c0a97fc
commit b0cc678733
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hotspot/src/share/tools/hsdis/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -70,14 +70,18 @@ CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW)
else #linux else #linux
CPU = $(shell uname -m) CPU = $(shell uname -m)
ARCH1=$(CPU:x86_64=amd64) ARCH1=$(CPU:x86_64=amd64)
ARCH=$(ARCH1:i686=i386) ARCH2=$(ARCH1:i686=i386)
ARCH=$(ARCH2:sparc64=sparcv9)
ifdef LP64 ifdef LP64
CFLAGS/sparcv9 += -m64 CFLAGS/sparcv9 += -m64
CFLAGS/amd64 += -m64 CFLAGS/amd64 += -m64
CFLAGS/ppc64 += -m64 CFLAGS/ppc64 += -m64
CFLAGS/ppc64le += -m64 -DABI_ELFv2 CFLAGS/ppc64le += -m64 -DABI_ELFv2
else else
ARCH=$(ARCH1:amd64=i386) ARCH=$(ARCH2:amd64=i386)
ifneq ($(findstring arm,$(ARCH)),)
ARCH=arm
endif
CFLAGS/i386 += -m32 CFLAGS/i386 += -m32
CFLAGS/sparc += -m32 CFLAGS/sparc += -m32
endif endif

5
hotspot/src/share/tools/hsdis/hsdis.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -465,6 +465,9 @@ static const char* native_arch_name() {
#if defined(LIBARCH_ppc64) || defined(LIBARCH_ppc64le) #if defined(LIBARCH_ppc64) || defined(LIBARCH_ppc64le)
res = "powerpc:common64"; res = "powerpc:common64";
#endif #endif
#ifdef LIBARCH_arm
res = "arm";
#endif
#ifdef LIBARCH_aarch64 #ifdef LIBARCH_aarch64
res = "aarch64"; res = "aarch64";
#endif #endif