1 --- jdk8u-jdk8u302-ga.orig/common/autoconf/platform.m4 2021-06-28 20:48:48.000000000 +0200
2 +++ jdk8u-jdk8u302-ga/common/autoconf/platform.m4 2021-08-02 11:32:31.464394497 +0200
11 + VAR_CPU_ENDIAN=little
18 # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
19 PLATFORM_EXTRACT_VARS_FROM_OS($build_os)
20 - PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu)
23 + PLATFORM_EXTRACT_VARS_FROM_CPU(x32)
26 + PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu)
29 # ..and setup our own variables. (Do this explicitely to facilitate searching)
30 OPENJDK_BUILD_OS="$VAR_OS"
31 OPENJDK_BUILD_OS_API="$VAR_OS_API"
34 # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
35 PLATFORM_EXTRACT_VARS_FROM_OS($host_os)
36 - PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
39 + PLATFORM_EXTRACT_VARS_FROM_CPU(x32)
42 + PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
45 # ... and setup our own variables. (Do this explicitely to facilitate searching)
46 OPENJDK_TARGET_OS="$VAR_OS"
47 OPENJDK_TARGET_OS_API="$VAR_OS_API"
49 s390*) ZERO_ARCHDEF=S390 ;;
50 sparc*) ZERO_ARCHDEF=SPARC ;;
51 x86_64*) ZERO_ARCHDEF=AMD64 ;;
52 + x32*) ZERO_ARCHDEF=X32 ;;
53 x86) ZERO_ARCHDEF=IA32 ;;
54 *) ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
56 --- jdk8u-jdk8u302-ga.orig/hotspot/src/os/linux/vm/os_linux.cpp 2021-08-02 11:19:04.106583145 +0200
57 +++ jdk8u-jdk8u302-ga/hotspot/src/os/linux/vm/os_linux.cpp 2021-08-02 11:20:22.825758333 +0200
61 static Elf32_Half running_arch_code=EM_386;
62 - #elif (defined AMD64)
63 + #elif (defined AMD64) || (defined X32)
64 static Elf32_Half running_arch_code=EM_X86_64;
66 static Elf32_Half running_arch_code=EM_IA_64;
67 --- jdk8u-jdk8u302-ga.orig/jdk/make/gensrc/GensrcX11Wrappers.gmk 2021-03-31 19:24:20.000000000 +0200
68 +++ jdk8u-jdk8u302-ga/jdk/make/gensrc/GensrcX11Wrappers.gmk 2021-08-02 11:20:22.832424943 +0200
70 $(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $*
72 # use -m32/-m64 only if the compiler supports it
73 + ifneq ($(OPENJDK_TARGET_CPU),x32)
74 ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG), true)
75 MEMORY_MODEL_FLAG="$(COMPILER_TARGET_BITS_FLAG)$*"
79 # Compile the C code into an executable.
80 $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
81 --- jdk8u-jdk8u302-ga/common/autoconf/flags.m4.orig 2021-06-28 20:48:48.000000000 +0200
82 +++ jdk8u-jdk8u302-ga/common/autoconf/flags.m4 2021-08-02 13:10:55.178538598 +0200
85 ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
88 + ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}x32"
91 ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"