From: Jacek Konieczny <jajcus@jajcus.net>
Date: Tue, 28 Jul 2015 12:41:07 +0000 (+0200)
Subject: x32 patch updated
X-Git-Tag: auto/th/icedtea8-3.1.0-0.2~9
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ficedtea8.git;a=commitdiff_plain;h=f1360ca91f093da4496c30d23ab1cba6360f3890

x32 patch updated
---

diff --git a/icedtea7-x32.patch b/icedtea7-x32.patch
index f7186ee..28f3058 100644
--- a/icedtea7-x32.patch
+++ b/icedtea7-x32.patch
@@ -1,6 +1,25 @@
---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig	2014-07-06 11:29:29.015366709 +0200
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2014-07-06 11:31:33.112151956 +0200
-@@ -2023,7 +2023,7 @@
+diff -dur -x '*.orig' openjdk.orig/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk
+--- openjdk.orig/corba/make/common/shared/Platform.gmk	2015-07-28 12:27:18.989133344 +0200
++++ openjdk/corba/make/common/shared/Platform.gmk	2015-07-28 12:31:01.780715982 +0200
+@@ -163,8 +163,12 @@
+                 ia64) \
+                     echo ia64 \
+                     ;; \
+-                x86_64) \
+-                    echo amd64 \
++                amd64|x86_64) \
++                    if [ "x32" = "x32" ]; then \
++                        echo x32; \
++                    else \
++                        echo amd64; \
++                    fi \
+                     ;; \
+                 sparc*) \
+                     echo sparc \
+diff -dur -x '*.orig' openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2015-07-28 12:27:19.219145302 +0200
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2015-07-28 12:31:01.777382475 +0200
+@@ -2049,7 +2049,7 @@
  
    #if  (defined IA32)
      static  Elf32_Half running_arch_code=EM_386;
@@ -9,9 +28,10 @@
      static  Elf32_Half running_arch_code=EM_X86_64;
    #elif  (defined IA64)
      static  Elf32_Half running_arch_code=EM_IA_64;
---- openjdk/corba/make/common/shared/Platform.gmk.orig	2014-07-06 11:29:28.747364528 +0200
-+++ openjdk/corba/make/common/shared/Platform.gmk	2014-07-06 11:31:33.112151956 +0200
-@@ -163,8 +163,12 @@
+diff -dur -x '*.orig' openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
+--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2015-07-28 12:27:18.989133344 +0200
++++ openjdk/jdk/make/common/shared/Platform.gmk	2015-07-28 12:31:01.784049488 +0200
+@@ -180,8 +180,12 @@
                  ia64) \
                      echo ia64 \
                      ;; \
@@ -26,29 +46,20 @@
                      ;; \
                  sparc*) \
                      echo sparc \
---- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig	2014-06-12 22:14:44.000000000 +0200
-+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2014-07-06 11:31:33.112151956 +0200
-@@ -35,7 +35,6 @@
- #endif
- #ifdef __linux__
- #include <unistd.h>
--#include <sys/sysctl.h>
- #include <sys/utsname.h>
- #include <netinet/ip.h>
- 
---- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c.orig	2014-06-12 22:14:44.000000000 +0200
-+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2014-07-06 11:31:33.112151956 +0200
-@@ -43,7 +43,6 @@
- #endif
- #ifdef __linux__
- #include <unistd.h>
--#include <sys/sysctl.h>
- #endif
- 
- #include "jvm.h"
---- openjdk/jdk/make/jdk_generic_profile.sh.orig	2014-06-12 22:14:44.000000000 +0200
-+++ openjdk/jdk/make/jdk_generic_profile.sh	2014-07-06 11:31:33.112151956 +0200
-@@ -255,7 +255,12 @@
+@@ -227,6 +231,9 @@
+       ifeq ($(ARCH), s390x)
+         ARCH_DATA_MODEL=64
+       endif
++      ifeq ($(ARCH), x32)
++        ARCH_DATA_MODEL=32
++      endif
+       ifeq ($(ARCH), sh)
+         ARCH_DATA_MODEL=32
+       endif
+diff -dur -x '*.orig' openjdk.orig/jdk/make/jdk_generic_profile.sh openjdk/jdk/make/jdk_generic_profile.sh
+--- openjdk.orig/jdk/make/jdk_generic_profile.sh	2015-07-21 02:32:24.000000000 +0200
++++ openjdk/jdk/make/jdk_generic_profile.sh	2015-07-28 12:31:01.780715982 +0200
+@@ -271,7 +271,12 @@
    # subdirectory under $JAVA_HOME/jre/lib
    arch=$(uname -m)
    case "${arch}" in
@@ -62,7 +73,7 @@
      i?86)    ZERO_LIBARCH=i386      ;;
      sparc64) ZERO_LIBARCH=sparcv9   ;;
      arm*)    ZERO_LIBARCH=arm       ;;
-@@ -267,7 +272,7 @@
+@@ -284,7 +289,7 @@
  
    # ARCH_DATA_MODEL is the number of bits in a pointer
    case "${ZERO_LIBARCH}" in
@@ -70,8 +81,8 @@
 +    arm|i386|ppc|s390|sh|sparc|x32)
        ARCH_DATA_MODEL=32
        ;;
-     aarch64|alpha|amd64|ia64|ppc64*|s390x|sparcv9)
-@@ -281,7 +286,7 @@
+     aarch64|alpha|amd64|ia64|ppc64|ppc64le|s390x|sparcv9)
+@@ -299,7 +304,7 @@
  
    # ZERO_ENDIANNESS is the endianness of the processor
    case "${ZERO_LIBARCH}" in
@@ -80,7 +91,7 @@
        ZERO_ENDIANNESS=little
        ;;
      ppc|ppc64|s390*|sparc*|alpha)
-@@ -299,6 +304,7 @@
+@@ -318,6 +323,7 @@
      ppc*)   ZERO_ARCHDEF=PPC   ;;
      s390*)  ZERO_ARCHDEF=S390  ;;
      sparc*) ZERO_ARCHDEF=SPARC ;;
@@ -88,30 +99,25 @@
      *)      ZERO_ARCHDEF=$(echo "${ZERO_LIBARCH}" | tr a-z A-Z)
    esac
    export ZERO_ARCHDEF
---- openjdk/jdk/make/common/shared/Platform.gmk.orig	2014-07-06 11:29:28.747364528 +0200
-+++ openjdk/jdk/make/common/shared/Platform.gmk	2014-07-06 11:31:33.112151956 +0200
-@@ -180,8 +180,12 @@
-                 ia64) \
-                     echo ia64 \
-                     ;; \
--                x86_64) \
--                    echo amd64 \
-+                amd64|x86_64) \
-+                    if [ "x32" = "x32" ]; then \
-+                        echo x32; \
-+                    else \
-+                        echo amd64; \
-+                    fi \
-                     ;; \
-                 sparc*) \
-                     echo sparc \
-@@ -228,6 +232,9 @@
-       ifeq ($(ARCH), s390x)
-         ARCH_DATA_MODEL=64
-       endif
-+      ifeq ($(ARCH), x32)
-+        ARCH_DATA_MODEL=32
-+      endif
-       ifeq ($(ARCH), sh)
-         ARCH_DATA_MODEL=32
-       endif
+diff -dur -x '*.orig' openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2015-07-21 02:32:24.000000000 +0200
++++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2015-07-28 12:31:01.780715982 +0200
+@@ -35,7 +35,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #include <sys/utsname.h>
+ #include <netinet/ip.h>
+ 
+diff -dur -x '*.orig' openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2015-07-21 02:32:24.000000000 +0200
++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2015-07-28 12:31:01.780715982 +0200
+@@ -43,7 +43,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #endif
+ 
+ #include "jvm.h"