RFR: 8242244: Remove redundant ELF machine definitions
Magnus Ihse Bursie
magnus.ihse.bursie at oracle.com
Tue Apr 28 11:33:54 UTC 2020
On 2020-04-28 13:28, John Paul Adrian Glaubitz wrote:
> Hi Magnus!
>
> On 4/28/20 1:23 PM, Magnus Ihse Bursie wrote:
>> I thought a simple backing out would be the best, since we have a build breakage.
>>
>> But sure, I understand why you want to keep part of the cleaning up.
>>
>> I have checked, EM_486 is defined. So this combined partial backout + the fix suggested by Qi works:
> Thank you!
>
>> diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
>> --- a/src/hotspot/os/linux/os_linux.cpp
>> +++ b/src/hotspot/os/linux/os_linux.cpp
>> @@ -110,6 +110,7 @@
>> # include <stdint.h>
>> # include <inttypes.h>
>> # include <sys/ioctl.h>
>> +# include <linux/elf-em.h>
>>
>> #ifndef _GNU_SOURCE
>> #define _GNU_SOURCE
>> @@ -1845,6 +1846,9 @@
>> char* name; // String representation
>> } arch_t;
>>
>> +#ifndef EM_AARCH64
>> + #define EM_AARCH64 183 /* ARM AARCH64 */
>> +#endif
>> #ifndef EM_RISCV
>> #define EM_RISCV 243 /* RISC-V */
>> #endif
>>
>>
>> I'd say that this is a trivial fix, and you can consider it reviewed by me (although the authorship of this patch is somewhat convoluted).
> I do not insist on taking authorship, so if you like to push it yourself, I'm
> more than happy with it.
It's more a matter of formality. If I consign myself as author to it,
I'd need a Reviewer to confirm it. Seems they are all asleep now, and
I'd rather see that they do not wake up to a broken CI system. :)
/Magnus
>
> It's the first time I broke the build, so I feel a little bad about it.
>
> Adrian
>
More information about the hotspot-dev
mailing list