From: Chris Lattner <sabre@nondot.org>
Date: Tue, 30 May 2006 16:38:06 +0000 (+0000)
Subject: Enable -fno-use-cxa-atexit on darwin/ppc also.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=73faa39d293e0c6a265e071964af4574808f71de;p=oota-llvm.git

Enable -fno-use-cxa-atexit on darwin/ppc also.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28558 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/Makefile.rules b/Makefile.rules
index ac4a6fd66ec..b719e8c1303 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -363,8 +363,9 @@ 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.
 ifdef UNIVERSAL
   CompileCommonOpts += \
       -arch i386 -arch ppc -isysroot /Developer/SDKs/MACOSX10.4u.sdk/
@@ -374,12 +375,10 @@ ifdef UNIVERSAL
   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
@@ -786,7 +785,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