*** old/make/common/Defs-linux.gmk	Tue Nov  6 23:53:35 2012
--- new/make/common/Defs-linux.gmk	Tue Nov  6 23:53:28 2012

*** 109,134 ****
--- 109,131 ----
  _JUNK_ := $(shell \
    echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
  # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
  
  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+   ifndef CROSS_COMPILE_ARCH
      # Default OBJCOPY comes from GNU Binutils on Linux:
      DEF_OBJCOPY=/usr/bin/objcopy
    ifdef CROSS_COMPILE_ARCH
      # don't try to generate .debuginfo files when cross compiling
      _JUNK_ := $(shell \
        echo >&2 "INFO: cross compiling for ARCH $(CROSS_COMPILE_ARCH)," \
          "skipping .debuginfo generation.")
      OBJCOPY=
    else
+     # Assume objcopy is part of the cross-compilation toolkit
+     DEF_OBJCOPY=$(COMPILER_PATH)/objcopy
+   endif
    OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
    ifneq ($(ALT_OBJCOPY),)
      _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
      # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path
      OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
    endif
    endif
  
    # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the
    # JDK build to import .debuginfo or .diz files from the HotSpot build.
    # However, adding FDS support to the JDK build will occur in phases
    # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS

*** 135,145 ****
--- 132,142 ----
    # and PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS) is used to indicate that a
    # particular library or program supports FDS.
  
    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
    else
      _JUNK_ := $(shell \
        echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")