# HG changeset patch
# User andrew
# Date 1363159191 0
# Node ID f6f4d5e6c1ddf7dd06d2dd99bbcca3f1460d8ad1
# Parent  0e0aaf1070b40bf2b362e38452632b3c6f9f0284
Don't create debuginfo files if not stripping.

diff -r 0e0aaf1070b4 -r f6f4d5e6c1dd make/linux/makefiles/defs.make
--- a/make/linux/makefiles/defs.make	Mon Mar 04 19:34:15 2013 -0500
+++ b/make/linux/makefiles/defs.make	Wed Mar 13 07:19:51 2013 +0000
@@ -186,7 +186,9 @@
 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
 ifneq ($(ZERO_BUILD), true)
   ifneq ($(OBJCOPY),)
-    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+    ifneq ($(STRIP_POLICY),no_strip)
+      EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+    endif
   endif
 endif
 
@@ -198,7 +200,9 @@
 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
   ifneq ($(ZERO_BUILD), true)
     ifneq ($(OBJCOPY),)
-      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+      ifneq ($(STRIP_POLICY),no_strip)
+        EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+      endif
     endif
   endif
 endif
@@ -208,7 +212,9 @@
     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
     ifneq ($(OBJCOPY),)
-      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+      ifneq ($(STRIP_POLICY),no_strip)
+        EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+      endif
     endif
   endif
 endif
@@ -221,8 +227,10 @@
                         $(EXPORT_LIB_DIR)/sa-jdi.jar 
 ifneq ($(ZERO_BUILD), true)
   ifneq ($(OBJCOPY),)
-    ADD_SA_BINARIES/x86   += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
-    ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+    ifneq ($(STRIP_POLICY),no_strip)
+      ADD_SA_BINARIES/x86   += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+      ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+    endif
   endif
 endif
 ADD_SA_BINARIES/ppc   = 
diff -r 0e0aaf1070b4 -r f6f4d5e6c1dd make/linux/makefiles/jsig.make
--- a/make/linux/makefiles/jsig.make	Mon Mar 04 19:34:15 2013 -0500
+++ b/make/linux/makefiles/jsig.make	Wed Mar 13 07:19:51 2013 +0000
@@ -59,8 +59,10 @@
                          $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
 	$(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
 ifneq ($(OBJCOPY),)
+  ifneq ($(STRIP_POLICY),no_strip)
 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
+  endif
   ifeq ($(STRIP_POLICY),all_strip)
 	$(QUIETLY) $(STRIP) $@
   else
diff -r 0e0aaf1070b4 -r f6f4d5e6c1dd make/linux/makefiles/saproc.make
--- a/make/linux/makefiles/saproc.make	Mon Mar 04 19:34:15 2013 -0500
+++ b/make/linux/makefiles/saproc.make	Wed Mar 13 07:19:51 2013 +0000
@@ -87,8 +87,10 @@
 	           -lthread_db
 	$(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
 ifneq ($(OBJCOPY),)
+  ifneq ($(STRIP_POLICY),no_strip)
 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
+  endif
   ifeq ($(STRIP_POLICY),all_strip)
 	$(QUIETLY) $(STRIP) $@
   else
diff -r 0e0aaf1070b4 -r f6f4d5e6c1dd make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make	Mon Mar 04 19:34:15 2013 -0500
+++ b/make/linux/makefiles/vm.make	Wed Mar 13 07:19:51 2013 +0000
@@ -328,8 +328,10 @@
 	}
 ifeq ($(CROSS_COMPILE_ARCH),)
   ifneq ($(OBJCOPY),)
+    ifneq ($(STRIP_POLICY),no_strip)
 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
+    endif
     ifeq ($(STRIP_POLICY),all_strip)
 	$(QUIETLY) $(STRIP) $@
     else
diff -r 0e0aaf1070b4 -r f6f4d5e6c1dd make/solaris/makefiles/dtrace.make
--- a/make/solaris/makefiles/dtrace.make	Mon Mar 04 19:34:15 2013 -0500
+++ b/make/solaris/makefiles/dtrace.make	Wed Mar 13 07:19:51 2013 +0000
@@ -107,8 +107,10 @@
 		$(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
 	[ -f $(XLIBJVM_DB_G) ] || { ln -s $(LIBJVM_DB) $(XLIBJVM_DB_G); }
 ifneq ($(OBJCOPY),)
+  ifneq ($(STRIP_POLICY),no_strip)
 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DB_DEBUGINFO)
 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(XLIBJVM_DB_DEBUGINFO) $@
+  endif
   ifeq ($(STRIP_POLICY),all_strip)
 	$(QUIETLY) $(STRIP) $@
   else
@@ -127,8 +129,10 @@
 		$(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
 	[ -f $(XLIBJVM_DTRACE_G) ] || { ln -s $(LIBJVM_DTRACE) $(XLIBJVM_DTRACE_G); }
 ifneq ($(OBJCOPY),)
+  ifneq ($(STRIP_POLICY),no_strip)
 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DTRACE_DEBUGINFO)
 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(XLIBJVM_DTRACE_DEBUGINFO) $@
+  endif
   ifeq ($(STRIP_POLICY),all_strip)
 	$(QUIETLY) $(STRIP) $@
   else
@@ -186,8 +190,10 @@
 		$(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
 	[ -f $(LIBJVM_DB_G) ] || { ln -s $@ $(LIBJVM_DB_G); }
 ifneq ($(OBJCOPY),)
+  ifneq ($(STRIP_POLICY),no_strip)
 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DB_DEBUGINFO)
 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $@
+  endif
   ifeq ($(STRIP_POLICY),all_strip)
 	$(QUIETLY) $(STRIP) $@
   else
@@ -205,8 +211,10 @@
 		$(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
 	[ -f $(LIBJVM_DTRACE_G) ] || { ln -s $@ $(LIBJVM_DTRACE_G); }
 ifneq ($(OBJCOPY),)
+  ifneq ($(STRIP_POLICY),no_strip)
 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DTRACE_DEBUGINFO)
 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $@
+  endif
   ifeq ($(STRIP_POLICY),all_strip)
 	$(QUIETLY) $(STRIP) $@
   else
diff -r 0e0aaf1070b4 -r f6f4d5e6c1dd make/solaris/makefiles/jsig.make
--- a/make/solaris/makefiles/jsig.make	Mon Mar 04 19:34:15 2013 -0500
+++ b/make/solaris/makefiles/jsig.make	Wed Mar 13 07:19:51 2013 +0000
@@ -55,8 +55,10 @@
                          $(LFLAGS_JSIG) -o $@ $< -ldl
 	[ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
 ifneq ($(OBJCOPY),)
+  ifneq ($(STRIP_POLICY),no_strip)
 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
+  endif
   ifeq ($(STRIP_POLICY),all_strip)
 	$(QUIETLY) $(STRIP) $@
   else
diff -r 0e0aaf1070b4 -r f6f4d5e6c1dd make/solaris/makefiles/saproc.make
--- a/make/solaris/makefiles/saproc.make	Mon Mar 04 19:34:15 2013 -0500
+++ b/make/solaris/makefiles/saproc.make	Wed Mar 13 07:19:51 2013 +0000
@@ -106,8 +106,10 @@
 	           -ldl -ldemangle -lthread -lc
 	[ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
 ifneq ($(OBJCOPY),)
+  ifneq ($(STRIP_POLICY),no_strip)
 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
+  endif
   ifeq ($(STRIP_POLICY),all_strip)
 	$(QUIETLY) $(STRIP) $@
   else
diff -r 0e0aaf1070b4 -r f6f4d5e6c1dd make/solaris/makefiles/vm.make
--- a/make/solaris/makefiles/vm.make	Mon Mar 04 19:34:15 2013 -0500
+++ b/make/solaris/makefiles/vm.make	Wed Mar 13 07:19:51 2013 +0000
@@ -284,8 +284,10 @@
 	$(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G)
 	$(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1
 ifneq ($(OBJCOPY),)
+  ifneq ($(STRIP_POLICY),no_strip)
 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
+  endif
   ifeq ($(STRIP_POLICY),all_strip)
 	$(QUIETLY) $(STRIP) $@
   else