RFR: 8242244: Remove redundant ELF machine definitions

[John Paul Adrian Glaubitz]

Hi Dmitry!

On 4/28/20 12:33 PM, Dmitry Chuyko wrote:
> * For target hotspot_variant-server_libjvm_objs_os_linux.o:
> jdk/src/hotspot/os/linux/os_linux.cpp: In static member function 'static void* os::dll_load(const char*, char*, int)':
> jdk/src/hotspot/os/linux/os_linux.cpp:1854:6: error: 'EM_486' was not declared in this scope
>      {EM_486,         EM_386,     ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
>       ^~~~~~
> jdk/src/hotspot/os/linux/os_linux.cpp:1854:6: note: suggested alternative: 'EM_386'
>      {EM_486,         EM_386,     ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
>       ^~~~~~
>       EM_386
> 
> It happens on CenOS 8 and Ubuntu 20.04 (kernel headers installed), aarch64 and amd64.
> 
> Is any additional configuration expected?

Ao already found a potential fix:

diff -r 7205265660b2 src/hotspot/os/linux/os_linux.cpp
--- a/src/hotspot/os/linux/os_linux.cpp Tue Apr 28 05:53:19 2020 -0400
+++ b/src/hotspot/os/linux/os_linux.cpp Tue Apr 28 18:24:45 2020 +0800
@@ -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

Could you try whether this addresses your problem?

Thanks,
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