Merge branch 'master' of dice:git/vm

classpath/classpath.cpp

@@ -10,6 +10,7 @@
 
 extern "C" {
 
+#ifndef __APPLE__
   extern const uint8_t SYMBOL(start)[];
   extern const uint8_t SYMBOL(size)[];
 
@@ -19,5 +20,6 @@ extern "C" {
     *size = reinterpret_cast<uintptr_t>(SYMBOL(size));
     return SYMBOL(start);
   }
+#endif
 
 } // extern "C"

makefile

@@ -33,9 +33,6 @@ input = $(test-build)/Hello.class
 build-cxx = g++
 build-cc = gcc
 
-pthread = -pthread
-lpthread = -lpthread
-
 cxx = $(build-cxx)
 cc = $(build-cc)
 ar = ar
@@ -59,13 +56,13 @@ common-cflags = $(warnings) -fno-rtti -fno-exceptions \
 	-D__STDC_LIMIT_MACROS -D_JNI_IMPLEMENTATION_
 
 build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \
-	-I$(JAVA_HOME)/include/linux -I$(src) $(pthread)
+	-I$(JAVA_HOME)/include/linux -I$(src) -pthread
 
 cflags = $(build-cflags)
 
 common-lflags = -lm -lz
 
-lflags = $(common-lflags) $(lpthread) -ldl -rdynamic
+lflags = $(common-lflags) -lpthread -ldl -rdynamic
 
 system = posix
 asm = x86
@@ -81,8 +78,9 @@ ifeq ($(arch),i386)
 endif
 
 ifeq ($(platform),darwin)
+	build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \
+		-I$(JAVA_HOME)/include/linux -I$(src)
 	lflags = $(common-lflags) -ldl
-	objcopy = gobjcopy
 endif
 
 ifeq ($(platform),windows)
@@ -190,6 +188,10 @@ classpath-classes = \
 	$(call java-classes,$(classpath-sources),$(classpath),$(classpath-build))
 classpath-object = $(native-build)/classpath-jar.o
 
+ifeq ($(platform),darwin)
+	classpath-object =
+endif
+
 test-sources = $(shell find $(test) -name '*.java')
 test-classes = $(call java-classes,$(test-sources),$(test),$(test-build))