Home Explore Help
Sign In
oss
/
openadk
4
1
Fork 3
Files Issues 1 Pull Requests 0 Wiki
Tree: 043601ef5c
Branches Tags
openadk
/
package
/
openjdk7
/
patches
/
openadk.patch

openadk.patch 21 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518 
  1. diff -Nur icedtea-2.3.11.orig/Makefile.in icedtea-2.3.11/Makefile.in
    2. 

  2. --- icedtea-2.3.11.orig/Makefile.in	2013-07-25 02:39:55.000000000 +0200
    3. 

  3. +++ icedtea-2.3.11/Makefile.in	2013-12-08 15:43:27.000000000 +0100
    4. 

  4. @@ -695,7 +695,7 @@
    5. 

  5.  	$(DISTRIBUTION_PATCHES)
    6. 

  6.  
    7. 

  7.  # Bootstrapping patches
    8. 

  8. -ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
    9. 

  9. +ICEDTEA_BOOT_PATCHES = patches/openadk.patch patches/boot/javafiles.patch \
    10. 

  10.  	patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \
    11. 

  11.  	patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \
    12. 

  12.  	patches/boot/demos.patch patches/boot/ecj-fphexconstants.patch \
    13. 

  13. @@ -2090,7 +2090,7 @@
    14. 

  14.  # Optional native ecj
    15. 

  15.  stamps/native-ecj.stamp:
    16. 

  16.  	mkdir -p stamps 
    17. 

  17. -@BUILD_NATIVE_ECJ_TRUE@	${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
    18. 

  18. +@BUILD_NATIVE_ECJ_TRUE@	${GCJ} -lgcj -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
    19. 

  19.  @BUILD_NATIVE_ECJ_TRUE@	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
    20. 

  20.  	touch $@
    21. 

  21.  
    22. 

  22. diff -Nur icedtea-2.3.11.orig/patches/openadk.patch icedtea-2.3.11/patches/openadk.patch
    23. 

  23. --- icedtea-2.3.11.orig/patches/openadk.patch	1970-01-01 01:00:00.000000000 +0100
    24. 

  24. +++ icedtea-2.3.11/patches/openadk.patch	2013-12-08 16:22:41.000000000 +0100
    25. 

  25. @@ -0,0 +1,493 @@
    26. 

  26. +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
    27. 

  27. +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2013-07-17 20:14:46.000000000 +0200
    28. 

  28. ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2013-12-08 15:44:03.000000000 +0100
    29. 

  29. +@@ -115,7 +115,6 @@
    30. 

  30. + # include <string.h>
    31. 

  31. + # include <syscall.h>
    32. 

  32. + # include <sys/sysinfo.h>
    33. 

  33. +-# include <gnu/libc-version.h>
    34. 

  34. + # include <sys/ipc.h>
    35. 

  35. + # include <sys/shm.h>
    36. 

  36. + # include <link.h>
    37. 

  37. +@@ -649,9 +648,7 @@
    38. 

  38. +      os::Linux::set_glibc_version(str);
    39. 

  39. +   } else {
    40. 

  40. +      // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
    41. 

  41. +-     static char _gnu_libc_version[32];
    42. 

  42. +-     jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
    43. 

  43. +-              "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
    44. 

  44. ++     static char _gnu_libc_version[32] = "2.9";
    45. 

  45. +      os::Linux::set_glibc_version(_gnu_libc_version);
    46. 

  46. +   }
    47. 

  47. + 
    48. 

  48. +@@ -2648,10 +2645,7 @@
    49. 

  49. + // If we are running with earlier version, which did not have symbol versions,
    50. 

  50. + // we should use the base version.
    51. 

  51. + void* os::Linux::libnuma_dlsym(void* handle, const char *name) {
    52. 

  52. +-  void *f = dlvsym(handle, name, "libnuma_1.1");
    53. 

  53. +-  if (f == NULL) {
    54. 

  54. +-    f = dlsym(handle, name);
    55. 

  55. +-  }
    56. 

  56. ++  void *f = dlsym(handle, name);
    57. 

  57. +   return f;
    58. 

  58. + }
    59. 

  59. + 
    60. 

  60. +@@ -4916,7 +4910,21 @@
    61. 

  61. + // Linux doesn't yet have a (official) notion of processor sets,
    62. 

  62. + // so just return the system wide load average.
    63. 

  63. + int os::loadavg(double loadavg[], int nelem) {
    64. 

  64. +-  return ::getloadavg(loadavg, nelem);
    65. 

  65. ++ FILE *LOADAVG;
    66. 

  66. ++ double avg[3] = { 0.0, 0.0, 0.0 };
    67. 

  67. ++ int i, res = -1;;
    68. 

  68. ++
    69. 

  69. ++ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
    70. 

  70. ++ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
    71. 

  71. ++ res = 0;
    72. 

  72. ++ fclose(LOADAVG);
    73. 

  73. ++ }
    74. 

  74. ++
    75. 

  75. ++ for (i = 0; (i < nelem) && (i < 3); i++) {
    76. 

  76. ++ loadavg[i] = avg[i];
    77. 

  77. ++ }
    78. 

  78. ++
    79. 

  79. ++ return res;
    80. 

  80. + }
    81. 

  81. + 
    82. 

  82. + void os::pause() {
    83. 

  83. +diff -Nur openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
    84. 

  84. +--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2013-07-17 20:14:46.000000000 +0200
    85. 

  85. ++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2013-12-08 15:44:03.000000000 +0100
    86. 

  86. +@@ -253,7 +253,7 @@
    87. 

  87. + #elif defined(__APPLE__)
    88. 

  88. + inline int g_isnan(double f) { return isnan(f); }
    89. 

  89. + #elif defined(LINUX) || defined(_ALLBSD_SOURCE)
    90. 

  90. +-inline int g_isnan(float  f) { return isnanf(f); }
    91. 

  91. ++inline int g_isnan(float  f) { return __isnanf(f); }
    92. 

  92. + inline int g_isnan(double f) { return isnan(f); }
    93. 

  93. + #else
    94. 

  94. + #error "missing platform-specific definition here"
    95. 

  95. +@@ -267,8 +267,8 @@
    96. 

  96. + 
    97. 

  97. + // Checking for finiteness
    98. 

  98. + 
    99. 

  99. +-inline int g_isfinite(jfloat  f)                 { return finite(f); }
    100. 

  100. +-inline int g_isfinite(jdouble f)                 { return finite(f); }
    101. 

  101. ++inline int g_isfinite(jfloat  f)                 { return isfinite(f); }
    102. 

  102. ++inline int g_isfinite(jdouble f)                 { return isfinite(f); }
    103. 

  103. + 
    104. 

  104. + 
    105. 

  105. + // Wide characters
    106. 

  106. +diff -Nur openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
    107. 

  107. +--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2013-06-23 17:54:05.000000000 +0200
    108. 

  108. ++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2013-12-08 15:44:03.000000000 +0100
    109. 

  109. +@@ -80,7 +80,7 @@
    110. 

  110. +     LDDFLAGS += $(ZIPOBJS)
    111. 

  111. +   endif
    112. 

  112. + else
    113. 

  113. +-  OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
    114. 

  114. ++  CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI
    115. 

  115. +   OTHER_LDLIBS += $(JVMLIB)
    116. 

  116. + endif
    117. 

  117. + 
    118. 

  118. +diff -Nur openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
    119. 

  119. +--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile	2013-06-23 17:54:05.000000000 +0200
    120. 

  120. ++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile	2013-12-08 15:44:03.000000000 +0100
    121. 

  121. +@@ -64,7 +64,7 @@
    122. 

  122. + COMPILER_WARNINGS_FATAL=true
    123. 

  123. + endif
    124. 

  124. + #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
    125. 

  125. +-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
    126. 

  126. ++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -ljavanet -lpthread -ldl
    127. 

  127. + endif
    128. 

  128. + ifeq ($(PLATFORM), solaris)
    129. 

  129. + #LIBSCTP = -lsctp
    130. 

  130. +diff -Nur openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk
    131. 

  131. +--- openjdk.orig/jdk/make/common/Defs.gmk	2013-06-23 17:54:05.000000000 +0200
    132. 

  132. ++++ openjdk/jdk/make/common/Defs.gmk	2013-12-08 15:44:03.000000000 +0100
    133. 

  133. +@@ -204,7 +204,7 @@
    134. 

  134. +       ifeq ($(PLATFORM), macosx)
    135. 

  135. +         FREETYPE_HEADERS_PATH = /usr/X11R6/include
    136. 

  136. +       else
    137. 

  137. +-        FREETYPE_HEADERS_PATH = /usr/include
    138. 

  138. ++        FREETYPE_HEADERS_PATH = /usr/include/disabled
    139. 

  139. +       endif
    140. 

  140. +     endif
    141. 

  141. +   endif
    142. 

  142. +diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
    143. 

  143. +--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2013-06-23 17:54:05.000000000 +0200
    144. 

  144. ++++ openjdk/jdk/make/common/shared/Platform.gmk	2013-12-08 15:44:03.000000000 +0100
    145. 

  145. +@@ -160,9 +160,6 @@
    146. 

  146. +   else
    147. 

  147. +     mach := $(shell uname -m)
    148. 

  148. +   endif
    149. 

  149. +-  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
    150. 

  150. +-    mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
    151. 

  151. +-  endif
    152. 

  152. +   archExpr = case "$(mach)" in \
    153. 

  153. +                 i[3-9]86) \
    154. 

  154. +                     echo i586 \
    155. 

  155. +diff -Nur openjdk.orig/jdk/make/java/instrument/Makefile openjdk/jdk/make/java/instrument/Makefile
    156. 

  156. +--- openjdk.orig/jdk/make/java/instrument/Makefile	2013-06-23 17:54:05.000000000 +0200
    157. 

  157. ++++ openjdk/jdk/make/java/instrument/Makefile	2013-12-08 15:44:04.000000000 +0100
    158. 

  158. +@@ -140,6 +140,8 @@
    159. 

  159. + # We don't want to link against -ljava
    160. 

  160. + JAVALIB=
    161. 

  161. + 
    162. 

  162. ++OTHER_LDLIBS += -liconv
    163. 

  163. ++
    164. 

  164. + #
    165. 

  165. + # Add to ambient vpath so we pick up the library files
    166. 

  166. + #
    167. 

  167. +diff -Nur openjdk.orig/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile
    168. 

  168. +--- openjdk.orig/jdk/make/java/net/Makefile	2013-06-23 17:54:05.000000000 +0200
    169. 

  169. ++++ openjdk/jdk/make/java/net/Makefile	2013-12-08 15:44:04.000000000 +0100
    170. 

  170. +@@ -25,7 +25,7 @@
    171. 

  171. + 
    172. 

  172. + BUILDDIR = ../..
    173. 

  173. + PACKAGE = java.net
    174. 

  174. +-LIBRARY = net
    175. 

  175. ++LIBRARY = javanet
    176. 

  176. + PRODUCT = sun
    177. 

  177. + include $(BUILDDIR)/common/Defs.gmk
    178. 

  178. + 
    179. 

  179. +diff -Nur openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
    180. 

  180. +--- openjdk.orig/jdk/make/java/nio/Makefile	2013-06-23 17:54:05.000000000 +0200
    181. 

  181. ++++ openjdk/jdk/make/java/nio/Makefile	2013-12-08 15:44:04.000000000 +0100
    182. 

  182. +@@ -369,7 +369,7 @@
    183. 

  183. + endif
    184. 

  184. + 
    185. 

  185. + ifeq ($(PLATFORM), linux)
    186. 

  186. +-  OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL)
    187. 

  187. ++  OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread $(LIBDL)
    188. 

  188. +   ifdef USE_SYSTEM_GIO
    189. 

  189. +     OTHER_LDLIBS += $(GIO_LIBS)
    190. 

  190. +     OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO
    191. 

  191. +@@ -923,7 +923,7 @@
    192. 

  192. + 
    193. 

  193. + $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
    194. 

  194. + 	$(prep-target)
    195. 

  195. +-	($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) $(LDDFLAGS) \
    196. 

  196. ++	($(CD) $(TEMPDIR); $(HOST_CC) $(CPPFLAGS_FOR_BUILD) $(LDDFLAGS) \
    197. 

  197. + 	   -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC))
    198. 

  198. + 
    199. 

  199. + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
    200. 

  200. +@@ -959,7 +959,7 @@
    201. 

  201. + 
    202. 

  202. + $(GENUC_EXE) : $(GENUC_SRC)
    203. 

  203. + 	$(prep-target)
    204. 

  204. +-	$(NIO_CC) $(CPPFLAGS) -o $@ $(GENUC_SRC)
    205. 

  205. ++	$(HOST_CC) $(CPPFLAGS_FOR_BUILD) -o $@ $(GENUC_SRC)
    206. 

  206. + 
    207. 

  207. + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
    208. 

  208. + $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java
    209. 

  209. +diff -Nur openjdk.orig/jdk/make/java/npt/Makefile openjdk/jdk/make/java/npt/Makefile
    210. 

  210. +--- openjdk.orig/jdk/make/java/npt/Makefile	2013-06-23 17:54:05.000000000 +0200
    211. 

  211. ++++ openjdk/jdk/make/java/npt/Makefile	2013-12-08 15:44:04.000000000 +0100
    212. 

  212. +@@ -64,6 +64,8 @@
    213. 

  213. + # We don't want to link against -ljava
    214. 

  214. + JAVALIB=
    215. 

  215. + 
    216. 

  216. ++OTHER_LDLIBS += -liconv
    217. 

  217. ++
    218. 

  218. + # Add -export options to explicitly spell exported symbols
    219. 

  219. + ifeq ($(PLATFORM), windows)
    220. 

  220. +   OTHER_LCF += -export:nptInitialize -export:nptTerminate
    221. 

  221. +diff -Nur openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
    222. 

  222. +--- openjdk.orig/jdk/make/sun/awt/mawt.gmk	2013-06-23 17:54:05.000000000 +0200
    223. 

  223. ++++ openjdk/jdk/make/sun/awt/mawt.gmk	2013-12-08 15:44:04.000000000 +0100
    224. 

  224. +@@ -151,22 +151,6 @@
    225. 

  225. + #endif
    226. 

  226. + 
    227. 

  227. + LIBXTST = -lXtst
    228. 

  228. +-ifeq ($(PLATFORM), linux)
    229. 

  229. +-   ifeq ($(ARCH_DATA_MODEL), 64)
    230. 

  230. +-   # XXX what about the rest of them?
    231. 

  231. +-        LIBXT = -lXt
    232. 

  232. +-    else
    233. 

  233. +-    # Allows for builds on Debian GNU Linux, X11 is in a different place 
    234. 

  234. +-       LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
    235. 

  235. +-                        $(wildcard /usr/lib/libXt.a))
    236. 

  236. +-       LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
    237. 

  237. +-                        $(wildcard /usr/lib/libSM.a))
    238. 

  238. +-       LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
    239. 

  239. +-                         $(wildcard /usr/lib/libICE.a))
    240. 

  240. +-       LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
    241. 

  241. +-                         $(wildcard /usr/lib/libXtst.a))
    242. 

  242. +-   endif
    243. 

  243. +-endif
    244. 

  244. + 
    245. 

  245. + # Use -lXmu for EditRes support
    246. 

  246. + LIBXMU_DBG	= -lXmu
    247. 

  247. +@@ -181,7 +165,7 @@
    248. 

  248. + OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
    249. 

  249. + # XXX what is this define below? Isn't it motif-related?
    250. 

  250. + OTHER_CFLAGS += -DXMSTRINGDEFINES=1
    251. 

  251. +-OTHER_LDLIBS =  $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
    252. 

  252. ++OTHER_LDLIBS =  $(LIBXMU) $(LIBXTST) -lXext -lXt -lSM -lICE -lX11 -lXi
    253. 

  253. + endif
    254. 

  254. + 
    255. 

  255. + endif
    256. 

  256. +@@ -230,11 +214,6 @@
    257. 

  257. +   CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2
    258. 

  258. + endif
    259. 

  259. + 
    260. 

  260. +-ifndef HEADLESS
    261. 

  261. +-CPPFLAGS += -I$(OPENWIN_HOME)/include 
    262. 

  262. +-LDFLAGS  += -L$(OPENWIN_LIB)
    263. 

  263. +-
    264. 

  264. +-endif # !HEADLESS
    265. 

  265. + 
    266. 

  266. + CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
    267. 

  267. +             -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
    268. 

  268. +@@ -269,11 +248,6 @@
    269. 

  269. + endif # !HEADLESS
    270. 

  270. + endif # PLATFORM
    271. 

  271. + 
    272. 

  272. +-ifeq ($(PLATFORM), linux)
    273. 

  273. +-  # Checking for the X11/extensions headers at the additional location
    274. 

  274. +-  CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
    275. 

  275. +-                        $(wildcard /usr/include/X11/extensions))
    276. 

  276. +-endif
    277. 

  277. + 
    278. 

  278. + ifeq ($(PLATFORM), macosx))
    279. 

  279. +   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
    280. 

  280. +diff -Nur openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
    281. 

  281. +--- openjdk.orig/jdk/make/sun/splashscreen/Makefile	2013-06-23 17:54:05.000000000 +0200
    282. 

  282. ++++ openjdk/jdk/make/sun/splashscreen/Makefile	2013-12-08 15:44:04.000000000 +0100
    283. 

  283. +@@ -55,6 +55,8 @@
    284. 

  284. + 
    285. 

  285. + JAVALIB=
    286. 

  286. + 
    287. 

  287. ++OTHER_LDLIBS += -liconv
    288. 

  288. ++
    289. 

  289. + #
    290. 

  290. + # C Flags
    291. 

  291. + #
    292. 

  292. +diff -Nur openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
    293. 

  293. +--- openjdk.orig/jdk/make/sun/xawt/Makefile	2013-06-23 17:54:05.000000000 +0200
    294. 

  294. ++++ openjdk/jdk/make/sun/xawt/Makefile	2013-12-08 15:44:04.000000000 +0100
    295. 

  295. +@@ -292,16 +292,10 @@
    296. 

  296. + SIZERS = $(SIZER).32
    297. 

  297. + SIZERS_C = $(SIZER_32_C)
    298. 

  298. + SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
    299. 

  299. +-ifdef CROSS_COMPILE_ARCH
    300. 

  300. +-CFLAGS_32 = -m32
    301. 

  301. +-endif
    302. 

  302. + else # !32
    303. 

  303. + SIZERS = $(SIZER).64
    304. 

  304. + SIZERS_C = $(SIZER_64_C)
    305. 

  305. + SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
    306. 

  306. +-ifdef CROSS_COMPILE_ARCH
    307. 

  307. +-CFLAGS_64 = -m64
    308. 

  308. +-endif
    309. 

  309. + endif # 32
    310. 

  310. + endif # !macosx
    311. 

  311. + endif # solaris
    312. 

  312. +@@ -337,11 +331,7 @@
    313. 

  313. + WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class 
    314. 

  314. + XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
    315. 

  315. + 
    316. 

  316. +-ifndef CROSS_COMPILE_ARCH
    317. 

  317. +-SIZERS_CC = $(CC)
    318. 

  318. +-else
    319. 

  319. +-SIZERS_CC = $(HOST_CC)
    320. 

  320. +-endif
    321. 

  321. ++SIZERS_CC = $(CC) -static
    322. 

  322. + 
    323. 

  323. + $(SIZERS): $(SIZERS_C) 
    324. 

  324. + 	$(prep-target)
    325. 

  325. +@@ -364,7 +354,7 @@
    326. 

  326. + 	    $(CHMOD) +w $@;\
    327. 

  327. + 	else	\
    328. 

  328. + 	    $(ECHO) GENERATING $@; \
    329. 

  329. +-	    $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
    330. 

  330. ++	    $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
    331. 

  331. + 	fi
    332. 

  332. + 	@if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
    333. 

  333. + 	    $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
    334. 

  334. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
    335. 

  335. +--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2013-06-23 17:54:05.000000000 +0200
    336. 

  336. ++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2013-12-08 15:44:04.000000000 +0100
    337. 

  337. +@@ -69,7 +69,7 @@
    338. 

  338. +      */
    339. 

  339. +     static {
    340. 

  340. +         java.security.AccessController.doPrivileged(
    341. 

  341. +-                  new sun.security.action.LoadLibraryAction("net"));
    342. 

  342. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    343. 

  343. +     }
    344. 

  344. + 
    345. 

  345. +     /**
    346. 

  346. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
    347. 

  347. +--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2013-06-23 17:54:05.000000000 +0200
    348. 

  348. ++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2013-12-08 15:44:04.000000000 +0100
    349. 

  349. +@@ -78,7 +78,7 @@
    350. 

  350. +      */
    351. 

  351. +     static {
    352. 

  352. +         java.security.AccessController.doPrivileged(
    353. 

  353. +-                  new sun.security.action.LoadLibraryAction("net"));
    354. 

  354. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    355. 

  355. +     }
    356. 

  356. + 
    357. 

  357. +     /**
    358. 

  358. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
    359. 

  359. +--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java	2013-06-23 17:54:05.000000000 +0200
    360. 

  360. ++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java	2013-12-08 15:44:04.000000000 +0100
    361. 

  361. +@@ -47,7 +47,7 @@
    362. 

  362. +      */
    363. 

  363. +     static {
    364. 

  364. +         java.security.AccessController.doPrivileged(
    365. 

  365. +-                  new sun.security.action.LoadLibraryAction("net"));
    366. 

  366. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    367. 

  367. +         init();
    368. 

  368. +     }
    369. 

  369. + 
    370. 

  370. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java
    371. 

  371. +--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java	2013-06-23 17:54:05.000000000 +0200
    372. 

  372. ++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java	2013-12-08 15:44:04.000000000 +0100
    373. 

  373. +@@ -260,7 +260,7 @@
    374. 

  374. +     static {
    375. 

  375. +         preferIPv6Address = java.security.AccessController.doPrivileged(
    376. 

  376. +             new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
    377. 

  377. +-        AccessController.doPrivileged(new LoadLibraryAction("net"));
    378. 

  378. ++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
    379. 

  379. +         init();
    380. 

  380. +     }
    381. 

  381. + 
    382. 

  382. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
    383. 

  383. +--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java	2013-06-23 17:54:05.000000000 +0200
    384. 

  384. ++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java	2013-12-08 15:44:04.000000000 +0100
    385. 

  385. +@@ -53,7 +53,7 @@
    386. 

  386. +     private static final int defaultIndex; /* index of defaultInterface */
    387. 

  387. + 
    388. 

  388. +     static {
    389. 

  389. +-        AccessController.doPrivileged(new LoadLibraryAction("net"));
    390. 

  390. ++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
    391. 

  391. +         init();
    392. 

  392. +         defaultInterface = DefaultInterface.getDefault();
    393. 

  393. +         if (defaultInterface != null) {
    394. 

  394. +diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
    395. 

  395. +--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2013-06-23 17:54:05.000000000 +0200
    396. 

  396. ++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2013-12-08 15:44:04.000000000 +0100
    397. 

  397. +@@ -76,6 +76,6 @@
    398. 

  398. + 
    399. 

  399. +     static {
    400. 

  400. +         AccessController.doPrivileged(
    401. 

  401. +-            new sun.security.action.LoadLibraryAction("net"));
    402. 

  402. ++            new sun.security.action.LoadLibraryAction("javanet"));
    403. 

  403. +     }
    404. 

  404. + }
    405. 

  405. +diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
    406. 

  406. +--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2013-06-23 17:54:05.000000000 +0200
    407. 

  407. ++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2013-12-08 15:44:04.000000000 +0100
    408. 

  408. +@@ -95,7 +95,7 @@
    409. 

  409. +                 }});
    410. 

  410. +         if (b != null && b.booleanValue()) {
    411. 

  411. +             java.security.AccessController.doPrivileged(
    412. 

  412. +-                      new sun.security.action.LoadLibraryAction("net"));
    413. 

  413. ++                      new sun.security.action.LoadLibraryAction("javanet"));
    414. 

  414. +             hasSystemProxies = init();
    415. 

  415. +         }
    416. 

  416. +     }
    417. 

  417. +diff -Nur openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
    418. 

  418. +--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java	2013-06-23 17:54:05.000000000 +0200
    419. 

  419. ++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java	2013-12-08 15:44:04.000000000 +0100
    420. 

  420. +@@ -483,7 +483,7 @@
    421. 

  421. +                 return;
    422. 

  422. +             loaded = true;
    423. 

  423. +             java.security.AccessController
    424. 

  424. +-                .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
    425. 

  425. ++                .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
    426. 

  426. +             java.security.AccessController
    427. 

  427. +                 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
    428. 

  428. +             // IOUtil must be initialized; Its native methods are called from
    429. 

  429. +diff -Nur openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
    430. 

  430. +--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-06-23 17:54:05.000000000 +0200
    431. 

  431. ++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-12-08 15:44:04.000000000 +0100
    432. 

  432. +@@ -247,7 +247,7 @@
    433. 

  433. + 
    434. 

  434. +     static {
    435. 

  435. +         java.security.AccessController.doPrivileged(
    436. 

  436. +-            new sun.security.action.LoadLibraryAction("net"));
    437. 

  437. ++            new sun.security.action.LoadLibraryAction("javanet"));
    438. 

  438. +     }
    439. 

  439. + 
    440. 

  440. + }
    441. 

  441. +diff -Nur openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c
    442. 

  442. +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2013-06-23 17:54:05.000000000 +0200
    443. 

  443. ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2013-12-08 15:44:04.000000000 +0100
    444. 

  444. +@@ -246,7 +246,8 @@
    445. 

  445. +     if (wcs == NULL)
    446. 

  446. +         return NULL;
    447. 

  447. + 
    448. 

  448. +-    n = len*MB_CUR_MAX + 1;
    449. 

  449. ++    //evil hack for uclibc
    450. 

  450. ++    n = len*1 + 1;
    451. 

  451. + 
    452. 

  452. +     mbs = (char *) malloc(n * sizeof(char));
    453. 

  453. +     if (mbs == NULL) {
    454. 

  454. +diff -Nur openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c
    455. 

  455. +--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c	2013-06-23 17:54:05.000000000 +0200
    456. 

  456. ++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c	2013-12-08 15:44:04.000000000 +0100
    457. 

  457. +@@ -27,9 +27,6 @@
    458. 

  458. + #include <X11/Xutil.h>
    459. 

  459. + #include <X11/Xos.h>
    460. 

  460. + #include <X11/Xatom.h>
    461. 

  461. +-#ifdef __linux__
    462. 

  462. +-#include <execinfo.h>
    463. 

  463. +-#endif
    464. 

  464. + 
    465. 

  465. + #include <jvm.h>
    466. 

  466. + #include <jni.h>
    467. 

  467. +@@ -785,25 +782,6 @@
    468. 

  468. +     return ret;
    469. 

  469. + }
    470. 

  470. + 
    471. 

  471. +-#ifdef __linux__
    472. 

  472. +-void print_stack(void)
    473. 

  473. +-{
    474. 

  474. +-  void *array[10];
    475. 

  475. +-  size_t size;
    476. 

  476. +-  char **strings;
    477. 

  477. +-  size_t i;
    478. 

  478. +-
    479. 

  479. +-  size = backtrace (array, 10);
    480. 

  480. +-  strings = backtrace_symbols (array, size);
    481. 

  481. +-
    482. 

  482. +-  fprintf (stderr, "Obtained %zd stack frames.\n", size);
    483. 

  483. +-
    484. 

  484. +-  for (i = 0; i < size; i++)
    485. 

  485. +-     fprintf (stderr, "%s\n", strings[i]);
    486. 

  486. +-
    487. 

  487. +-  free (strings);
    488. 

  488. +-}
    489. 

  489. +-#endif
    490. 

  490. + 
    491. 

  491. + Window get_xawt_root_shell(JNIEnv *env) {
    492. 

  492. +   static jclass classXRootWindow = NULL;
    493. 

  493. +diff -Nur openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
    494. 

  494. +--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-06-23 17:54:05.000000000 +0200
    495. 

  495. ++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-12-08 15:44:04.000000000 +0100
    496. 

  496. +@@ -159,7 +159,7 @@
    497. 

  497. + 
    498. 

  498. +     static {
    499. 

  499. +         java.security.AccessController.doPrivileged(
    500. 

  500. +-            new sun.security.action.LoadLibraryAction("net"));
    501. 

  501. ++            new sun.security.action.LoadLibraryAction("javanet"));
    502. 

  502. +         init0();
    503. 

  503. + 
    504. 

  504. +         // start the address listener thread
    505. 

  505. +diff -Nur openjdk.orig/Makefile openjdk/Makefile
    506. 

  506. +--- openjdk.orig/Makefile	2013-06-23 17:53:43.000000000 +0200
    507. 

  507. ++++ openjdk/Makefile	2013-12-08 15:44:04.000000000 +0100
    508. 

  508. +@@ -53,9 +53,7 @@
    509. 

  509. + REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
    510. 

  510. + REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
    511. 

  511. + 
    512. 

  512. +-ifndef TOPDIR
    513. 

  513. +-  TOPDIR:=.
    514. 

  514. +-endif
    515. 

  515. ++TOPDIR:=.
    516. 

  516. + 
    517. 

  517. + ifndef JDK_TOPDIR
    518. 

  518. +   JDK_TOPDIR=$(TOPDIR)/jdk
    519.