| [981dbbc] | 1 | --- openjdk/hotspot/make/linux/makefiles/defs.make.orig 2012-02-15 09:26:53.000000000 +0100 |
|---|
| 2 | +++ openjdk/hotspot/make/linux/makefiles/defs.make 2012-03-18 23:22:09.000000000 +0100 |
|---|
| 3 | @@ -132,7 +132,7 @@ |
|---|
| 4 | # Full Debug Symbols is supported on JDK7 or newer |
|---|
| 5 | |
|---|
| 6 | # Default OBJCOPY comes from GNU Binutils on Linux: |
|---|
| 7 | - DEF_OBJCOPY=/usr/bin/objcopy |
|---|
| 8 | + DEF_OBJCOPY=feck |
|---|
| 9 | ifdef CROSS_COMPILE_ARCH |
|---|
| 10 | # don't try to generate .debuginfo files when cross compiling |
|---|
| 11 | _JUNK_ := $(shell \ |
|---|
| 12 | @@ -215,10 +215,10 @@ |
|---|
| 13 | $(EXPORT_LIB_DIR)/sa-jdi.jar |
|---|
| 14 | ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \ |
|---|
| 15 | $(EXPORT_LIB_DIR)/sa-jdi.jar |
|---|
| 16 | -ifneq ($(OBJCOPY),) |
|---|
| 17 | - ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo |
|---|
| 18 | - ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo |
|---|
| 19 | -endif |
|---|
| 20 | +#ifneq ($(OBJCOPY),) |
|---|
| 21 | +# ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo |
|---|
| 22 | +# ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo |
|---|
| 23 | +#endif |
|---|
| 24 | ADD_SA_BINARIES/ppc = |
|---|
| 25 | ADD_SA_BINARIES/ia64 = |
|---|
| 26 | ADD_SA_BINARIES/arm = |
|---|
| 27 | |
|---|
| 28 | --- openjdk-boot/hotspot/make/linux/makefiles/defs.make.orig 2012-02-15 09:26:53.000000000 +0100 |
|---|
| 29 | +++ openjdk-boot/hotspot/make/linux/makefiles/defs.make 2012-03-18 23:22:09.000000000 +0100 |
|---|
| 30 | @@ -132,7 +132,7 @@ |
|---|
| 31 | # Full Debug Symbols is supported on JDK7 or newer |
|---|
| 32 | |
|---|
| 33 | # Default OBJCOPY comes from GNU Binutils on Linux: |
|---|
| 34 | - DEF_OBJCOPY=/usr/bin/objcopy |
|---|
| 35 | + DEF_OBJCOPY=feck |
|---|
| 36 | ifdef CROSS_COMPILE_ARCH |
|---|
| 37 | # don't try to generate .debuginfo files when cross compiling |
|---|
| 38 | _JUNK_ := $(shell \ |
|---|
| 39 | @@ -215,10 +215,10 @@ |
|---|
| 40 | $(EXPORT_LIB_DIR)/sa-jdi.jar |
|---|
| 41 | ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \ |
|---|
| 42 | $(EXPORT_LIB_DIR)/sa-jdi.jar |
|---|
| 43 | -ifneq ($(OBJCOPY),) |
|---|
| 44 | - ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo |
|---|
| 45 | - ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo |
|---|
| 46 | -endif |
|---|
| 47 | +#ifneq ($(OBJCOPY),) |
|---|
| 48 | +# ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo |
|---|
| 49 | +# ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo |
|---|
| 50 | +#endif |
|---|
| 51 | ADD_SA_BINARIES/ppc = |
|---|
| 52 | ADD_SA_BINARIES/ia64 = |
|---|
| 53 | ADD_SA_BINARIES/arm = |
|---|
