1.1 --- a/make/linux/makefiles/defs.make Fri Apr 12 12:22:59 2013 -0700
1.2 +++ b/make/linux/makefiles/defs.make Fri Apr 12 15:53:30 2013 -0700
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -19,7 +19,7 @@
1.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1.12 # or visit www.oracle.com if you need additional information or have any
1.13 # questions.
1.14 -#
1.15 +#
1.16 #
1.17
1.18 # The common definitions for hotspot linux builds.
1.19 @@ -92,7 +92,7 @@
1.20 VM_PLATFORM = linux_i486
1.21 HS_ARCH = x86
1.22 # We have to reset ARCH to i686 since SRCARCH relies on it
1.23 - ARCH = i686
1.24 + ARCH = i686
1.25 endif
1.26 endif
1.27
1.28 @@ -240,9 +240,6 @@
1.29 # Library suffix
1.30 LIBRARY_SUFFIX=so
1.31
1.32 -# FIXUP: The subdirectory for a debug build is NOT the same on all platforms
1.33 -VM_DEBUG=jvmg
1.34 -
1.35 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
1.36
1.37 # client and server subdirectories have symbolic links to ../libjsig.so
1.38 @@ -279,7 +276,7 @@
1.39 else
1.40 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
1.41 endif
1.42 - endif
1.43 + endif
1.44 endif
1.45
1.46 ifeq ($(JVM_VARIANT_MINIMAL1),true)
1.47 @@ -292,15 +289,15 @@
1.48 else
1.49 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo
1.50 endif
1.51 - endif
1.52 + endif
1.53 endif
1.54
1.55 # Serviceability Binaries
1.56 # No SA Support for PPC, IA64, ARM or zero
1.57 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
1.58 - $(EXPORT_LIB_DIR)/sa-jdi.jar
1.59 + $(EXPORT_LIB_DIR)/sa-jdi.jar
1.60 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
1.61 - $(EXPORT_LIB_DIR)/sa-jdi.jar
1.62 + $(EXPORT_LIB_DIR)/sa-jdi.jar
1.63 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.64 ifeq ($(ZIP_DEBUGINFO_FILES),1)
1.65 ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
1.66 @@ -310,10 +307,10 @@
1.67 ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
1.68 endif
1.69 endif
1.70 -ADD_SA_BINARIES/ppc =
1.71 -ADD_SA_BINARIES/ia64 =
1.72 -ADD_SA_BINARIES/arm =
1.73 -ADD_SA_BINARIES/zero =
1.74 +ADD_SA_BINARIES/ppc =
1.75 +ADD_SA_BINARIES/ia64 =
1.76 +ADD_SA_BINARIES/arm =
1.77 +ADD_SA_BINARIES/zero =
1.78
1.79 -include $(HS_ALT_MAKE)/linux/makefiles/defs.make
1.80
