ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-21 03:55:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into powerpc

Browse Source
This commit is contained in:
Joel Dice 2009-03-07 16:40:23 -07:00
commit ea4764c924
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile
View File

@ -136,8 +136,8 @@ ifeq ($(platform),windows)
objcopy = i586-mingw32msvc-objcopy
strip = i586-mingw32msvc-strip
else
build-cflags = $(common-cflags) \
"-I$(JAVA_HOME)/include/win32" -I$(src) -mthreads
common-cflags += "-I$(JAVA_HOME)/include/win32"
build-cflags = $(common-cflags) -I$(src) -mthreads
ifeq ($(build-platform),cygwin)
build-lflags += -mno-cygwin
build-cflags += -mno-cygwin

2
src/compile-x86.S
View File

@ -80,7 +80,7 @@ LOCAL(test):
#elif defined __i386__
# if defined __APPLE__ || defined __MINGW32__
# if defined __APPLE__ || defined __MINGW32__ || defined __CYGWIN32__
.globl _vmInvoke
_vmInvoke:
# else

4
src/x86.S
View File

@ -122,7 +122,7 @@ vmJump:
#elif defined __i386__
# if defined __APPLE__ || defined __MINGW32__
# if defined __APPLE__ || defined __MINGW32__ || defined __CYGWIN32__
.globl _vmNativeCall
_vmNativeCall:
# else
@ -199,7 +199,7 @@ LOCAL(exit):
popl %ebp
ret
# if defined __APPLE__ || defined __MINGW32__
# if defined __APPLE__ || defined __MINGW32__ || defined __CYGWIN32__
.globl _vmJump
_vmJump:
# else