[llvm-commits] CVS: llvm/Makefile.rules

[Chris Lattner]

Changes in directory llvm:

Makefile.rules updated: 1.373 -> 1.374
---
Log message:

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


---
Diffs of the changes:  (+6 -6)

 Makefile.rules |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.373 llvm/Makefile.rules:1.374
--- llvm/Makefile.rules:1.373	Wed May 24 18:02:40 2006
+++ llvm/Makefile.rules	Tue May 30 11:38:06 2006
@@ -363,8 +363,9 @@
   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 @@
   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 @@
 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