1.1 --- a/make/defs.make Sun Jun 22 20:07:58 2008 -0700
1.2 +++ b/make/defs.make Tue Jun 24 16:52:31 2008 -0700
1.3 @@ -228,6 +228,7 @@
1.4
1.5 # Required make macro settings for all platforms
1.6 MAKE_ARGS += JAVA_HOME=$(ABS_BOOTDIR)
1.7 +MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR)
1.8 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR)
1.9 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE)
1.10 MAKE_ARGS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION)
1.11 @@ -261,21 +262,3 @@
1.12 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h
1.13 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h
1.14 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h
1.15 -
1.16 -# A list of object files built without the platform specific PIC flags, e.g.
1.17 -# -fPIC on linux. Performance measurements show that by compiling GC related
1.18 -# code, we could significantly reduce the GC pause time on 32 bit Linux/Unix
1.19 -# platforms. See 6454213 for more details.
1.20 -include $(GAMMADIR)/make/scm.make
1.21 -
1.22 -ifneq ($(OSNAME), windows)
1.23 - ifndef LP64
1.24 - NONPIC_DIRS = memory oops gc_implementation gc_interface
1.25 - NONPIC_DIRS := $(foreach dir,$(NONPIC_DIRS), $(GAMMADIR)/src/share/vm/$(dir))
1.26 - # Look for source files under NONPIC_DIRS
1.27 - NONPIC_FILES := $(foreach dir,$(NONPIC_DIRS),\
1.28 - $(shell find $(dir) \( $(SCM_DIRS) \) -prune -o \
1.29 - -name '*.cpp' -print))
1.30 - NONPIC_OBJ_FILES := $(notdir $(subst .cpp,.o,$(NONPIC_FILES)))
1.31 - endif
1.32 -endif
