superficial tweaks

This commit is contained in:
Joel Dice 2007-09-21 08:16:43 -06:00
parent 3838cd0e68
commit 65a3ee4277
4 changed files with 12 additions and 12 deletions

View File

@ -7,9 +7,9 @@
#include "jni-util.h" #include "jni-util.h"
#ifdef __APPLE__ #ifdef __APPLE__
#define SO_SUFFIX ".jnilib" # define SO_SUFFIX ".jnilib"
#else #else
#define SO_SUFFIX ".so" # define SO_SUFFIX ".so"
#endif #endif
#undef JNIEXPORT #undef JNIEXPORT

View File

@ -8,8 +8,9 @@ ifeq ($(arch),i686)
arch = i386 arch = i386
endif endif
platform = $(shell uname -s) platform = $(shell uname -s | tr [:upper:] [:lower:])
ifeq ($(platform),Darwin)
ifeq ($(platform),darwin)
rdynamic = rdynamic =
thread-cflags = thread-cflags =
shared = -dynamiclib shared = -dynamiclib
@ -25,7 +26,7 @@ endif
mode = debug mode = debug
bld = build/$(arch)/$(mode) bld = build/$(platform)/$(arch)/$(mode)
cls = build/classes cls = build/classes
src = src src = src
classpath = classpath classpath = classpath
@ -62,9 +63,9 @@ ifeq ($(mode),stress-major)
cflags += -O0 -g3 -DVM_STRESS -DVM_STRESS_MAJOR cflags += -O0 -g3 -DVM_STRESS -DVM_STRESS_MAJOR
endif endif
ifeq ($(mode),fast) ifeq ($(mode),fast)
cflags += -O3 -DNDEBUG cflags += -g3 -O3 -DNDEBUG
strip = strip #strip = strip
show-size = ls -l #show-size = ls -l
endif endif
cpp-objects = $(foreach x,$(1),$(patsubst $(2)/%.cpp,$(bld)/%.o,$(x))) cpp-objects = $(foreach x,$(1),$(patsubst $(2)/%.cpp,$(bld)/%.o,$(x)))

View File

@ -22,13 +22,13 @@
# define ULD "lu" # define ULD "lu"
# define LLD "ld" # define LLD "ld"
#else #else
#error "Unsupported architecture" # error "Unsupported architecture"
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
#define SO_SUFFIX ".jnilib" # define SO_SUFFIX ".jnilib"
#else #else
#define SO_SUFFIX ".so" # define SO_SUFFIX ".so"
#endif #endif
#define NO_RETURN __attribute__((noreturn)) #define NO_RETURN __attribute__((noreturn))

View File

@ -15,7 +15,6 @@
#define ACQUIRE(x) MutexResource MAKE_NAME(mutexResource_) (x) #define ACQUIRE(x) MutexResource MAKE_NAME(mutexResource_) (x)
#ifdef __i386__ #ifdef __i386__
extern "C" uint64_t extern "C" uint64_t