X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=runtime%2Flibprofile%2FMakefile;h=b82e995ced34319cc21c86941f82588f1640764f;hb=566fb9fe3ed767be7218fb1608ec6a284067d3b0;hp=fa0d69c5d478f876f9362375938fee6b5fecba38;hpb=1922a11907346024439ee653d076cf5823633943;p=oota-llvm.git

diff --git a/runtime/libprofile/Makefile b/runtime/libprofile/Makefile
index fa0d69c5d47..b82e995ced3 100644
--- a/runtime/libprofile/Makefile
+++ b/runtime/libprofile/Makefile
@@ -16,37 +16,40 @@ endif
 LIBRARYNAME = profile_rt
 LINK_LIBS_IN_SHARED = 1
 SHARED_LIBRARY = 1
-EXTRA_DIST = libprofile.exports
-EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/libprofile.exports
+
+# Build and install this archive.                                                                                                                  
+BUILD_ARCHIVE = 1
+override NO_INSTALL_ARCHIVES =
 
 include $(LEVEL)/Makefile.common
 
 ifeq ($(HOST_OS),Darwin)
     # Special hack to allow libprofile_rt to have an offset version number.
-    ifdef LLVM_LTO_VERSION_OFFSET
-        LTO_LIBRARY_VERSION := $(shell expr $(LLVM_SUBMIT_VERSION) + \
-                                            $(LLVM_LTO_VERSION_OFFSET))
-    else
-        LTO_LIBRARY_VERSION := $(LLVM_SUBMIT_VERSION)
-    endif
+    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,$(LTO_LIBRARY_VERSION).$(LLVM_SUBMIT_SUBVERSION) \
+                        -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 
+                         -Wl,-dead_strip
 
     # 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)  \
+       LLVMLibsOptions    := $(LLVMLibsOptions) \
                             -Wl,-install_name \
                             -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
     endif
+
+    # If we're doing an Apple-style build, add the LTO object path.
+    ifeq ($(RC_XBS),YES)
+       TempFile           := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/profile_rt-lto.XXXXXX)
+       LLVMLibsOptions    := $(LLVMLibsOptions) \
+                             -Wl,-object_path_lto -Wl,$(TempFile)
+    endif
 endif