--- old/make/linux/Makefile	2014-02-28 13:00:05.139361300 +0900
+++ new/make/linux/Makefile	2014-02-28 13:00:05.082361300 +0900
@@ -203,7 +203,7 @@
 BUILDTREE_MAKE    = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
 BUILDTREE_VARS    = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
 BUILDTREE_VARS   += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
-BUILDTREE_VARS   += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE)
+BUILDTREE_VARS   += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) SEPARATED_DEBUGINFO_FILES=$(SEPARATED_DEBUGINFO_FILES) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE)
 
 BUILDTREE         = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
 
--- old/make/linux/makefiles/buildtree.make	2014-02-28 13:00:05.355361300 +0900
+++ new/make/linux/makefiles/buildtree.make	2014-02-28 13:00:05.299361300 +0900
@@ -264,6 +264,8 @@
 	    echo && echo "OBJCOPY = $(OBJCOPY)"; \
 	[ -n "$(STRIP_POLICY)" ] && \
 	    echo && echo "STRIP_POLICY = $(STRIP_POLICY)"; \
+	[ -n "$(SEPARATED_DEBUGINFO_FILES)" ] && \
+	    echo && echo "SEPARATED_DEBUGINFO_FILES = $(SEPARATED_DEBUGINFO_FILES)"; \
 	[ -n "$(ZIP_DEBUGINFO_FILES)" ] && \
 	    echo && echo "ZIP_DEBUGINFO_FILES = $(ZIP_DEBUGINFO_FILES)"; \
 	[ -n "$(ZIPEXE)" ] && \
--- old/make/linux/makefiles/defs.make	2014-02-28 13:00:05.573361300 +0900
+++ new/make/linux/makefiles/defs.make	2014-02-28 13:00:05.517361300 +0900
@@ -195,6 +195,9 @@
     # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
 
     ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+      _JUNK_ := $(shell \
+        echo >&2 "INFO: ENABLE_SEPARATED_DEBUGINFO=$(ENABLE_SEPARATED_DEBUGINFO)")
+
       # Default OBJCOPY comes from GNU Binutils on Linux
       ifeq ($(CROSS_COMPILE_ARCH),)
         DEF_OBJCOPY=/usr/bin/objcopy
@@ -211,14 +214,21 @@
       endif
 
       ifeq ($(OBJCOPY),)
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")
-        ENABLE_FULL_DEBUG_SYMBOLS=0
+
+        ifeq ($(ENABLE_SEPARATED_DEBUGINFO),1)
+          _JUNK_ := $(shell \
+            echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")
+          ENABLE_FULL_DEBUG_SYMBOLS=0
+        endif
+
         _JUNK_ := $(shell \
           echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
       else
-        _JUNK_ := $(shell \
-          echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
+
+        ifeq ($(ENABLE_SEPARATED_DEBUGINFO),1)
+          _JUNK_ := $(shell \
+            echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
+        endif
 
         # Library stripping policies for .debuginfo configs:
         #   all_strip - strips everything from the library
@@ -253,7 +263,7 @@
 
 # client and server subdirectories have symbolic links to ../libjsig.so
 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS)$(ENABLE_SEPARATED_DEBUGINFO),11)
   ifeq ($(ZIP_DEBUGINFO_FILES),1)
     EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
   else
@@ -267,7 +277,7 @@
 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK) $(JVM_VARIANT_CORE)), true)
   EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
   EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
-  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS)$(ENABLE_SEPARATED_DEBUGINFO),11)
     ifeq ($(ZIP_DEBUGINFO_FILES),1)
       EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
     else
@@ -279,7 +289,7 @@
 ifeq ($(JVM_VARIANT_CLIENT),true)
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
-  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS)$(ENABLE_SEPARATED_DEBUGINFO),11)
     ifeq ($(ZIP_DEBUGINFO_FILES),1)
       EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
     else
@@ -292,7 +302,7 @@
   EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/Xusage.txt
   EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.$(LIBRARY_SUFFIX)
 
-  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS)$(ENABLE_SEPARATED_DEBUGINFO),11)
     ifeq ($(ZIP_DEBUGINFO_FILES),1)
 	EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.diz
     else
@@ -307,7 +317,7 @@
                         $(EXPORT_LIB_DIR)/sa-jdi.jar
 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
                         $(EXPORT_LIB_DIR)/sa-jdi.jar
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS)$(ENABLE_SEPARATED_DEBUGINFO),11)
   ifeq ($(ZIP_DEBUGINFO_FILES),1)
     ADD_SA_BINARIES/x86   += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
     ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
--- old/make/linux/makefiles/jsig.make	2014-02-28 13:00:05.784361300 +0900
+++ new/make/linux/makefiles/jsig.make	2014-02-28 13:00:05.729361300 +0900
@@ -56,8 +56,14 @@
 	$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
                          $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ENABLE_SEPARATED_DEBUGINFO),1)
 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	$(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
+	$(RM) $(LIBJSIG_DEBUGINFO)
+    endif
+  endif
   ifeq ($(STRIP_POLICY),all_strip)
 	$(QUIETLY) $(STRIP) $@
   else
@@ -66,10 +72,6 @@
     # implied else here is no stripping at all
     endif
   endif
-  ifeq ($(ZIP_DEBUGINFO_FILES),1)
-	$(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
-	$(RM) $(LIBJSIG_DEBUGINFO)
-  endif
 endif
 
 install_jsig: $(LIBJSIG)
--- old/make/linux/makefiles/saproc.make	2014-02-28 13:00:05.999361300 +0900
+++ new/make/linux/makefiles/saproc.make	2014-02-28 13:00:05.942361300 +0900
@@ -96,8 +96,14 @@
 	           -o $@                                                \
 	           -lthread_db
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ENABLE_SEPARATED_DEBUGINFO),1)
 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	$(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
+	$(RM) $(LIBSAPROC_DEBUGINFO)
+    endif
+  endif
   ifeq ($(STRIP_POLICY),all_strip)
 	$(QUIETLY) $(STRIP) $@
   else
@@ -106,10 +112,6 @@
     # implied else here is no stripping at all
     endif
   endif
-  ifeq ($(ZIP_DEBUGINFO_FILES),1)
-	$(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
-	$(RM) $(LIBSAPROC_DEBUGINFO)
-  endif
 endif
 
 install_saproc: $(BUILDLIBSAPROC)
--- old/make/linux/makefiles/vm.make	2014-02-28 13:00:06.209361300 +0900
+++ new/make/linux/makefiles/vm.make	2014-02-28 13:00:06.152361300 +0900
@@ -343,8 +343,14 @@
 	}
 
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(ENABLE_SEPARATED_DEBUGINFO),1)
 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
+    ifeq ($(ZIP_DEBUGINFO_FILES),1)
+	$(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
+	$(RM) $(LIBJVM_DEBUGINFO)
+    endif
+  endif
   ifeq ($(STRIP_POLICY),all_strip)
 	$(QUIETLY) $(STRIP) $@
   else
@@ -353,10 +359,6 @@
     # implied else here is no stripping at all
     endif
   endif
-  ifeq ($(ZIP_DEBUGINFO_FILES),1)
-	$(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
-	$(RM) $(LIBJVM_DEBUGINFO)
-  endif
 endif
 
 DEST_SUBDIR        = $(JDK_LIBDIR)/$(VM_SUBDIR)