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

openadk.patch 30 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711 
  1. diff -Nur icedtea-2.5.5.orig/Makefile.in icedtea-2.5.5/Makefile.in
    2. 

  2. --- icedtea-2.5.5.orig/Makefile.in	2015-04-14 19:23:00.680405957 -0500
    3. 

  3. +++ icedtea-2.5.5/Makefile.in	2015-04-23 18:58:16.823684032 -0500
    4. 

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

  5.  	$(am__append_14) $(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/corba-idlj.patch patches/boot/corba-no-gen.patch \
    11. 

  11.  	patches/boot/corba-orb.patch patches/boot/demos.patch \
    12. 

  12.  	patches/boot/fphexconstants.patch \
    13. 

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

  14.  @BUILD_JAMVM_TRUE@	cd jamvm/jamvm && \
    15. 

  15.  @BUILD_JAMVM_TRUE@	LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
    16. 

  16.  @BUILD_JAMVM_TRUE@	./autogen.sh --with-java-runtime-library=openjdk7 \
    17. 

  17. -@BUILD_JAMVM_TRUE@	  --prefix=$(abs_top_builddir)/jamvm/install ; \
    18. 

  18. +@BUILD_JAMVM_TRUE@	  --prefix=$(abs_top_builddir)/jamvm/install $(CONFIGURE_ARGS); \
    19. 

  19.  @BUILD_JAMVM_TRUE@	$(MAKE) ; \
    20. 

  20.  @BUILD_JAMVM_TRUE@	$(MAKE) install
    21. 

  21.  @BUILD_JAMVM_TRUE@	mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
    22. 

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

  23. --- icedtea-2.5.5.orig/patches/openadk.patch	1969-12-31 18:00:00.000000000 -0600
    24. 

  24. +++ icedtea-2.5.5/patches/openadk.patch	2015-04-26 03:48:06.431684003 -0500
    25. 

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

  26. +diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
    27. 

  27. +--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make	2015-03-10 17:41:04.000000000 -0500
    28. 

  28. ++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make	2015-04-23 19:03:31.107684426 -0500
    29. 

  29. +@@ -39,20 +39,20 @@
    30. 

  30. + 
    31. 

  31. + offsets_arm.s:	mkoffsets
    32. 

  32. + 	@echo Generating assembler offsets
    33. 

  33. +-	./mkoffsets > $@
    34. 

  34. ++	$(QEMU) ./mkoffsets > $@
    35. 

  35. + 
    36. 

  36. + bytecodes_arm.s: bytecodes_arm.def mkbc
    37. 

  37. + 	@echo Generating ARM assembler bytecode sequences
    38. 

  38. +-	$(CXX_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
    39. 

  39. ++	$(CXX_COMPILE) -E -x c++ - < $< | $(QEMU) ./mkbc - $@ $(COMPILE_DONE)
    40. 

  40. + 
    41. 

  41. + mkbc:	$(GAMMADIR)/tools/mkbc.c
    42. 

  42. + 	@echo Compiling mkbc tool
    43. 

  43. +-	$(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
    44. 

  44. ++	$(CC_COMPILE) -static -o $@ $< $(COMPILE_DONE)
    45. 

  45. + 
    46. 

  46. + mkoffsets:	asm_helper.cpp
    47. 

  47. + 	@echo Compiling offset generator
    48. 

  48. + 	$(QUIETLY) $(REMOVE_TARGET)
    49. 

  49. +-	$(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
    50. 

  50. ++	$(CXX_COMPILE) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
    51. 

  51. + 
    52. 

  52. + endif
    53. 

  53. + endif
    54. 

  54. +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
    55. 

  55. +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2015-03-10 17:41:04.000000000 -0500
    56. 

  56. ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2015-04-23 19:03:31.111684385 -0500
    57. 

  57. +@@ -112,7 +112,6 @@
    58. 

  58. + # include <string.h>
    59. 

  59. + # include <syscall.h>
    60. 

  60. + # include <sys/sysinfo.h>
    61. 

  61. +-# include <gnu/libc-version.h>
    62. 

  62. + # include <sys/ipc.h>
    63. 

  63. + # include <sys/shm.h>
    64. 

  64. + # include <link.h>
    65. 

  65. +@@ -664,9 +663,7 @@
    66. 

  66. +      os::Linux::set_glibc_version(str);
    67. 

  67. +   } else {
    68. 

  68. +      // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
    69. 

  69. +-     static char _gnu_libc_version[32];
    70. 

  70. +-     jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
    71. 

  71. +-              "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
    72. 

  72. ++     static char _gnu_libc_version[32] = "2.9";
    73. 

  73. +      os::Linux::set_glibc_version(_gnu_libc_version);
    74. 

  74. +   }
    75. 

  75. + 
    76. 

  76. +@@ -2959,10 +2956,7 @@
    77. 

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

  78. + // we should use the base version.
    79. 

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

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

  81. +-  if (f == NULL) {
    82. 

  82. +-    f = dlsym(handle, name);
    83. 

  83. +-  }
    84. 

  84. ++  void *f = dlsym(handle, name);
    85. 

  85. +   return f;
    86. 

  86. + }
    87. 

  87. + 
    88. 

  88. +@@ -5623,7 +5617,21 @@
    89. 

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

  90. + // so just return the system wide load average.
    91. 

  91. + int os::loadavg(double loadavg[], int nelem) {
    92. 

  92. +-  return ::getloadavg(loadavg, nelem);
    93. 

  93. ++ FILE *LOADAVG;
    94. 

  94. ++ double avg[3] = { 0.0, 0.0, 0.0 };
    95. 

  95. ++ int i, res = -1;;
    96. 

  96. ++
    97. 

  97. ++ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
    98. 

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

  99. ++ res = 0;
    100. 

  100. ++ fclose(LOADAVG);
    101. 

  101. ++ }
    102. 

  102. ++
    103. 

  103. ++ for (i = 0; (i < nelem) && (i < 3); i++) {
    104. 

  104. ++ loadavg[i] = avg[i];
    105. 

  105. ++ }
    106. 

  106. ++
    107. 

  107. ++ return res;
    108. 

  108. + }
    109. 

  109. + 
    110. 

  110. + void os::pause() {
    111. 

  111. +diff -Nur openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
    112. 

  112. +--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	2015-03-10 17:41:04.000000000 -0500
    113. 

  113. ++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	2015-04-25 03:58:26.519684003 -0500
    114. 

  114. +@@ -36,7 +36,7 @@
    115. 

  115. + 
    116. 

  116. +   // Atomically copy 64 bits of data
    117. 

  117. +   static void atomic_copy64(volatile void *src, volatile void *dst) {
    118. 

  118. +-#if defined(PPC32)
    119. 

  119. ++#if defined(PPC32) && !defined(__NO_FPRS__)
    120. 

  120. +     double tmp;
    121. 

  121. +     asm volatile ("lfd  %0, 0(%1)\n"
    122. 

  122. +                   "stfd %0, 0(%2)\n"
    123. 

  123. +diff -Nur openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
    124. 

  124. +--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2015-03-10 17:41:04.000000000 -0500
    125. 

  125. ++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2015-04-23 19:03:31.111684385 -0500
    126. 

  126. +@@ -253,7 +253,7 @@
    127. 

  127. + #elif defined(__APPLE__)
    128. 

  128. + inline int g_isnan(double f) { return isnan(f); }
    129. 

  129. + #elif defined(LINUX) || defined(_ALLBSD_SOURCE)
    130. 

  130. +-inline int g_isnan(float  f) { return isnanf(f); }
    131. 

  131. ++inline int g_isnan(float  f) { return __isnanf(f); }
    132. 

  132. + inline int g_isnan(double f) { return isnan(f); }
    133. 

  133. + #else
    134. 

  134. + #error "missing platform-specific definition here"
    135. 

  135. +@@ -267,8 +267,8 @@
    136. 

  136. + 
    137. 

  137. + // Checking for finiteness
    138. 

  138. + 
    139. 

  139. +-inline int g_isfinite(jfloat  f)                 { return finite(f); }
    140. 

  140. +-inline int g_isfinite(jdouble f)                 { return finite(f); }
    141. 

  141. ++inline int g_isfinite(jfloat  f)                 { return isfinite(f); }
    142. 

  142. ++inline int g_isfinite(jdouble f)                 { return isfinite(f); }
    143. 

  143. + 
    144. 

  144. + 
    145. 

  145. + // Wide characters
    146. 

  146. +diff -Nur openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
    147. 

  147. +--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2014-11-10 18:58:03.000000000 -0600
    148. 

  148. ++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2015-04-23 19:03:31.131683949 -0500
    149. 

  149. +@@ -79,7 +79,7 @@
    150. 

  150. +   OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB
    151. 

  151. +  endif
    152. 

  152. + else
    153. 

  153. +-  OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
    154. 

  154. ++  CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI
    155. 

  155. +   OTHER_LDLIBS += $(JVMLIB)
    156. 

  156. + endif
    157. 

  157. + 
    158. 

  158. +diff -Nur openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
    159. 

  159. +--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile	2014-11-10 18:58:03.000000000 -0600
    160. 

  160. ++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile	2015-04-23 19:03:31.131683949 -0500
    161. 

  161. +@@ -64,7 +64,7 @@
    162. 

  162. + COMPILER_WARNINGS_FATAL=true
    163. 

  163. + endif
    164. 

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

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

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

  167. + endif
    168. 

  168. + ifeq ($(PLATFORM), solaris)
    169. 

  169. + #LIBSCTP = -lsctp
    170. 

  170. +diff -Nur openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk
    171. 

  171. +--- openjdk.orig/jdk/make/common/Defs.gmk	2014-11-10 18:58:03.000000000 -0600
    172. 

  172. ++++ openjdk/jdk/make/common/Defs.gmk	2015-04-23 19:03:31.131683949 -0500
    173. 

  173. +@@ -207,7 +207,7 @@
    174. 

  174. +       ifeq ($(PLATFORM), macosx)
    175. 

  175. +         FREETYPE_HEADERS_PATH = /usr/X11R6/include
    176. 

  176. +       else
    177. 

  177. +-        FREETYPE_HEADERS_PATH = /usr/include
    178. 

  178. ++        FREETYPE_HEADERS_PATH = /usr/include/disabled
    179. 

  179. +       endif
    180. 

  180. +     endif
    181. 

  181. +   endif
    182. 

  182. +diff -Nur openjdk.orig/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk
    183. 

  183. +--- openjdk.orig/jdk/make/common/Sanity.gmk	2014-11-10 18:58:03.000000000 -0600
    184. 

  184. ++++ openjdk/jdk/make/common/Sanity.gmk	2015-04-23 19:03:31.131683949 -0500
    185. 

  185. +@@ -91,8 +91,7 @@
    186. 

  186. +     sane-ld_run_path \
    187. 

  187. +     sane-alt_bootdir \
    188. 

  188. +     sane-bootdir \
    189. 

  189. +-    sane-local-bootdir \
    190. 

  190. +-    sane-alsa-headers
    191. 

  191. ++    sane-local-bootdir
    192. 

  192. + 
    193. 

  193. + ifdef OPENJDK
    194. 

  194. + sanity-all:: sane-freetype 
    195. 

  195. +diff -Nur openjdk.orig/jdk/make/common/shared/Defs-utils.gmk openjdk/jdk/make/common/shared/Defs-utils.gmk
    196. 

  196. +--- openjdk.orig/jdk/make/common/shared/Defs-utils.gmk	2014-11-10 18:58:03.000000000 -0600
    197. 

  197. ++++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2015-04-23 19:03:31.131683949 -0500
    198. 

  198. +@@ -157,13 +157,13 @@
    199. 

  199. + TRUE           = $(UTILS_COMMAND_PATH)true
    200. 

  200. + UNAME          = $(UTILS_COMMAND_PATH)uname
    201. 

  201. + UNIQ           = $(UTILS_USR_BIN_PATH)uniq
    202. 

  202. +-UNZIP          = $(UTILS_USR_BIN_PATH)unzip
    203. 

  203. ++UNZIP          = unzip
    204. 

  204. + UNZIPSFX       = $(UTILS_DEVTOOL_PATH)unzipsfx
    205. 

  205. + XARGS          = $(UTILS_USR_BIN_PATH)xargs
    206. 

  206. + WC             = $(UTILS_USR_BIN_PATH)wc
    207. 

  207. + WHICH          = $(UTILS_USR_BIN_PATH)which
    208. 

  208. + YACC           = $(UTILS_CCS_BIN_PATH)yacc
    209. 

  209. +-ZIPEXE         = $(UTILS_DEVTOOL_PATH)zip
    210. 

  210. ++ZIPEXE         = zip
    211. 

  211. + 
    212. 

  212. + # Special cases
    213. 

  213. + #RM   is defined by GNU Make as 'rm -f'
    214. 

  214. +diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
    215. 

  215. +--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2014-11-10 18:58:03.000000000 -0600
    216. 

  216. ++++ openjdk/jdk/make/common/shared/Platform.gmk	2015-04-23 19:03:31.131683949 -0500
    217. 

  217. +@@ -170,9 +170,6 @@
    218. 

  218. +   else
    219. 

  219. +     mach := $(shell uname -m)
    220. 

  220. +   endif
    221. 

  221. +-  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
    222. 

  222. +-    mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/;s/ppc64el/ppc64le/')
    223. 

  223. +-  endif
    224. 

  224. +   archExpr = case "$(mach)" in \
    225. 

  225. +                 i[3-9]86) \
    226. 

  226. +                     echo i586 \
    227. 

  227. +diff -Nur openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
    228. 

  228. +--- openjdk.orig/jdk/make/common/shared/Sanity.gmk	2014-11-10 18:58:03.000000000 -0600
    229. 

  229. ++++ openjdk/jdk/make/common/shared/Sanity.gmk	2015-04-23 19:03:31.135683915 -0500
    230. 

  230. +@@ -114,11 +114,6 @@
    231. 

  231. +     elif [ -f /etc/lsb-release ] ; then \
    232. 

  232. +       $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \
    233. 

  233. +     fi)
    234. 

  234. +-  ALSA_INCLUDE=/usr/include/alsa/version.h
    235. 

  235. +-  ALSA_LIBRARY=/usr/lib/libasound.so
    236. 

  236. +-  _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
    237. 

  237. +-           $(SED) -e 's@.*"\(.*\)".*@\1@' )
    238. 

  238. +-  ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
    239. 

  239. + endif
    240. 

  240. + 
    241. 

  241. + ifeq ($(PLATFORM), macosx)
    242. 

  242. +@@ -225,7 +220,6 @@
    243. 

  243. + 	sane-compiler \
    244. 

  244. + 	sane-link \
    245. 

  245. + 	sane-cacerts \
    246. 

  246. +-	sane-alsa-headers \
    247. 

  247. + 	sane-ant_version \
    248. 

  248. + 	sane-zip_version \
    249. 

  249. + 	sane-unzip_version \
    250. 

  250. +@@ -1381,34 +1375,6 @@
    251. 

  251. +   endif
    252. 

  252. + endif
    253. 

  253. + 
    254. 

  254. +-######################################################
    255. 

  255. +-# Check that ALSA headers and libs are installed and 
    256. 

  256. +-# that the header has the right version. We only
    257. 

  257. +-# need /usr/include/alsa/version.h and /usr/lib/libasound.so
    258. 

  258. +-######################################################
    259. 

  259. +-
    260. 

  260. +-ifdef REQUIRED_ALSA_VERSION
    261. 

  261. +-  ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION))
    262. 

  262. +-endif
    263. 

  263. +-sane-alsa-headers:
    264. 

  264. +-ifdef REQUIRED_ALSA_VERSION
    265. 

  265. +-	@if [ "$(ALSA_CHECK)" != "missing" ] ; then \
    266. 

  266. +-	    if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer"  ] ; then \
    267. 

  267. +-		$(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \
    268. 

  268. +-		"      You have the following ALSA version installed: $${alsa_version} \n" \
    269. 

  269. +-		"      Please reinstall ALSA (drivers and lib). You can download \n" \
    270. 

  270. +-		"      the source distribution from http://www.alsa-project.org \n" \
    271. 

  271. +-		"      or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
    272. 

  272. +-		"" >> $(ERROR_FILE) ; \
    273. 

  273. +-	    fi ; \
    274. 

  274. +-	else \
    275. 

  275. +-	    $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \
    276. 

  276. +-	    "      Please install ALSA (drivers and lib). You can download the \n" \
    277. 

  277. +-	    "      source distribution from http://www.alsa-project.org or go to \n" \
    278. 

  278. +-	    "      http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
    279. 

  279. +-	    "" >> $(ERROR_FILE) ; \
    280. 

  280. +-	fi
    281. 

  281. +-endif
    282. 

  282. + 
    283. 

  283. + # If a sanity file doesn't exist, just make sure it's dir exists
    284. 

  284. + $(SANITY_FILES):
    285. 

  285. +diff -Nur openjdk.orig/jdk/make/java/fdlibm/Makefile openjdk/jdk/make/java/fdlibm/Makefile
    286. 

  286. +--- openjdk.orig/jdk/make/java/fdlibm/Makefile	2014-11-10 18:58:03.000000000 -0600
    287. 

  287. ++++ openjdk/jdk/make/java/fdlibm/Makefile	2015-04-26 03:42:52.079684003 -0500
    288. 

  288. +@@ -81,7 +81,7 @@
    289. 

  289. + #
    290. 

  290. + # Things that must be linked in.
    291. 

  291. + #
    292. 

  292. +-OTHER_LDLIBS =
    293. 

  293. ++OTHER_LDLIBS = -lm
    294. 

  294. + 
    295. 

  295. + #
    296. 

  296. + # Files to compile.
    297. 

  297. +diff -Nur openjdk.orig/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile
    298. 

  298. +--- openjdk.orig/jdk/make/java/net/Makefile	2014-11-10 18:58:03.000000000 -0600
    299. 

  299. ++++ openjdk/jdk/make/java/net/Makefile	2015-04-23 19:03:31.135683915 -0500
    300. 

  300. +@@ -25,7 +25,7 @@
    301. 

  301. + 
    302. 

  302. + BUILDDIR = ../..
    303. 

  303. + PACKAGE = java.net
    304. 

  304. +-LIBRARY = net
    305. 

  305. ++LIBRARY = javanet
    306. 

  306. + PRODUCT = sun
    307. 

  307. + include $(BUILDDIR)/common/Defs.gmk
    308. 

  308. + 
    309. 

  309. +diff -Nur openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
    310. 

  310. +--- openjdk.orig/jdk/make/java/nio/Makefile	2014-11-10 18:58:03.000000000 -0600
    311. 

  311. ++++ openjdk/jdk/make/java/nio/Makefile	2015-04-23 19:03:31.135683915 -0500
    312. 

  312. +@@ -403,7 +403,7 @@
    313. 

  313. + endif
    314. 

  314. + 
    315. 

  315. + ifeq ($(PLATFORM), linux)
    316. 

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

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

  318. +   ifeq ($(SYSTEM_GIO), true)
    319. 

  319. +     OTHER_LDLIBS += $(GIO_LIBS)
    320. 

  320. +     OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO
    321. 

  321. +@@ -960,7 +960,7 @@
    322. 

  322. + 
    323. 

  323. + $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
    324. 

  324. + 	$(prep-target)
    325. 

  325. +-	($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) $(LDDFLAGS) \
    326. 

  326. ++	($(CD) $(TEMPDIR); $(HOST_CC) $(CPPFLAGS_FOR_BUILD) $(LDDFLAGS) \
    327. 

  327. + 	   -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC))
    328. 

  328. + 
    329. 

  329. + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
    330. 

  330. +@@ -996,7 +996,7 @@
    331. 

  331. + 
    332. 

  332. + $(GENUC_EXE) : $(GENUC_SRC)
    333. 

  333. + 	$(prep-target)
    334. 

  334. +-	$(NIO_CC) $(CPPFLAGS) -o $@ $(GENUC_SRC)
    335. 

  335. ++	$(HOST_CC) $(CPPFLAGS_FOR_BUILD) -o $@ $(GENUC_SRC)
    336. 

  336. + 
    337. 

  337. + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
    338. 

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

  339. +diff -Nur openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
    340. 

  340. +--- openjdk.orig/jdk/make/sun/awt/mawt.gmk	2014-11-10 18:58:03.000000000 -0600
    341. 

  341. ++++ openjdk/jdk/make/sun/awt/mawt.gmk	2015-04-23 19:03:31.135683915 -0500
    342. 

  342. +@@ -151,22 +151,6 @@
    343. 

  343. + #endif
    344. 

  344. + 
    345. 

  345. + LIBXTST = -lXtst
    346. 

  346. +-ifeq ($(PLATFORM), linux)
    347. 

  347. +-   ifeq ($(ARCH_DATA_MODEL), 64)
    348. 

  348. +-   # XXX what about the rest of them?
    349. 

  349. +-        LIBXT = -lXt
    350. 

  350. +-    else
    351. 

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

  352. +-       LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
    353. 

  353. +-                        $(wildcard /usr/lib/libXt.a))
    354. 

  354. +-       LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
    355. 

  355. +-                        $(wildcard /usr/lib/libSM.a))
    356. 

  356. +-       LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
    357. 

  357. +-                         $(wildcard /usr/lib/libICE.a))
    358. 

  358. +-       LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
    359. 

  359. +-                         $(wildcard /usr/lib/libXtst.a))
    360. 

  360. +-   endif
    361. 

  361. +-endif
    362. 

  362. + 
    363. 

  363. + # Use -lXmu for EditRes support
    364. 

  364. + LIBXMU_DBG	= -lXmu
    365. 

  365. +@@ -181,7 +165,7 @@
    366. 

  366. + OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
    367. 

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

  368. + OTHER_CFLAGS += -DXMSTRINGDEFINES=1
    369. 

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

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

  371. + endif
    372. 

  372. + 
    373. 

  373. + endif
    374. 

  374. +@@ -231,11 +215,6 @@
    375. 

  375. +   CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2
    376. 

  376. + endif
    377. 

  377. + 
    378. 

  378. +-ifndef HEADLESS
    379. 

  379. +-CPPFLAGS += -I$(OPENWIN_HOME)/include 
    380. 

  380. +-LDFLAGS  += -L$(OPENWIN_LIB)
    381. 

  381. +-
    382. 

  382. +-endif # !HEADLESS
    383. 

  383. + 
    384. 

  384. + CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
    385. 

  385. +             -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
    386. 

  386. +@@ -270,11 +249,6 @@
    387. 

  387. + endif # !HEADLESS
    388. 

  388. + endif # PLATFORM
    389. 

  389. + 
    390. 

  390. +-ifeq ($(PLATFORM), linux)
    391. 

  391. +-  # Checking for the X11/extensions headers at the additional location
    392. 

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

  393. +-                        $(wildcard /usr/include/X11/extensions))
    394. 

  394. +-endif
    395. 

  395. + 
    396. 

  396. + ifeq ($(PLATFORM), macosx)
    397. 

  397. +   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
    398. 

  398. +diff -Nur openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
    399. 

  399. +--- openjdk.orig/jdk/make/sun/xawt/Makefile	2014-11-10 18:58:03.000000000 -0600
    400. 

  400. ++++ openjdk/jdk/make/sun/xawt/Makefile	2015-04-23 19:03:31.135683915 -0500
    401. 

  401. +@@ -295,16 +295,10 @@
    402. 

  402. + SIZERS = $(SIZER).32
    403. 

  403. + SIZERS_C = $(SIZER_32_C)
    404. 

  404. + SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
    405. 

  405. +-ifdef CROSS_COMPILE_ARCH
    406. 

  406. +-CFLAGS_32 = -m32
    407. 

  407. +-endif
    408. 

  408. + else # !32
    409. 

  409. + SIZERS = $(SIZER).64
    410. 

  410. + SIZERS_C = $(SIZER_64_C)
    411. 

  411. + SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
    412. 

  412. +-ifdef CROSS_COMPILE_ARCH
    413. 

  413. +-CFLAGS_64 = -m64
    414. 

  414. +-endif
    415. 

  415. + endif # 32
    416. 

  416. + endif # !macosx
    417. 

  417. + endif # solaris
    418. 

  418. +@@ -340,11 +334,7 @@
    419. 

  419. + WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class 
    420. 

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

  421. + 
    422. 

  422. +-ifndef CROSS_COMPILE_ARCH
    423. 

  423. +-SIZERS_CC = $(CC)
    424. 

  424. +-else
    425. 

  425. +-SIZERS_CC = $(HOST_CC)
    426. 

  426. +-endif
    427. 

  427. ++SIZERS_CC = $(CC) -static
    428. 

  428. + 
    429. 

  429. + $(SIZERS): $(SIZERS_C) 
    430. 

  430. + 	$(prep-target)
    431. 

  431. +@@ -367,7 +357,7 @@
    432. 

  432. + 	    $(CHMOD) +w $@;\
    433. 

  433. + 	else	\
    434. 

  434. + 	    $(ECHO) GENERATING $@; \
    435. 

  435. +-	    $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
    436. 

  436. ++	    $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
    437. 

  437. + 	fi
    438. 

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

  439. + 	    $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
    440. 

  440. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
    441. 

  441. +--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2014-11-10 18:58:03.000000000 -0600
    442. 

  442. ++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2015-04-23 19:03:31.135683915 -0500
    443. 

  443. +@@ -69,7 +69,7 @@
    444. 

  444. +      */
    445. 

  445. +     static {
    446. 

  446. +         java.security.AccessController.doPrivileged(
    447. 

  447. +-                  new sun.security.action.LoadLibraryAction("net"));
    448. 

  448. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    449. 

  449. +         init();
    450. 

  450. +     }
    451. 

  451. + 
    452. 

  452. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
    453. 

  453. +--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2014-11-10 18:58:03.000000000 -0600
    454. 

  454. ++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2015-04-23 19:03:31.139683967 -0500
    455. 

  455. +@@ -78,7 +78,7 @@
    456. 

  456. +      */
    457. 

  457. +     static {
    458. 

  458. +         java.security.AccessController.doPrivileged(
    459. 

  459. +-                  new sun.security.action.LoadLibraryAction("net"));
    460. 

  460. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    461. 

  461. +     }
    462. 

  462. + 
    463. 

  463. +     /**
    464. 

  464. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
    465. 

  465. +--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java	2014-11-10 18:58:03.000000000 -0600
    466. 

  466. ++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java	2015-04-23 19:03:31.139683967 -0500
    467. 

  467. +@@ -47,7 +47,7 @@
    468. 

  468. +      */
    469. 

  469. +     static {
    470. 

  470. +         java.security.AccessController.doPrivileged(
    471. 

  471. +-                  new sun.security.action.LoadLibraryAction("net"));
    472. 

  472. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    473. 

  473. +         init();
    474. 

  474. +     }
    475. 

  475. + 
    476. 

  476. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java
    477. 

  477. +--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java	2014-11-10 18:58:03.000000000 -0600
    478. 

  478. ++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java	2015-04-23 19:03:31.139683967 -0500
    479. 

  479. +@@ -267,7 +267,7 @@
    480. 

  480. +     static {
    481. 

  481. +         preferIPv6Address = java.security.AccessController.doPrivileged(
    482. 

  482. +             new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
    483. 

  483. +-        AccessController.doPrivileged(new LoadLibraryAction("net"));
    484. 

  484. ++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
    485. 

  485. +         init();
    486. 

  486. +     }
    487. 

  487. + 
    488. 

  488. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
    489. 

  489. +--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java	2014-11-10 18:58:03.000000000 -0600
    490. 

  490. ++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java	2015-04-23 19:03:31.139683967 -0500
    491. 

  491. +@@ -53,7 +53,7 @@
    492. 

  492. +     private static final int defaultIndex; /* index of defaultInterface */
    493. 

  493. + 
    494. 

  494. +     static {
    495. 

  495. +-        AccessController.doPrivileged(new LoadLibraryAction("net"));
    496. 

  496. ++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
    497. 

  497. +         init();
    498. 

  498. +         defaultInterface = DefaultInterface.getDefault();
    499. 

  499. +         if (defaultInterface != null) {
    500. 

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

  501. +--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2014-11-10 18:58:03.000000000 -0600
    502. 

  502. ++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2015-04-23 19:03:33.355684492 -0500
    503. 

  503. +@@ -76,6 +76,6 @@
    504. 

  504. + 
    505. 

  505. +     static {
    506. 

  506. +         AccessController.doPrivileged(
    507. 

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

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

  509. +     }
    510. 

  510. + }
    511. 

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

  512. +--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2014-11-10 18:58:03.000000000 -0600
    513. 

  513. ++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2015-04-23 19:03:33.355684492 -0500
    514. 

  514. +@@ -95,7 +95,7 @@
    515. 

  515. +                 }});
    516. 

  516. +         if (b != null && b.booleanValue()) {
    517. 

  517. +             java.security.AccessController.doPrivileged(
    518. 

  518. +-                      new sun.security.action.LoadLibraryAction("net"));
    519. 

  519. ++                      new sun.security.action.LoadLibraryAction("javanet"));
    520. 

  520. +             hasSystemProxies = init();
    521. 

  521. +         }
    522. 

  522. +     }
    523. 

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

  524. +--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java	2014-11-10 18:58:03.000000000 -0600
    525. 

  525. ++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java	2015-04-23 19:03:33.355684492 -0500
    526. 

  526. +@@ -483,7 +483,7 @@
    527. 

  527. +                 return;
    528. 

  528. +             loaded = true;
    529. 

  529. +             java.security.AccessController
    530. 

  530. +-                .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
    531. 

  531. ++                .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
    532. 

  532. +             java.security.AccessController
    533. 

  533. +                 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
    534. 

  534. +             // IOUtil must be initialized; Its native methods are called from
    535. 

  535. +diff -Nur openjdk.orig/jdk/src/solaris/bin/mipsel/jvm.cfg openjdk/jdk/src/solaris/bin/mipsel/jvm.cfg
    536. 

  536. +--- openjdk.orig/jdk/src/solaris/bin/mipsel/jvm.cfg	1969-12-31 18:00:00.000000000 -0600
    537. 

  537. ++++ openjdk/jdk/src/solaris/bin/mipsel/jvm.cfg	2015-04-23 19:03:34.091683603 -0500
    538. 

  538. +@@ -0,0 +1,38 @@
    539. 

  539. ++# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    540. 

  540. ++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    541. 

  541. ++#
    542. 

  542. ++# This code is free software; you can redistribute it and/or modify it
    543. 

  543. ++# under the terms of the GNU General Public License version 2 only, as
    544. 

  544. ++# published by the Free Software Foundation.  Oracle designates this
    545. 

  545. ++# particular file as subject to the "Classpath" exception as provided
    546. 

  546. ++# by Oracle in the LICENSE file that accompanied this code.
    547. 

  547. ++#
    548. 

  548. ++# This code is distributed in the hope that it will be useful, but WITHOUT
    549. 

  549. ++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    550. 

  550. ++# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    551. 

  551. ++# version 2 for more details (a copy is included in the LICENSE file that
    552. 

  552. ++# accompanied this code).
    553. 

  553. ++#
    554. 

  554. ++# You should have received a copy of the GNU General Public License version
    555. 

  555. ++# 2 along with this work; if not, write to the Free Software Foundation,
    556. 

  556. ++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    557. 

  557. ++#
    558. 

  558. ++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    559. 

  559. ++# or visit www.oracle.com if you need additional information or have any
    560. 

  560. ++# questions.
    561. 

  561. ++#
    562. 

  562. ++# List of JVMs that can be used as an option to java, javac, etc.
    563. 

  563. ++# Order is important -- first in this list is the default JVM.
    564. 

  564. ++# NOTE that this both this file and its format are UNSUPPORTED and
    565. 

  565. ++# WILL GO AWAY in a future release.
    566. 

  566. ++#
    567. 

  567. ++# You may also select a JVM in an arbitrary location with the
    568. 

  568. ++# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
    569. 

  569. ++# and may not be available in a future release.
    570. 

  570. ++#
    571. 

  571. ++-client KNOWN
    572. 

  572. ++-server KNOWN
    573. 

  573. ++-hotspot ERROR
    574. 

  574. ++-classic WARN
    575. 

  575. ++-native ERROR
    576. 

  576. ++-green ERROR
    577. 

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

  578. +--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2014-11-10 18:58:03.000000000 -0600
    579. 

  579. ++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2015-04-23 19:03:34.091683603 -0500
    580. 

  580. +@@ -247,7 +247,7 @@
    581. 

  581. + 
    582. 

  582. +     static {
    583. 

  583. +         java.security.AccessController.doPrivileged(
    584. 

  584. +-            new sun.security.action.LoadLibraryAction("net"));
    585. 

  585. ++            new sun.security.action.LoadLibraryAction("javanet"));
    586. 

  586. +     }
    587. 

  587. + 
    588. 

  588. + }
    589. 

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

  590. +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2014-11-10 18:58:03.000000000 -0600
    591. 

  591. ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2015-04-23 19:03:34.091683603 -0500
    592. 

  592. +@@ -246,7 +246,8 @@
    593. 

  593. +     if (wcs == NULL)
    594. 

  594. +         return NULL;
    595. 

  595. + 
    596. 

  596. +-    n = len*MB_CUR_MAX + 1;
    597. 

  597. ++    //evil hack for uclibc
    598. 

  598. ++    n = len*1 + 1;
    599. 

  599. + 
    600. 

  600. +     mbs = (char *) malloc(n * sizeof(char));
    601. 

  601. +     if (mbs == NULL) {
    602. 

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

  603. +--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c	2014-11-10 18:58:03.000000000 -0600
    604. 

  604. ++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c	2015-04-23 19:03:34.091683603 -0500
    605. 

  605. +@@ -27,9 +27,6 @@
    606. 

  606. + #include <X11/Xutil.h>
    607. 

  607. + #include <X11/Xos.h>
    608. 

  608. + #include <X11/Xatom.h>
    609. 

  609. +-#ifdef __linux__
    610. 

  610. +-#include <execinfo.h>
    611. 

  611. +-#endif
    612. 

  612. + 
    613. 

  613. + #include <jvm.h>
    614. 

  614. + #include <jni.h>
    615. 

  615. +@@ -785,25 +782,6 @@
    616. 

  616. +     return ret;
    617. 

  617. + }
    618. 

  618. + 
    619. 

  619. +-#ifdef __linux__
    620. 

  620. +-void print_stack(void)
    621. 

  621. +-{
    622. 

  622. +-  void *array[10];
    623. 

  623. +-  size_t size;
    624. 

  624. +-  char **strings;
    625. 

  625. +-  size_t i;
    626. 

  626. +-
    627. 

  627. +-  size = backtrace (array, 10);
    628. 

  628. +-  strings = backtrace_symbols (array, size);
    629. 

  629. +-
    630. 

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

  631. +-
    632. 

  632. +-  for (i = 0; i < size; i++)
    633. 

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

  634. +-
    635. 

  635. +-  free (strings);
    636. 

  636. +-}
    637. 

  637. +-#endif
    638. 

  638. + 
    639. 

  639. + Window get_xawt_root_shell(JNIEnv *env) {
    640. 

  640. +   static jclass classXRootWindow = NULL;
    641. 

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

  642. +--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2014-11-10 18:58:03.000000000 -0600
    643. 

  643. ++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2015-04-23 19:03:34.091683603 -0500
    644. 

  644. +@@ -159,7 +159,7 @@
    645. 

  645. + 
    646. 

  646. +     static {
    647. 

  647. +         java.security.AccessController.doPrivileged(
    648. 

  648. +-            new sun.security.action.LoadLibraryAction("net"));
    649. 

  649. ++            new sun.security.action.LoadLibraryAction("javanet"));
    650. 

  650. +         init0();
    651. 

  651. + 
    652. 

  652. +         // start the address listener thread
    653. 

  653. +diff -Nur openjdk-boot.orig/corba/make/common/shared/Defs-utils.gmk openjdk-boot/corba/make/common/shared/Defs-utils.gmk
    654. 

  654. +--- openjdk-boot.orig/corba/make/common/shared/Defs-utils.gmk	2015-03-10 17:40:57.000000000 -0500
    655. 

  655. ++++ openjdk-boot/corba/make/common/shared/Defs-utils.gmk	2015-04-23 19:02:00.471683852 -0500
    656. 

  656. +@@ -136,12 +136,12 @@
    657. 

  657. + TRUE           = $(UTILS_COMMAND_PATH)true
    658. 

  658. + UNAME          = $(UTILS_COMMAND_PATH)uname
    659. 

  659. + UNIQ           = $(UTILS_USR_BIN_PATH)uniq
    660. 

  660. +-UNZIP          = $(UTILS_USR_BIN_PATH)unzip
    661. 

  661. +-UNZIPSFX       = $(UTILS_DEVTOOL_PATH)unzipsfx
    662. 

  662. ++UNZIP          = unzip
    663. 

  663. ++UNZIPSFX       = unzipsfx
    664. 

  664. + WC             = $(UTILS_USR_BIN_PATH)wc
    665. 

  665. + WHICH          = $(UTILS_USR_BIN_PATH)which
    666. 

  666. + YACC           = $(UTILS_CCS_BIN_PATH)yacc
    667. 

  667. +-ZIPEXE         = $(UTILS_DEVTOOL_PATH)zip
    668. 

  668. ++ZIPEXE         = zip
    669. 

  669. + 
    670. 

  670. + # Special cases
    671. 

  671. + #RM   is defined by GNU Make as 'rm -f'
    672. 

  672. +diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make openjdk-boot/hotspot/make/linux/makefiles/zero.make
    673. 

  673. +--- openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make	2015-03-10 17:41:04.000000000 -0500
    674. 

  674. ++++ openjdk-boot/hotspot/make/linux/makefiles/zero.make	2015-04-23 19:02:00.471683852 -0500
    675. 

  675. +@@ -33,4 +33,4 @@
    676. 

  676. + 
    677. 

  677. + # Make sure libffi is included
    678. 

  678. + CFLAGS += $(LIBFFI_CFLAGS)
    679. 

  679. +-LIBS_VM += $(LIBFFI_LIBS)
    680. 

  680. ++LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic
    681. 

  681. +diff -Nur openjdk-boot.orig/jdk/make/common/shared/Defs-utils.gmk openjdk-boot/jdk/make/common/shared/Defs-utils.gmk
    682. 

  682. +--- openjdk-boot.orig/jdk/make/common/shared/Defs-utils.gmk	2014-11-10 18:58:03.000000000 -0600
    683. 

  683. ++++ openjdk-boot/jdk/make/common/shared/Defs-utils.gmk	2015-04-23 19:02:00.471683852 -0500
    684. 

  684. +@@ -157,13 +157,13 @@
    685. 

  685. + TRUE           = $(UTILS_COMMAND_PATH)true
    686. 

  686. + UNAME          = $(UTILS_COMMAND_PATH)uname
    687. 

  687. + UNIQ           = $(UTILS_USR_BIN_PATH)uniq
    688. 

  688. +-UNZIP          = $(UTILS_USR_BIN_PATH)unzip
    689. 

  689. +-UNZIPSFX       = $(UTILS_DEVTOOL_PATH)unzipsfx
    690. 

  690. ++UNZIP          = unzip
    691. 

  691. ++UNZIPSFX       = unzipsfx
    692. 

  692. + XARGS          = $(UTILS_USR_BIN_PATH)xargs
    693. 

  693. + WC             = $(UTILS_USR_BIN_PATH)wc
    694. 

  694. + WHICH          = $(UTILS_USR_BIN_PATH)which
    695. 

  695. + YACC           = $(UTILS_CCS_BIN_PATH)yacc
    696. 

  696. +-ZIPEXE         = $(UTILS_DEVTOOL_PATH)zip
    697. 

  697. ++ZIPEXE         = zip
    698. 

  698. + 
    699. 

  699. + # Special cases
    700. 

  700. + #RM   is defined by GNU Make as 'rm -f'
    701. 

  701. +diff -Nur openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile
    702. 

  702. +--- openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile	2014-11-10 18:58:03.000000000 -0600
    703. 

  703. ++++ openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile	2015-04-23 19:02:00.471683852 -0500
    704. 

  704. +@@ -72,6 +72,7 @@
    705. 

  705. + 	-DUSE_PORTS=TRUE  \
    706. 

  706. + 	-DUSE_PLATFORM_MIDI_OUT=TRUE \
    707. 

  707. + 	-DUSE_PLATFORM_MIDI_IN=TRUE \
    708. 

  708. ++	$(ALSA_CPPFLAGS) \
    709. 

  709. + 	-I$(SHARE_SRC)/native/com/sun/media/sound
    710. 

  710. + 
    711. 

  711. + #
    712.