Handle versioning of compile unit.

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index ac4a6fd66ecc3b1487f83d5788d4d30b4f06e0f3..df8f63f6f1aa7ea4913e3b4ebdd4986fa298cbb9 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -200,7 +200,11 @@ install-bytecode:: install-bytecode-local
 
 # OPTIMIZE_OPTION - The optimization level option we want to build LLVM with
 # this can be overridden on the make command line.
-OPTIMIZE_OPTION := -O3
+ifneq ($(OS),MingW)
+  OPTIMIZE_OPTION := -O3
+else
+  OPTIMIZE_OPTION := -O2
+endif
 
 ifdef ENABLE_PROFILING
   BuildMode := Profile
@@ -357,29 +361,35 @@ endif
 # Options To Invoke Tools
 #----------------------------------------------------------
 
-CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused
+CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused -Wno-long-long \
+                     -pedantic 
 
 ifeq ($(OS),HP-UX)
   CompileCommonOpts := -D_REENTRANT -D_HPUX_SOURCE
 endif
 
-# If we are building a universal binary on Mac OS/X, pass extra options.  This is
-# useful to people that want to link the LLVM libraries into their universal apps.
+# If we are building a universal binary on Mac OS/X, pass extra options.  This
+# is useful to people that want to link the LLVM libraries into their universal
+# apps.  The UNIVERSAL_SDK_PATH variable can optionally be specified as a path
+# to the SDK to use.  For Mac OS/X 10.4 Intel machines, the traditional one is:
+#   UNIVERSAL_SDK_PATH=/Developer/SDKs/MacOSX10.4u.sdk/
 ifdef UNIVERSAL
-  CompileCommonOpts += \
-      -arch i386 -arch ppc -isysroot /Developer/SDKs/MACOSX10.4u.sdk/
+  CompileCommonOpts += -arch i386 -arch ppc
   Relink.Flags := -XCClinker -arch -XCClinker i386 -XCClinker -arch \
-      -XCClinker ppc -XCClinker \
-      -isysroot -XCClinker /Developer/SDKs/MACOSX10.4u.sdk/
+                  -XCClinker ppc
+  ifdef UNIVERSAL_SDK_PATH
+    CompileCommonOpts += -isysroot $(UNIVERSAL_SDK_PATH)
+    Relink.Flags      += -XCClinker -isysroot -XCClinker $(UNIVERSAL_SDK_PATH)
+  endif
+
+  # Building universal cannot compute dependencies automatically.
   DISABLE_AUTO_DEPENDENCIES=1
 endif
 
-# Temporary workaround for a Mac OSX / x86 compatibility issue.
+# Temporary workaround for a Mac OSX compatibility issue.
 ifeq ($(OS),Darwin)
-ifeq ($(ARCH),x86)
   CXX.Flags += -fno-use-cxa-atexit
 endif
-endif
 
 LD.Flags      += -L$(LibDir) -L$(LLVMLibDir) 
 CPP.BaseFlags += -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
@@ -629,7 +639,7 @@ ifdef ENABLE_ALPHA_JIT
 endif
 
 LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts.a LLVMTransformUtils.a LLVMAnalysis.a \
-            LLVMBCReader LLVMTarget.a LLVMCore LLVMSupport.a LLVMbzip2 \
+            LLVMBCReader.a LLVMTarget.a LLVMCore.a LLVMSupport.a LLVMbzip2.a \
             LLVMSystem.a $(PLATFORMLIBDL)
 endif
 
@@ -639,14 +649,6 @@ endif
 # (defined by the user's project) and "LLVM" libs (defined 
 # by the # LLVM project).
 #---------------------------------------------------------
-# Some versions of gcc on Alpha produce too many symbols, so use a .a file
-ifeq ($(ARCH),Alpha)
-USEDLIBS := $(subst LLVMCore, LLVMCore.a, $(USEDLIBS))
-LLVMLIBS := $(subst LLVMCore, LLVMCore.a, $(LLVMLIBS))
-CORE_IS_ARCHIVE := 1
-else
-CORE_IS_ARCHIVE := 0
-endif
 
 ProjLibsOptions := $(patsubst %.a.o, -l%, $(addsuffix .o, $(USEDLIBS)))
 ProjLibsOptions := $(patsubst %.o, $(LibDir)/%.o,  $(ProjLibsOptions))
@@ -786,7 +788,8 @@ else
 all-local:: $(LibName.BCA)
 
 ifdef EXPORTED_SYMBOL_FILE
-BCLinkLib = $(GCCLD) -L$(CFERuntimeLibDir) -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
+BCLinkLib = $(GCCLD) -L$(CFERuntimeLibDir) \
+                     -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
 
 $(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(GCCLD) \
                 $(LLVMToolDir)/llvm-ar