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

Bugfixes for Mac OS X, etc.

Browse Source
This commit is contained in:
Geoff Nixon 2013-10-27 07:36:32 -07:00
parent c2203c6815
commit 69ea1f5721
5 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
makefile
View File

@ -261,7 +261,7 @@ endif
input = List
ifeq ($(use-clang),true)
build-cxx = clang -std=c++11
build-cxx = clang++ -std=c++11
build-cc = clang
else
build-cxx = g++
@ -302,7 +302,7 @@ cflags_debug_fast = -O0 -g3
cflags_stress = -O0 -g3
cflags_stress_major = -O0 -g3
ifeq ($(use-clang),true)
cflags_fast = -O4 -g3
cflags_fast = -O3 -flto -g3
cflags_small = -Oz -g3
else
cflags_fast = -O3 -g3
@ -346,6 +346,18 @@ cflags = $(build-cflags)
common-lflags = -lm -lz
ifeq ($(use-clang),true)
ifeq ($(build-platform),darwin)
common-lflags += -Wl,-export_dynamic
else
ifneq ($(platform),windows)
common-lflags += -Wl,-E
else
common-lflags += -Wl,--export-all-symbols
endif
endif
endif
build-lflags = -lz -lpthread -ldl
lflags = $(common-lflags) -lpthread -ldl
@ -1657,7 +1669,7 @@ endif
$(build)/%.o: $(lzma)/C/%.c
@echo "compiling $(@)"
@mkdir -p $(dir $(@))
$(cxx) $(cflags) $(no-error) -c $$($(windows-path) $(<)) $(call output,$(@))
$(cc) $(cflags) $(no-error) -c $$($(windows-path) $(<)) $(call output,$(@))
$(vm-asm-objects): $(build)/%-asm.o: $(src)/%.$(asm-format)
$(compile-asm-object)
@ -1771,7 +1783,7 @@ executable-objects = $(vm-objects) $(classpath-objects) $(driver-object) \
$(javahome-object) $(boot-javahome-object) $(lzma-decode-objects)
unittest-executable-objects = $(unittest-objects) $(vm-objects) \
$(build)/util/arg-parser.o $(stub-objects)
$(build)/util/arg-parser.o $(stub-objects) $(lzma-decode-objects)
ifeq ($(process),interpret)
unittest-executable-objects += $(all-codegen-target-objects)

4
src/avian/x86.h
View File

@ -30,8 +30,8 @@
#ifdef __APPLE__
# include "mach/mach_types.h"
# include "mach/i386/thread_act.h"
# include "mach/i386/thread_status.h"
# include "mach/thread_act.h"
# include "mach/thread_status.h"
# if __DARWIN_UNIX03 && defined(_STRUCT_X86_EXCEPTION_STATE32)
# define FIELD(x) __##x

2
src/classpath-openjdk.cpp
View File

@ -284,7 +284,9 @@ struct JmmInterface {
const unsigned InterfaceVersion = 4;
const unsigned PageSize = 4 * 1024;
#ifdef AVIAN_OPENJDK_SRC
const int VirtualFileBase = 1000000000;
#endif
Machine* globalMachine;

2
src/compile.cpp
View File

@ -50,7 +50,9 @@ const bool DebugNatives = false;
const bool DebugCallTable = false;
const bool DebugMethodTree = false;
const bool DebugFrameMaps = false;
#ifndef NDEBUG
const bool DebugIntrinsics = false;
#endif
const bool CheckArrayBounds = true;

2
src/tools/type-generator/main.cpp
View File

@ -27,7 +27,7 @@
#define UNUSED __attribute__((unused))
inline void operator delete(void*) { abort(); }
void operator delete(void*) { abort(); }
extern "C" void __cxa_pure_virtual(void) { abort(); }