You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/06/21 09:11:22 UTC
svn commit: r956474 - in /harmony/enhanced/java/branches/mrh:
drlvm/modules/vm/src/main/native/interpreter/unix/
drlvm/modules/vm/src/main/native/vmi/unix/
jdktools/modules/jpda/src/main/native/jdwp/unix/agent/
jdktools/modules/jpda/src/main/native/jdw...
Author: hindessm
Date: Mon Jun 21 07:11:22 2010
New Revision: 956474
URL: http://svn.apache.org/viewvc?rev=956474&view=rev
Log:
Add missing files and fix minor jdktools native rebuild problem.
Added:
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/exports.txt (with props)
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/makefile (with props)
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/exports.txt (with props)
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/makefile (with props)
Modified:
harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile
harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
Added: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/exports.txt?rev=956474&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/exports.txt (added)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/exports.txt Mon Jun 21 07:11:22 2010
@@ -0,0 +1,15 @@
+JIT_call_returns_a_reference
+JIT_can_enumerate
+JIT_compile_method
+JIT_compile_method_with_params
+JIT_deinit
+JIT_execute_method
+JIT_fix_handler_context
+JIT_gen_method_info
+JIT_get_address_of_this
+JIT_get_root_set_for_thread_dump
+JIT_get_root_set_from_stack_frame
+JIT_init
+JIT_init_with_data
+JIT_supports_compressed_references
+JIT_unwind_stack_frame
Propchange: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/exports.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/makefile?rev=956474&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/makefile (added)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/makefile Mon Jun 21 07:11:22 2010
@@ -0,0 +1,44 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Makefile for module 'interpreter'
+#
+
+HY_BIN=$(HY_TARGET)/build/drlvm/vm/native/interpreter/
+include $(HY_TARGET)/hdk/build/make/defines.mk
+VM_HOME=../../../../../../../vm/
+
+DEFINES += \
+ -DREFS_USE_UNCOMPRESSED -D_IA32_ -DPLATFORM_POSIX \
+ -D__SMP__ -DLINUX_TLS_OPT -D_LARGEFILE64_SOURCE
+
+OPT += -fexceptions
+CXXFLAGS += -Wno-deprecated
+
+INCLUDES := -I$(VM_HOME)include -I$(VM_HOME)port/include \
+ -I$(VM_HOME)vmcore/include $(INCLUDES)
+
+BUILDFILES := \
+ interp_exports.o interp_native.o interp_stack_trace.o interp_vm_helpers.o \
+ interpreter.o interpreter_ti.o invokeJNI.o
+
+DLLNAME = $(DLLPATH)default/libinterpreter$(HY_SHLIB_SUFFIX)
+EXPNAME = INTERPRETER_0.1
+
+AS := $(CXX)
+ASFLAGS := -Wa,--fatal-warnings -c -x assembler-with-cpp -g
+
+include $(HY_HDK)/build/make/rules.mk
Propchange: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/exports.txt?rev=956474&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/exports.txt (added)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/exports.txt Mon Jun 21 07:11:22 2010
@@ -0,0 +1,2 @@
+VMI_GetVMIFromJavaVM
+VMI_GetVMIFromJNIEnv
Propchange: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/exports.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/makefile?rev=956474&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/makefile (added)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/makefile Mon Jun 21 07:11:22 2010
@@ -0,0 +1,38 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Makefile for module 'vmi'
+#
+
+HY_BIN=$(HY_TARGET)/build/drlvm/vm/native/vmi/
+include $(HY_TARGET)/hdk/build/make/defines.mk
+VM_HOME=../../../../../../../vm/
+
+DEFINES += \
+ -DREFS_USE_UNCOMPRESSED -D_IA32_ -DPLATFORM_POSIX \
+ -D__SMP__ -DLINUX_TLS_OPT -D_LARGEFILE64_SOURCE
+
+OPT += -fexceptions
+CXXFLAGS += -Wno-deprecated
+
+INCLUDES := -I$(VM_HOME)include -I$(VM_HOME)port/include \
+ -I$(VM_HOME)vmcore/include $(INCLUDES)
+
+BUILDFILES := j9vmls.o vmi.o
+DLLNAME = $(DLLPATH)default/libvmi$(HY_SHLIB_SUFFIX)
+EXPNAME = VMI_0.1
+
+include $(HY_HDK)/build/make/rules.mk
Propchange: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/makefile
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile?rev=956474&r1=956473&r2=956474&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile Mon Jun 21 07:11:22 2010
@@ -48,10 +48,13 @@ DLLNAME = $(TOOLSDLLPATH)libjdwp.so
include $(HY_HDK)/build/make/rules.mk
$(HY_BIN)%.o: core/%.cpp
+ @mkdir -p ${@D}
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
$(HY_BIN)%.o: $(CMNAGENT)core/%.cpp
+ @mkdir -p ${@D}
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
$(HY_BIN)%.o: $(CMNAGENT)commands/%.cpp
+ @mkdir -p ${@D}
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile?rev=956474&r1=956473&r2=956474&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile Mon Jun 21 07:11:22 2010
@@ -45,7 +45,9 @@ DLLNAME = $(TOOLSDLLPATH)libdt_socket.so
include $(HY_HDK)/build/make/rules.mk
$(HY_BIN)%.o: $(CMNTRANS)common/%.cpp
+ @mkdir -p ${@D}
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
$(HY_BIN)%.o: $(CMNTRANS)dt_socket/%.cpp
+ @mkdir -p ${@D}
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<