[llvm-commits] [124087] The buildit command on X86 was failing because the gcse. o file was being

bwendlin at apple.com bwendlin at apple.com
Mon Feb 19 14:14:15 PST 2007


Revision: 124087
Author:   bwendlin
Date:     2007-02-19 14:14:13 -0800 (Mon, 19 Feb 2007)

Log Message:
-----------
The buildit command on X86 was failing because the gcse.o file was being
included in the garbage collection when LLVM was built into a dylib. (Thanks to
Chris for discovering this.) We need to not include gcse.c in the gty stuff when
building as dylib.

Modified Paths:
--------------
    apple-local/branches/llvm/gcc/Makefile.in

Modified: apple-local/branches/llvm/gcc/Makefile.in
===================================================================
--- apple-local/branches/llvm/gcc/Makefile.in	2007-02-19 20:15:12 UTC (rev 124086)
+++ apple-local/branches/llvm/gcc/Makefile.in	2007-02-19 22:14:13 UTC (rev 124087)
@@ -1098,6 +1098,13 @@
 OBJS-common := $(filter-out bt-load.o caller-save.o combine.o cse.o ifcvt.o \
                             simplify-rtx.o, $(OBJS-common))
 
+# APPLE LOCAL begin LLVM - Remove gcse.o
+# Remove RTL optimization that requires a function we don't link in.
+ifdef BUILD_LLVM_INTO_A_DYLIB
+OBJS-common := $(filter-out gcse.o, $(OBJS-common))
+endif
+# APPLE LOCAL end LLVM - Remove gcse.o
+
 # Remove generated files.
 OBJS-common := $(filter-out insn-attrtab.o insn-recog.o insn-extract.o, \
                             $(OBJS-common))
@@ -2762,6 +2769,12 @@
   $(out_file) \
   @all_gtfiles@
 
+# APPLE LOCAL begin LLVM - Remove gcse.c
+ifdef BUILD_LLVM_INTO_A_DYLIB
+GTFILES := $(filter-out $(srcdir)/gcse.c, $(GTFILES))
+endif
+# APPLE LOCAL end LLVM - Remove gcse.c
+
 GTFILES_FILES_LANGS = @all_gtfiles_files_langs@
 GTFILES_FILES_FILES = @all_gtfiles_files_files@
 GTFILES_LANG_DIR_NAMES = @subdirs@





More information about the llvm-commits mailing list