Почетна Преглед Помоћ
Пријавите се
oss
/
openadk
4
1
Креирај огранак 3
Датотеке Дискусије 1 Захтеви за спајање 0 Вики
Дрво: 1d41dfd46f
Гране Ознаке
openadk
/
package
/
openjdk7
/
patches
/
openadk.patch

openadk.patch 22 KB
Историја Датотека

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526 
  1. diff -Nur icedtea-2.3.9.orig/Makefile.in icedtea-2.3.9/Makefile.in
    2. 

  2. --- icedtea-2.3.9.orig/Makefile.in	2013-04-21 22:48:31.000000000 +0200
    3. 

  3. +++ icedtea-2.3.9/Makefile.in	2013-11-15 12:28:32.000000000 +0100
    4. 

  4. @@ -90,7 +90,6 @@
    5. 

  5.  @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/7089790-bsd_port.patch \
    6. 

  6.  @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/7098194-macosx_port.patch \
    7. 

  7.  @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/7116189-setnativethreadname.patch \
    8. 

  8. -@WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/6924259-string_offset.patch \
    9. 

  9.  @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/revert_arm_debug.patch
    10. 

  10.  
    11. 

  11.  @WITH_RHINO_TRUE@am__append_9 = \
    12. 

  12. @@ -657,7 +656,7 @@
    13. 

  13.  	$(am__append_17) $(am__append_18) $(DISTRIBUTION_PATCHES)
    14. 

  14.  
    15. 

  15.  # Bootstrapping patches
    16. 

  16. -ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
    17. 

  17. +ICEDTEA_BOOT_PATCHES = patches/openadk.patch patches/boot/javafiles.patch \
    18. 

  18.  	patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \
    19. 

  19.  	patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \
    20. 

  20.  	patches/boot/demos.patch patches/boot/ecj-fphexconstants.patch \
    21. 

  21. @@ -2050,7 +2049,7 @@
    22. 

  22.  # Optional native ecj
    23. 

  23.  stamps/native-ecj.stamp:
    24. 

  24.  	mkdir -p stamps 
    25. 

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

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

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

  28.  	touch $@
    29. 

  29.  
    30. 

  30. diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk.patch
    31. 

  31. --- icedtea-2.3.9.orig/patches/openadk.patch	1970-01-01 01:00:00.000000000 +0100
    32. 

  32. +++ icedtea-2.3.9/patches/openadk.patch	2013-11-15 13:52:27.000000000 +0100
    33. 

  33. @@ -0,0 +1,493 @@
    34. 

  34. +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
    35. 

  35. +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2013-03-15 17:33:37.000000000 +0100
    36. 

  36. ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2013-11-15 13:51:09.000000000 +0100
    37. 

  37. +@@ -115,7 +115,6 @@
    38. 

  38. + # include <string.h>
    39. 

  39. + # include <syscall.h>
    40. 

  40. + # include <sys/sysinfo.h>
    41. 

  41. +-# include <gnu/libc-version.h>
    42. 

  42. + # include <sys/ipc.h>
    43. 

  43. + # include <sys/shm.h>
    44. 

  44. + # include <link.h>
    45. 

  45. +@@ -644,9 +643,7 @@
    46. 

  46. +      os::Linux::set_glibc_version(str);
    47. 

  47. +   } else {
    48. 

  48. +      // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
    49. 

  49. +-     static char _gnu_libc_version[32];
    50. 

  50. +-     jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
    51. 

  51. +-              "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
    52. 

  52. ++     static char _gnu_libc_version[32] = "2.9";
    53. 

  53. +      os::Linux::set_glibc_version(_gnu_libc_version);
    54. 

  54. +   }
    55. 

  55. + 
    56. 

  56. +@@ -2640,10 +2637,7 @@
    57. 

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

  58. + // we should use the base version.
    59. 

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

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

  61. +-  if (f == NULL) {
    62. 

  62. +-    f = dlsym(handle, name);
    63. 

  63. +-  }
    64. 

  64. ++  void *f = dlsym(handle, name);
    65. 

  65. +   return f;
    66. 

  66. + }
    67. 

  67. + 
    68. 

  68. +@@ -4908,7 +4902,21 @@
    69. 

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

  70. + // so just return the system wide load average.
    71. 

  71. + int os::loadavg(double loadavg[], int nelem) {
    72. 

  72. +-  return ::getloadavg(loadavg, nelem);
    73. 

  73. ++ FILE *LOADAVG;
    74. 

  74. ++ double avg[3] = { 0.0, 0.0, 0.0 };
    75. 

  75. ++ int i, res = -1;;
    76. 

  76. ++
    77. 

  77. ++ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
    78. 

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

  79. ++ res = 0;
    80. 

  80. ++ fclose(LOADAVG);
    81. 

  81. ++ }
    82. 

  82. ++
    83. 

  83. ++ for (i = 0; (i < nelem) && (i < 3); i++) {
    84. 

  84. ++ loadavg[i] = avg[i];
    85. 

  85. ++ }
    86. 

  86. ++
    87. 

  87. ++ return res;
    88. 

  88. + }
    89. 

  89. + 
    90. 

  90. + void os::pause() {
    91. 

  91. +diff -Nur openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
    92. 

  92. +--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2013-03-15 17:33:37.000000000 +0100
    93. 

  93. ++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2013-11-15 13:51:57.000000000 +0100
    94. 

  94. +@@ -253,7 +253,7 @@
    95. 

  95. + #elif defined(__APPLE__)
    96. 

  96. + inline int g_isnan(double f) { return isnan(f); }
    97. 

  97. + #elif defined(LINUX) || defined(_ALLBSD_SOURCE)
    98. 

  98. +-inline int g_isnan(float  f) { return isnanf(f); }
    99. 

  99. ++inline int g_isnan(float  f) { return __isnanf(f); }
    100. 

  100. + inline int g_isnan(double f) { return isnan(f); }
    101. 

  101. + #else
    102. 

  102. + #error "missing platform-specific definition here"
    103. 

  103. +@@ -267,8 +267,8 @@
    104. 

  104. + 
    105. 

  105. + // Checking for finiteness
    106. 

  106. + 
    107. 

  107. +-inline int g_isfinite(jfloat  f)                 { return finite(f); }
    108. 

  108. +-inline int g_isfinite(jdouble f)                 { return finite(f); }
    109. 

  109. ++inline int g_isfinite(jfloat  f)                 { return isfinite(f); }
    110. 

  110. ++inline int g_isfinite(jdouble f)                 { return isfinite(f); }
    111. 

  111. + 
    112. 

  112. + 
    113. 

  113. + // Wide characters
    114. 

  114. +diff -Nur openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
    115. 

  115. +--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2013-04-16 00:41:13.000000000 +0200
    116. 

  116. ++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2013-11-15 13:51:09.000000000 +0100
    117. 

  117. +@@ -80,7 +80,7 @@
    118. 

  118. +     LDDFLAGS += $(ZIPOBJS)
    119. 

  119. +   endif
    120. 

  120. + else
    121. 

  121. +-  OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
    122. 

  122. ++  CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI
    123. 

  123. +   OTHER_LDLIBS += $(JVMLIB)
    124. 

  124. + endif
    125. 

  125. + 
    126. 

  126. +diff -Nur openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
    127. 

  127. +--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile	2013-04-16 00:41:13.000000000 +0200
    128. 

  128. ++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile	2013-11-15 13:51:09.000000000 +0100
    129. 

  129. +@@ -64,7 +64,7 @@
    130. 

  130. + COMPILER_WARNINGS_FATAL=true
    131. 

  131. + endif
    132. 

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

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

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

  135. + endif
    136. 

  136. + ifeq ($(PLATFORM), solaris)
    137. 

  137. + #LIBSCTP = -lsctp
    138. 

  138. +diff -Nur openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk
    139. 

  139. +--- openjdk.orig/jdk/make/common/Defs.gmk	2013-04-16 00:41:13.000000000 +0200
    140. 

  140. ++++ openjdk/jdk/make/common/Defs.gmk	2013-11-15 13:51:09.000000000 +0100
    141. 

  141. +@@ -204,7 +204,7 @@
    142. 

  142. +       ifeq ($(PLATFORM), macosx)
    143. 

  143. +         FREETYPE_HEADERS_PATH = /usr/X11R6/include
    144. 

  144. +       else
    145. 

  145. +-        FREETYPE_HEADERS_PATH = /usr/include
    146. 

  146. ++        FREETYPE_HEADERS_PATH = /usr/include/disabled
    147. 

  147. +       endif
    148. 

  148. +     endif
    149. 

  149. +   endif
    150. 

  150. +diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
    151. 

  151. +--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2013-04-16 00:41:13.000000000 +0200
    152. 

  152. ++++ openjdk/jdk/make/common/shared/Platform.gmk	2013-11-15 13:51:09.000000000 +0100
    153. 

  153. +@@ -160,9 +160,6 @@
    154. 

  154. +   else
    155. 

  155. +     mach := $(shell uname -m)
    156. 

  156. +   endif
    157. 

  157. +-  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
    158. 

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

  159. +-  endif
    160. 

  160. +   archExpr = case "$(mach)" in \
    161. 

  161. +                 i[3-9]86) \
    162. 

  162. +                     echo i586 \
    163. 

  163. +diff -Nur openjdk.orig/jdk/make/java/instrument/Makefile openjdk/jdk/make/java/instrument/Makefile
    164. 

  164. +--- openjdk.orig/jdk/make/java/instrument/Makefile	2013-04-16 00:41:13.000000000 +0200
    165. 

  165. ++++ openjdk/jdk/make/java/instrument/Makefile	2013-11-15 13:51:09.000000000 +0100
    166. 

  166. +@@ -140,6 +140,8 @@
    167. 

  167. + # We don't want to link against -ljava
    168. 

  168. + JAVALIB=
    169. 

  169. + 
    170. 

  170. ++OTHER_LDLIBS += -liconv
    171. 

  171. ++
    172. 

  172. + #
    173. 

  173. + # Add to ambient vpath so we pick up the library files
    174. 

  174. + #
    175. 

  175. +diff -Nur openjdk.orig/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile
    176. 

  176. +--- openjdk.orig/jdk/make/java/net/Makefile	2013-04-16 00:41:13.000000000 +0200
    177. 

  177. ++++ openjdk/jdk/make/java/net/Makefile	2013-11-15 13:51:09.000000000 +0100
    178. 

  178. +@@ -25,7 +25,7 @@
    179. 

  179. + 
    180. 

  180. + BUILDDIR = ../..
    181. 

  181. + PACKAGE = java.net
    182. 

  182. +-LIBRARY = net
    183. 

  183. ++LIBRARY = javanet
    184. 

  184. + PRODUCT = sun
    185. 

  185. + include $(BUILDDIR)/common/Defs.gmk
    186. 

  186. + 
    187. 

  187. +diff -Nur openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
    188. 

  188. +--- openjdk.orig/jdk/make/java/nio/Makefile	2013-04-16 00:41:13.000000000 +0200
    189. 

  189. ++++ openjdk/jdk/make/java/nio/Makefile	2013-11-15 13:51:09.000000000 +0100
    190. 

  190. +@@ -369,7 +369,7 @@
    191. 

  191. + endif
    192. 

  192. + 
    193. 

  193. + ifeq ($(PLATFORM), linux)
    194. 

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

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

  196. +   ifdef USE_SYSTEM_GIO
    197. 

  197. +     OTHER_LDLIBS += $(GIO_LIBS)
    198. 

  198. +     OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO
    199. 

  199. +@@ -923,7 +923,7 @@
    200. 

  200. + 
    201. 

  201. + $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
    202. 

  202. + 	$(prep-target)
    203. 

  203. +-	($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) $(LDDFLAGS) \
    204. 

  204. ++	($(CD) $(TEMPDIR); $(HOST_CC) $(CPPFLAGS_FOR_BUILD) $(LDDFLAGS) \
    205. 

  205. + 	   -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC))
    206. 

  206. + 
    207. 

  207. + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
    208. 

  208. +@@ -959,7 +959,7 @@
    209. 

  209. + 
    210. 

  210. + $(GENUC_EXE) : $(GENUC_SRC)
    211. 

  211. + 	$(prep-target)
    212. 

  212. +-	$(NIO_CC) $(CPPFLAGS) -o $@ $(GENUC_SRC)
    213. 

  213. ++	$(HOST_CC) $(CPPFLAGS_FOR_BUILD) -o $@ $(GENUC_SRC)
    214. 

  214. + 
    215. 

  215. + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
    216. 

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

  217. +diff -Nur openjdk.orig/jdk/make/java/npt/Makefile openjdk/jdk/make/java/npt/Makefile
    218. 

  218. +--- openjdk.orig/jdk/make/java/npt/Makefile	2013-04-16 00:41:13.000000000 +0200
    219. 

  219. ++++ openjdk/jdk/make/java/npt/Makefile	2013-11-15 13:51:09.000000000 +0100
    220. 

  220. +@@ -64,6 +64,8 @@
    221. 

  221. + # We don't want to link against -ljava
    222. 

  222. + JAVALIB=
    223. 

  223. + 
    224. 

  224. ++OTHER_LDLIBS += -liconv
    225. 

  225. ++
    226. 

  226. + # Add -export options to explicitly spell exported symbols
    227. 

  227. + ifeq ($(PLATFORM), windows)
    228. 

  228. +   OTHER_LCF += -export:nptInitialize -export:nptTerminate
    229. 

  229. +diff -Nur openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
    230. 

  230. +--- openjdk.orig/jdk/make/sun/awt/mawt.gmk	2013-04-16 00:41:13.000000000 +0200
    231. 

  231. ++++ openjdk/jdk/make/sun/awt/mawt.gmk	2013-11-15 13:51:09.000000000 +0100
    232. 

  232. +@@ -151,22 +151,6 @@
    233. 

  233. + #endif
    234. 

  234. + 
    235. 

  235. + LIBXTST = -lXtst
    236. 

  236. +-ifeq ($(PLATFORM), linux)
    237. 

  237. +-   ifeq ($(ARCH_DATA_MODEL), 64)
    238. 

  238. +-   # XXX what about the rest of them?
    239. 

  239. +-        LIBXT = -lXt
    240. 

  240. +-    else
    241. 

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

  242. +-       LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
    243. 

  243. +-                        $(wildcard /usr/lib/libXt.a))
    244. 

  244. +-       LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
    245. 

  245. +-                        $(wildcard /usr/lib/libSM.a))
    246. 

  246. +-       LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
    247. 

  247. +-                         $(wildcard /usr/lib/libICE.a))
    248. 

  248. +-       LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
    249. 

  249. +-                         $(wildcard /usr/lib/libXtst.a))
    250. 

  250. +-   endif
    251. 

  251. +-endif
    252. 

  252. + 
    253. 

  253. + # Use -lXmu for EditRes support
    254. 

  254. + LIBXMU_DBG	= -lXmu
    255. 

  255. +@@ -181,7 +165,7 @@
    256. 

  256. + OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
    257. 

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

  258. + OTHER_CFLAGS += -DXMSTRINGDEFINES=1
    259. 

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

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

  261. + endif
    262. 

  262. + 
    263. 

  263. + endif
    264. 

  264. +@@ -230,11 +214,6 @@
    265. 

  265. +   CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2
    266. 

  266. + endif
    267. 

  267. + 
    268. 

  268. +-ifndef HEADLESS
    269. 

  269. +-CPPFLAGS += -I$(OPENWIN_HOME)/include 
    270. 

  270. +-LDFLAGS  += -L$(OPENWIN_LIB)
    271. 

  271. +-
    272. 

  272. +-endif # !HEADLESS
    273. 

  273. + 
    274. 

  274. + CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
    275. 

  275. +             -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
    276. 

  276. +@@ -269,11 +248,6 @@
    277. 

  277. + endif # !HEADLESS
    278. 

  278. + endif # PLATFORM
    279. 

  279. + 
    280. 

  280. +-ifeq ($(PLATFORM), linux)
    281. 

  281. +-  # Checking for the X11/extensions headers at the additional location
    282. 

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

  283. +-                        $(wildcard /usr/include/X11/extensions))
    284. 

  284. +-endif
    285. 

  285. + 
    286. 

  286. + ifeq ($(PLATFORM), macosx))
    287. 

  287. +   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
    288. 

  288. +diff -Nur openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
    289. 

  289. +--- openjdk.orig/jdk/make/sun/splashscreen/Makefile	2013-04-16 00:41:13.000000000 +0200
    290. 

  290. ++++ openjdk/jdk/make/sun/splashscreen/Makefile	2013-11-15 13:51:09.000000000 +0100
    291. 

  291. +@@ -55,6 +55,8 @@
    292. 

  292. + 
    293. 

  293. + JAVALIB=
    294. 

  294. + 
    295. 

  295. ++OTHER_LDLIBS += -liconv
    296. 

  296. ++
    297. 

  297. + #
    298. 

  298. + # C Flags
    299. 

  299. + #
    300. 

  300. +diff -Nur openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
    301. 

  301. +--- openjdk.orig/jdk/make/sun/xawt/Makefile	2013-04-16 00:41:13.000000000 +0200
    302. 

  302. ++++ openjdk/jdk/make/sun/xawt/Makefile	2013-11-15 13:51:09.000000000 +0100
    303. 

  303. +@@ -292,16 +292,10 @@
    304. 

  304. + SIZERS = $(SIZER).32
    305. 

  305. + SIZERS_C = $(SIZER_32_C)
    306. 

  306. + SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
    307. 

  307. +-ifdef CROSS_COMPILE_ARCH
    308. 

  308. +-CFLAGS_32 = -m32
    309. 

  309. +-endif
    310. 

  310. + else # !32
    311. 

  311. + SIZERS = $(SIZER).64
    312. 

  312. + SIZERS_C = $(SIZER_64_C)
    313. 

  313. + SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
    314. 

  314. +-ifdef CROSS_COMPILE_ARCH
    315. 

  315. +-CFLAGS_64 = -m64
    316. 

  316. +-endif
    317. 

  317. + endif # 32
    318. 

  318. + endif # !macosx
    319. 

  319. + endif # solaris
    320. 

  320. +@@ -337,11 +331,7 @@
    321. 

  321. + WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class 
    322. 

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

  323. + 
    324. 

  324. +-ifndef CROSS_COMPILE_ARCH
    325. 

  325. +-SIZERS_CC = $(CC)
    326. 

  326. +-else
    327. 

  327. +-SIZERS_CC = $(HOST_CC)
    328. 

  328. +-endif
    329. 

  329. ++SIZERS_CC = $(CC) -static
    330. 

  330. + 
    331. 

  331. + $(SIZERS): $(SIZERS_C) 
    332. 

  332. + 	$(prep-target)
    333. 

  333. +@@ -364,7 +354,7 @@
    334. 

  334. + 	    $(CHMOD) +w $@;\
    335. 

  335. + 	else	\
    336. 

  336. + 	    $(ECHO) GENERATING $@; \
    337. 

  337. +-	    $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
    338. 

  338. ++	    $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
    339. 

  339. + 	fi
    340. 

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

  341. + 	    $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
    342. 

  342. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
    343. 

  343. +--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2013-04-16 00:41:13.000000000 +0200
    344. 

  344. ++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2013-11-15 13:51:09.000000000 +0100
    345. 

  345. +@@ -69,7 +69,7 @@
    346. 

  346. +      */
    347. 

  347. +     static {
    348. 

  348. +         java.security.AccessController.doPrivileged(
    349. 

  349. +-                  new sun.security.action.LoadLibraryAction("net"));
    350. 

  350. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    351. 

  351. +     }
    352. 

  352. + 
    353. 

  353. +     /**
    354. 

  354. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
    355. 

  355. +--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2013-04-16 00:41:13.000000000 +0200
    356. 

  356. ++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2013-11-15 13:51:09.000000000 +0100
    357. 

  357. +@@ -78,7 +78,7 @@
    358. 

  358. +      */
    359. 

  359. +     static {
    360. 

  360. +         java.security.AccessController.doPrivileged(
    361. 

  361. +-                  new sun.security.action.LoadLibraryAction("net"));
    362. 

  362. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    363. 

  363. +     }
    364. 

  364. + 
    365. 

  365. +     /**
    366. 

  366. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
    367. 

  367. +--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java	2013-04-16 00:41:13.000000000 +0200
    368. 

  368. ++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java	2013-11-15 13:51:09.000000000 +0100
    369. 

  369. +@@ -47,7 +47,7 @@
    370. 

  370. +      */
    371. 

  371. +     static {
    372. 

  372. +         java.security.AccessController.doPrivileged(
    373. 

  373. +-                  new sun.security.action.LoadLibraryAction("net"));
    374. 

  374. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    375. 

  375. +         init();
    376. 

  376. +     }
    377. 

  377. + 
    378. 

  378. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java
    379. 

  379. +--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java	2013-04-16 00:41:13.000000000 +0200
    380. 

  380. ++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java	2013-11-15 13:51:09.000000000 +0100
    381. 

  381. +@@ -260,7 +260,7 @@
    382. 

  382. +     static {
    383. 

  383. +         preferIPv6Address = java.security.AccessController.doPrivileged(
    384. 

  384. +             new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
    385. 

  385. +-        AccessController.doPrivileged(new LoadLibraryAction("net"));
    386. 

  386. ++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
    387. 

  387. +         init();
    388. 

  388. +     }
    389. 

  389. + 
    390. 

  390. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
    391. 

  391. +--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java	2013-04-16 00:41:13.000000000 +0200
    392. 

  392. ++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java	2013-11-15 13:51:09.000000000 +0100
    393. 

  393. +@@ -53,7 +53,7 @@
    394. 

  394. +     private static final int defaultIndex; /* index of defaultInterface */
    395. 

  395. + 
    396. 

  396. +     static {
    397. 

  397. +-        AccessController.doPrivileged(new LoadLibraryAction("net"));
    398. 

  398. ++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
    399. 

  399. +         init();
    400. 

  400. +         defaultInterface = DefaultInterface.getDefault();
    401. 

  401. +         if (defaultInterface != null) {
    402. 

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

  403. +--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2013-04-16 00:41:13.000000000 +0200
    404. 

  404. ++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2013-11-15 13:51:09.000000000 +0100
    405. 

  405. +@@ -76,6 +76,6 @@
    406. 

  406. + 
    407. 

  407. +     static {
    408. 

  408. +         AccessController.doPrivileged(
    409. 

  409. +-            new sun.security.action.LoadLibraryAction("net"));
    410. 

  410. ++            new sun.security.action.LoadLibraryAction("javanet"));
    411. 

  411. +     }
    412. 

  412. + }
    413. 

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

  414. +--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2013-04-16 00:41:13.000000000 +0200
    415. 

  415. ++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2013-11-15 13:51:09.000000000 +0100
    416. 

  416. +@@ -95,7 +95,7 @@
    417. 

  417. +                 }});
    418. 

  418. +         if (b != null && b.booleanValue()) {
    419. 

  419. +             java.security.AccessController.doPrivileged(
    420. 

  420. +-                      new sun.security.action.LoadLibraryAction("net"));
    421. 

  421. ++                      new sun.security.action.LoadLibraryAction("javanet"));
    422. 

  422. +             hasSystemProxies = init();
    423. 

  423. +         }
    424. 

  424. +     }
    425. 

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

  426. +--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java	2013-04-16 00:41:13.000000000 +0200
    427. 

  427. ++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java	2013-11-15 13:51:09.000000000 +0100
    428. 

  428. +@@ -483,7 +483,7 @@
    429. 

  429. +                 return;
    430. 

  430. +             loaded = true;
    431. 

  431. +             java.security.AccessController
    432. 

  432. +-                .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
    433. 

  433. ++                .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
    434. 

  434. +             java.security.AccessController
    435. 

  435. +                 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
    436. 

  436. +             // IOUtil must be initialized; Its native methods are called from
    437. 

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

  438. +--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-04-16 00:41:13.000000000 +0200
    439. 

  439. ++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-11-15 13:51:09.000000000 +0100
    440. 

  440. +@@ -247,7 +247,7 @@
    441. 

  441. + 
    442. 

  442. +     static {
    443. 

  443. +         java.security.AccessController.doPrivileged(
    444. 

  444. +-            new sun.security.action.LoadLibraryAction("net"));
    445. 

  445. ++            new sun.security.action.LoadLibraryAction("javanet"));
    446. 

  446. +     }
    447. 

  447. + 
    448. 

  448. + }
    449. 

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

  450. +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2013-04-16 00:41:13.000000000 +0200
    451. 

  451. ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2013-11-15 13:51:09.000000000 +0100
    452. 

  452. +@@ -246,7 +246,8 @@
    453. 

  453. +     if (wcs == NULL)
    454. 

  454. +         return NULL;
    455. 

  455. + 
    456. 

  456. +-    n = len*MB_CUR_MAX + 1;
    457. 

  457. ++    //evil hack for uclibc
    458. 

  458. ++    n = len*1 + 1;
    459. 

  459. + 
    460. 

  460. +     mbs = (char *) malloc(n * sizeof(char));
    461. 

  461. +     if (mbs == NULL) {
    462. 

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

  463. +--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c	2013-04-16 00:41:13.000000000 +0200
    464. 

  464. ++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c	2013-11-15 13:51:09.000000000 +0100
    465. 

  465. +@@ -27,9 +27,6 @@
    466. 

  466. + #include <X11/Xutil.h>
    467. 

  467. + #include <X11/Xos.h>
    468. 

  468. + #include <X11/Xatom.h>
    469. 

  469. +-#ifdef __linux__
    470. 

  470. +-#include <execinfo.h>
    471. 

  471. +-#endif
    472. 

  472. + 
    473. 

  473. + #include <jvm.h>
    474. 

  474. + #include <jni.h>
    475. 

  475. +@@ -785,25 +782,6 @@
    476. 

  476. +     return ret;
    477. 

  477. + }
    478. 

  478. + 
    479. 

  479. +-#ifdef __linux__
    480. 

  480. +-void print_stack(void)
    481. 

  481. +-{
    482. 

  482. +-  void *array[10];
    483. 

  483. +-  size_t size;
    484. 

  484. +-  char **strings;
    485. 

  485. +-  size_t i;
    486. 

  486. +-
    487. 

  487. +-  size = backtrace (array, 10);
    488. 

  488. +-  strings = backtrace_symbols (array, size);
    489. 

  489. +-
    490. 

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

  491. +-
    492. 

  492. +-  for (i = 0; i < size; i++)
    493. 

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

  494. +-
    495. 

  495. +-  free (strings);
    496. 

  496. +-}
    497. 

  497. +-#endif
    498. 

  498. + 
    499. 

  499. + Window get_xawt_root_shell(JNIEnv *env) {
    500. 

  500. +   static jclass classXRootWindow = NULL;
    501. 

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

  502. +--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-04-16 00:41:13.000000000 +0200
    503. 

  503. ++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-11-15 13:51:09.000000000 +0100
    504. 

  504. +@@ -159,7 +159,7 @@
    505. 

  505. + 
    506. 

  506. +     static {
    507. 

  507. +         java.security.AccessController.doPrivileged(
    508. 

  508. +-            new sun.security.action.LoadLibraryAction("net"));
    509. 

  509. ++            new sun.security.action.LoadLibraryAction("javanet"));
    510. 

  510. +         init0();
    511. 

  511. + 
    512. 

  512. +         // start the address listener thread
    513. 

  513. +diff -Nur openjdk.orig/Makefile openjdk/Makefile
    514. 

  514. +--- openjdk.orig/Makefile	2013-03-08 17:04:19.000000000 +0100
    515. 

  515. ++++ openjdk/Makefile	2013-11-15 13:51:09.000000000 +0100
    516. 

  516. +@@ -53,9 +53,7 @@
    517. 

  517. + REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
    518. 

  518. + REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
    519. 

  519. + 
    520. 

  520. +-ifndef TOPDIR
    521. 

  521. +-  TOPDIR:=.
    522. 

  522. +-endif
    523. 

  523. ++TOPDIR:=.
    524. 

  524. + 
    525. 

  525. + ifndef JDK_TOPDIR
    526. 

  526. +   JDK_TOPDIR=$(TOPDIR)/jdk
    527.