]> git.pld-linux.org Git - packages/icedtea8.git/blob - icedtea8-x32-ac.patch
x32: make sure sizer.32.exe is build with x32 ABI
[packages/icedtea8.git] / icedtea8-x32-ac.patch
1 diff -dur icedtea-3.1.0.orig/acinclude.m4 icedtea-3.1.0/acinclude.m4
2 --- icedtea-3.1.0.orig/acinclude.m4     2016-07-25 05:31:28.876207700 +0200
3 +++ icedtea-3.1.0/acinclude.m4  2016-09-20 12:56:21.236580626 +0200
4 @@ -2,10 +2,18 @@
5  [
6    case "${target_cpu}" in
7      x86_64)
8 -      BUILD_ARCH_DIR=amd64
9 -      INSTALL_ARCH_DIR=amd64
10 -      JRE_ARCH_DIR=amd64
11 -      ARCHFLAG="-m64"
12 +      case "${host}" in
13 +        *x32)
14 +          BUILD_ARCH_DIR=x32
15 +          INSTALL_ARCH_DIR=x32
16 +          JRE_ARCH_DIR=x32
17 +          ;;
18 +        *)
19 +          BUILD_ARCH_DIR=amd64
20 +          INSTALL_ARCH_DIR=amd64
21 +          JRE_ARCH_DIR=amd64
22 +          ARCHFLAG="-m64"
23 +      esac
24        ;;
25      i?86)
26        BUILD_ARCH_DIR=i586
27 @@ -641,7 +649,7 @@
28    ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
29    dnl can't use AC_CHECK_SIZEOF on multilib
30    case "${ZERO_LIBARCH}" in
31 -    arm|i386|ppc|s390|sh|sparc)
32 +    arm|i386|ppc|s390|sh|sparc|x32)
33        ZERO_BITSPERWORD=32
34        ;;
35      aarch64|alpha|amd64|ia64|ppc64|ppc64le|s390x|sparcv9)
36 @@ -2036,7 +2044,15 @@
37      arm64) ;;
38      i?86) ;;
39      sparc) ;;
40 -    x86_64) ;;
41 +    x86_64)
42 +      case "${host}" in
43 +        *x32)
44 +          has_native_hotspot_port=no
45 +          ;;
46 +        *)
47 +         ;;
48 +      esac
49 +      ;;
50      powerpc64) ;;
51      powerpc64le) ;;
52      *) has_native_hotspot_port=no;
This page took 0.026981 seconds and 3 git commands to generate.