← Back to branch summary

~openjdk/openjdk/openjdk7

« back to all changes in this revision

Viewing changes to patches/zero-x32.diff

  • Committer: Matthias Klose
  • Date: 2017-02-07 10:02:38 UTC
  • Revision ID: doko@ubuntu.com-20170207100238-gpshn1lc935esdpp
openjdk-7 (7u121-2.6.8-1) experimental; urgency=medium

  * IcedTea release 2.6.8 (based on 7u121):

 -- Matthias Klose <doko@ubuntu.com>  Mon, 14 Nov 2016 13:38:40 +0100

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/zero-x32.diff
1
1
Index: openjdk/hotspot/src/os/linux/vm/os_linux.cpp
2
2
===================================================================
3
 
--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig
 
3
--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp
4
4
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
5
5
@@ -2049,7 +2049,7 @@ void * os::dll_load(const char *filename
6
6
 
13
13
     static  Elf32_Half running_arch_code=EM_IA_64;
14
14
Index: openjdk/corba/make/common/shared/Platform.gmk
15
15
===================================================================
16
 
--- openjdk/corba/make/common/shared/Platform.gmk.orig
 
16
--- openjdk/corba/make/common/shared/Platform.gmk
17
17
+++ openjdk/corba/make/common/shared/Platform.gmk
18
18
@@ -163,8 +163,12 @@ ifeq ($(SYSTEM_UNAME), Linux)
19
19
                 ia64) \
32
32
                     echo sparc \
33
33
Index: openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
34
34
===================================================================
35
 
--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig
 
35
--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
36
36
+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
37
 
@@ -35,7 +35,6 @@
 
37
@@ -41,7 +41,6 @@
38
38
 #endif
39
39
 #ifdef __linux__
40
40
 #include <unistd.h>
44
44
 
45
45
Index: openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
46
46
===================================================================
47
 
--- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c.orig
 
47
--- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
48
48
+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
49
49
@@ -43,7 +43,6 @@
50
50
 #endif
56
56
 #include "jvm.h"
57
57
Index: openjdk/jdk/make/jdk_generic_profile.sh
58
58
===================================================================
59
 
--- openjdk/jdk/make/jdk_generic_profile.sh.orig
 
59
--- openjdk/jdk/make/jdk_generic_profile.sh
60
60
+++ openjdk/jdk/make/jdk_generic_profile.sh
61
61
@@ -271,7 +271,12 @@ if [ "${ZERO_BUILD}" = true ] ; then
62
62
   # subdirectory under $JAVA_HOME/jre/lib
100
100
   export ZERO_ARCHDEF
101
101
Index: openjdk/jdk/make/common/shared/Platform.gmk
102
102
===================================================================
103
 
--- openjdk/jdk/make/common/shared/Platform.gmk.orig
 
103
--- openjdk/jdk/make/common/shared/Platform.gmk
104
104
+++ openjdk/jdk/make/common/shared/Platform.gmk
105
105
@@ -180,8 +180,12 @@ ifeq ($(SYSTEM_UNAME), Linux)
106
106
                 ia64) \