diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/libprofile/GCDAProfiling.c | 2 | ||||
| -rw-r--r-- | runtime/libprofile/Makefile | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/runtime/libprofile/GCDAProfiling.c b/runtime/libprofile/GCDAProfiling.c index 09a1aec84ef8..e066b227c5c1 100644 --- a/runtime/libprofile/GCDAProfiling.c +++ b/runtime/libprofile/GCDAProfiling.c @@ -89,7 +89,7 @@ static void recursive_mkdir(const char *filename) { pathname = malloc(i + 1); strncpy(pathname, filename, i); pathname[i] = '\0'; -#ifdef _MSC_VER +#ifdef _WIN32 _mkdir(pathname); #else mkdir(pathname, 0750); /* some of these will fail, ignore it. */ diff --git a/runtime/libprofile/Makefile b/runtime/libprofile/Makefile index eced5e5f8ab1..cf31e46949b1 100644 --- a/runtime/libprofile/Makefile +++ b/runtime/libprofile/Makefile @@ -20,3 +20,28 @@ EXTRA_DIST = libprofile.exports EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/libprofile.exports include $(LEVEL)/Makefile.common + +ifeq ($(HOST_OS),Darwin) + # Special hack to allow libprofile_rt to have an offset version number. + PROFILE_RT_LIBRARY_VERSION := $(LLVM_SUBMIT_VERSION) + + # Set dylib internal version number to llvmCore submission number. + ifdef LLVM_SUBMIT_VERSION + LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-current_version \ + -Wl,$(PROFILE_RT_LIBRARY_VERSION).$(LLVM_SUBMIT_SUBVERSION) \ + -Wl,-compatibility_version -Wl,1 + endif + # Extra options to override libtool defaults. + LLVMLibsOptions := $(LLVMLibsOptions) \ + -Wl,-dead_strip \ + -Wl,-seg1addr -Wl,0xE0000000 + + # Mac OS X 10.4 and earlier tools do not allow a second -install_name on + # command line. + DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/') + ifneq ($(DARWIN_VERS),8) + LLVMLibsOptions := $(LLVMLibsOptions) \ + -Wl,-install_name \ + -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)" + endif +endif |