. Fix the DEBUG build.

PR:		193009
Submitted by:	Brian Gardner (openjdk@getsnappy.com)

2 files changed, 60 insertions, 6 deletions

diff --git a/java/openjdk8/files/patch-jdk-make-lib-CompileLaunchers.gmk b/java/openjdk8/files/patch-jdk-make-lib-CompileLaunchers.gmk
new file mode 100644
index 000000000000..67a1fa44231b
--- /dev/null
+++ b/java/openjdk8/files/patch-jdk-make-lib-CompileLaunchers.gmk
@@ -0,0 +1,54 @@
+--- jdk/make/CompileLaunchers.gmk	2014-11-25 21:13:15 UTC
++++ jdk/make/CompileLaunchers.gmk	
+@@ -49,7 +49,7 @@ else
+   ORIGIN_ROOT := /..
+ endif
+ 
+-ifneq ($(findstring $(OPENJDK_TARGET_OS), bsd macosx), )
++ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx), )
+   ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
+ else
+   ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
+@@ -90,8 +90,6 @@ define SetupLauncher
+   $1_LDFLAGS := $3
+   $1_LDFLAGS_SUFFIX :=
+   ifeq ($(OPENJDK_TARGET_OS), bsd)
+-    $1_LDFLAGS += -Wl,--whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
+-        -Wl,--no-whole-archive
+     $1_LDFLAGS_SUFFIX += -pthread
+   endif
+ 
+@@ -177,6 +175,8 @@ define SetupLauncher
+           $(ORIGIN_ARG) \
+           $$($1_LDFLAGS), \
+       LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_NAME,$1), \
++      LDFLAGS_bsd := -pthread \
++          $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
+       LDFLAGS_linux := -lpthread \
+           $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
+       LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \
+@@ -187,6 +187,7 @@ define SetupLauncher
+       LDFLAGS_SUFFIX_windows := $$($1_WINDOWS_JLI_LIB) \
+           $(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5, \
+       LDFLAGS_SUFFIX_linux := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
++      LDFLAGS_SUFFIX_bsd := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
+       LDFLAGS_SUFFIX_solaris := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
+       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR), \
+       OUTPUT_DIR := $$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR), \
+@@ -203,7 +204,7 @@ define SetupLauncher
+ 
+   BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
+ 
+-  ifneq (,$(filter $(OPENJDK_TARGET_OS), bsd macosx aix))
++  ifneq (,$(filter $(OPENJDK_TARGET_OS), macosx aix))
+     $$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjli_static.a
+   endif
+ 
+@@ -499,6 +500,7 @@ $(eval $(call SetupNativeCompilation,BUI
+         $(call SET_SHARED_LIBRARY_ORIGIN), \
+     LDFLAGS_linux := -lc, \
+     LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
++    LDFLAGS_bsd := -lstdc++ -lc, \
+     LDFLAGS_SUFFIX := $(LIBCXX), \
+     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
+     OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
diff --git a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
index 152e2943e8c5..49abeced3eda 100644
--- a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
+++ b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
@@ -1,6 +1,6 @@
---- jdk/make/lib/ServiceabilityLibraries.gmk.orig	2014-11-08 19:59:40.000000000 -0800
-+++ jdk/make/lib/ServiceabilityLibraries.gmk	2014-11-08 20:00:50.000000000 -0800
-@@ -252,7 +252,7 @@
+--- jdk/make/lib/ServiceabilityLibraries.gmk	2014-11-25 21:11:53 UTC
++++ jdk/make/lib/ServiceabilityLibraries.gmk	
+@@ -252,15 +252,14 @@ $(eval $(call SetupNativeCompilation,BUI
      CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
      CFLAGS_debug := -DJPLIS_LOGGING, \
      CFLAGS_release := -DNO_JPLIS_LOGGING, \
@@ -9,12 +9,12 @@
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN) \
-@@ -260,7 +260,7 @@
+         $(LIBINSTRUMENT_LDFLAGS), \
      LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
      LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
-     LDFLAGS_bsd := -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
+-    LDFLAGS_bsd := -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
 -        -Xlinker --no-whole-archive, \
-+        -Xlinker --no-whole-archive %%ICONV_LDFLAGS%% $(LIBZ), \
++    LDFLAGS_bsd := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
      LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
          -framework Cocoa -framework Security -framework ApplicationServices, \
      LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \