RFR: 8242244: Remove redundant ELF machine definitions

[John Paul Adrian Glaubitz]

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 the first time I broke the build, so I feel a little bad about it.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz at debian.org
`. `'   Freie Universitaet Berlin - glaubitz at physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913