Revert r66315. Fix the build on mixed 64/32 Linux systems.

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

diff --git a/Makefile.rules b/Makefile.rules
index 15bc2decf9bf551aa2fba199d3de4a49e24f0916..9b8a84f304c80c52a9952c1e73e4dc24ef0d91bf 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -458,9 +458,9 @@ endif
 ifneq ($(OS),Darwin)
 ifdef TOOLNAME
 ifdef EXAMPLE_TOOL
-  LD.Flags += $(RPATH) -Wl,$(ExmplDir) -export-dynamic
+  LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(RDYNAMIC)
 else
-  LD.Flags += $(RPATH) -Wl,$(ToolDir) -export-dynamic
+  LD.Flags += $(RPATH) -Wl,$(ToolDir) $(RDYNAMIC)
 endif
 endif
 endif
@@ -516,14 +516,6 @@ ifdef UNIVERSAL
 
   # Building universal cannot compute dependencies automatically.
   DISABLE_AUTO_DEPENDENCIES=1
-else
-  ifeq ($(ARCH),x86_64)
-    CompileCommonOpts += -m64
-  else
-    ifeq ($(ARCH),i386)
-      CompileCommonOpts += -m32
-    endif
-  endif
 endif
 
 ifeq ($(OS),SunOS)