Internalize variable names to prevent recursive assignment. Cleanup docs.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17359 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2004-10-30 09:19:36 +00:00
parent f1bd4b4215
commit cc2d1e25f3
9 changed files with 555 additions and 474 deletions

View File

@ -20,10 +20,10 @@ EXTRA_DIST := test llvm.spec include
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
dist-hook:: dist-hook::
@$(ECHO) Eliminating CVS directories from distribution $(Echo) Eliminating CVS directories from distribution
$(VERB) rm -rf `find $(TopDistDir) -type d -name CVS -print` $(Verb) $(RM) -rf `find $(TopDistDir) -type d -name CVS -print`
@$(ECHO) Eliminating files constructed by configure $(Echo) Eliminating files constructed by configure
$(VERB) rm -f \ $(Verb) $(RM) -f \
$(TopDistDir)/include/llvm/ADT/hash_map \ $(TopDistDir)/include/llvm/ADT/hash_map \
$(TopDistDir)/include/llvm/ADT/hash_set \ $(TopDistDir)/include/llvm/ADT/hash_set \
$(TopDistDir)/include/llvm/ADT/iterator \ $(TopDistDir)/include/llvm/ADT/iterator \
@ -31,7 +31,7 @@ dist-hook::
$(TopDistDir)/include/llvm/Support/DataTypes.h \ $(TopDistDir)/include/llvm/Support/DataTypes.h \
$(TopDistDir)/include/llvm/Support/ThreadSupport.h $(TopDistDir)/include/llvm/Support/ThreadSupport.h
test :: all check ::
cd test; $(MAKE) cd test; $(MAKE)
tools-only: all tools-only: all

View File

@ -54,7 +54,7 @@ ETAGSFLAGS = @ETAGSFLAGS@
RPWD = pwd RPWD = pwd
SED = sed SED = sed
RM = rm RM = rm
ECHO = echo "llvm["$(MAKELEVEL)"]:" ECHO = echo
MKDIR = @abs_top_srcdir@/autoconf/mkinstalldirs MKDIR = @abs_top_srcdir@/autoconf/mkinstalldirs
INSTALL_SH = $(BUILD_SRC_ROOT)/autoconf/install-sh INSTALL_SH = $(BUILD_SRC_ROOT)/autoconf/install-sh
DATE = date DATE = date

File diff suppressed because it is too large Load Diff

View File

@ -17,23 +17,21 @@ BUILT_SOURCES = \
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
SparcV9.burg.in1 : $(BUILD_SRC_DIR)/SparcV9.burg.in SparcV9.burg.in1 : $(BUILD_SRC_DIR)/SparcV9.burg.in
@$(ECHO) Pre-processing SparcV9.burg.in $(Echo) Pre-processing SparcV9.burg.in
$(VERB) $(CXX) -E $(CPPFLAGS) -x c++ $< | $(SED) '/^#/d' | $(SED) 's/Ydefine/#define/' > $@ $(Verb) $(CXX) -E $(CPP.Flags) -x c++ $< | $(SED) '/^#/d' | $(SED) 's/Ydefine/#define/' > $@
SparcV9.burm : SparcV9.burg.in1 SparcV9.burm : SparcV9.burg.in1
@$(ECHO) Pre-processing SparcV9.burg.in $(Echo) Pre-processing SparcV9.burg.in
$(VERB) $(CXX) -E $(CPPFLAGS) -x c++ $< | $(SED) '/^#/d' | $(SED) 's/^Xinclude/#include/' | $(SED) 's/^Xdefine/#define/' > $@ $(Verb) $(CXX) -E $(CPP.Flags) -x c++ $< | $(SED) '/^#/d' | $(SED) 's/^Xinclude/#include/' | $(SED) 's/^Xdefine/#define/' > $@
SparcV9.burm.cpp: SparcV9.burm SparcV9.burm.cpp: SparcV9.burm
@$(ECHO) "Burging `basename $<`" $(Echo) "Burging `basename $<`"
$(VERB) $(BURG) -I $< -o $@ $(Verb) $(BURG) -I $< -o $@
TABLEGEN_FILES := $(notdir $(wildcard $(BUILD_SRC_DIR)/*.td)) SparcV9CodeEmitter.inc: $(BUILD_SRC_DIR)/SparcV9.td $(TDFiles) $(TBLGEN)
$(Echo) "Running tblgen on SparcV9.td"
SparcV9CodeEmitter.inc: $(BUILD_SRC_DIR)/SparcV9.td $(TABLEGEN_FILES) $(TBLGEN) $(Verb) $(TableGen) -gen-emitter -o $@ $<
@$(ECHO) "Running tblgen on SparcV9.td"
$(VERB) $(TableGen) -gen-emitter -o $@ $<
clean:: clean::
$(VERB) $(RM) -f SparcV9CodeEmitter.inc SparcV9.burg.in1 SparcV9.burm SparcV9.burm.cpp $(Verb) $(RM) -f SparcV9CodeEmitter.inc SparcV9.burg.in1 SparcV9.burm SparcV9.burm.cpp

View File

@ -28,43 +28,43 @@ Source := $(MainSrc) $(GenericEHSrc) $(SJLJEHSrc) $(CXXEHSrc)
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
# CRTEND_A - The result of making 'all' - the final archive file. # CRTEND_A - The result of making 'all' - the final archive file.
CRTEND_A = $(LIBDIR)/libcrtend.a CRTEND_A = $(LibDir)/libcrtend.a
all:: $(CRTEND_A) all:: $(CRTEND_A)
# Installation simply requires copying the archive to it's new home. # Installation simply requires copying the archive to it's new home.
$(bytecode_libdir)/libcrtend.a: $(CRTEND_A) $(bytecode_libdir) $(bytecode_libdir)/libcrtend.a: $(CRTEND_A) $(bytecode_libdir)
@$(ECHO) Installing $(CRTEND_A) $(Echo) Installing $(CRTEND_A)
$(VERB) $(INSTALL) $(CRTEND_A) $(bytecode_libdir) $(Verb) $(INSTALL) $(CRTEND_A) $(bytecode_libdir)
install:: $(DESTDIR)$(bytecode_libdir)/libcrtend.a install:: $(DESTDIR)$(bytecode_libdir)/libcrtend.a
install-bytecode:: $(DESTDIR)$(bytecode_libdir)/libcrtend.a install-bytecode:: $(DESTDIR)$(bytecode_libdir)/libcrtend.a
# The four components described in the README # The three components described in the README
Components := main genericeh sjljeh Components := main genericeh sjljeh
ComponentLibs := $(Components:%=$(OBJDIR)/comp_%.bc) ComponentLibs := $(Components:%=$(ObjDir)/comp_%.bc)
# We build libcrtend.a from the four components described in the README. # We build libcrtend.a from the four components described in the README.
$(CRTEND_A) : $(ComponentLibs) $(LIBDIR)/.dir $(CRTEND_A) : $(ComponentLibs) $(LibDir)/.dir
@$(ECHO) Building final libcrtend.a file from components $(Echo) Building final libcrtend.a file from components
$(VERB) $(Archive) $@ $(ComponentLibs) $(Verb) $(Archive) $@ $(ComponentLibs)
MainObj := $(OBJDIR)/crtend.bc $(OBJDIR)/listend.bc MainObj := $(ObjDir)/crtend.bc $(ObjDir)/listend.bc
GenericEHObj := $(OBJDIR)/Exception.bc GenericEHObj := $(ObjDir)/Exception.bc
SJLJEHObj := $(OBJDIR)/SJLJ-Exception.bc SJLJEHObj := $(ObjDir)/SJLJ-Exception.bc
# __main and ctor/dtor support component # __main and ctor/dtor support component
$(OBJDIR)/comp_main.bc: $(MainObj) $(ObjDir)/comp_main.bc: $(MainObj)
@$(ECHO) Linking $(notdir $@) component... $(Echo) Linking $(notdir $@) component...
$(VERB) $(GCCLD) -link-as-library -internalize-public-api-file=$(BUILD_SRC_DIR)/comp_main.lst $(MainObj) -o $@ $(Verb) $(GCCLD) -link-as-library -internalize-public-api-file=$(BUILD_SRC_DIR)/comp_main.lst $(MainObj) -o $@
# Generic exception handling support runtime. # Generic exception handling support runtime.
$(OBJDIR)/comp_genericeh.bc: $(GenericEHObj) $(ObjDir)/comp_genericeh.bc: $(GenericEHObj)
@$(ECHO) Linking $(notdir $@) component... $(Echo) Linking $(notdir $@) component...
$(VERB) $(GCCLD) -link-as-library -internalize-public-api-file=$(BUILD_SRC_DIR)/comp_genericeh.lst $(GenericEHObj) -o $@ $(Verb) $(GCCLD) -link-as-library -internalize-public-api-file=$(BUILD_SRC_DIR)/comp_genericeh.lst $(GenericEHObj) -o $@
# setjmp/longjmp exception handling support runtime. # setjmp/longjmp exception handling support runtime.
$(OBJDIR)/comp_sjljeh.bc: $(SJLJEHObj) $(ObjDir)/comp_sjljeh.bc: $(SJLJEHObj)
@$(ECHO) Linking $(notdir $@) component... $(Echo) Linking $(notdir $@) component...
$(VERB) $(GCCLD) -link-as-library -internalize-public-api-file=$(BUILD_SRC_DIR)/comp_sjljeh.lst $(SJLJEHObj) -o $@ $(Verb) $(GCCLD) -link-as-library -internalize-public-api-file=$(BUILD_SRC_DIR)/comp_sjljeh.lst $(SJLJEHObj) -o $@

View File

@ -44,7 +44,7 @@ endif
# #
CONTEXT= -c "srcroot=$(LLVM_SRC_ROOT)" \ CONTEXT= -c "srcroot=$(LLVM_SRC_ROOT)" \
-c "buildroot=$(LLVM_OBJ_ROOT)" \ -c "buildroot=$(LLVM_OBJ_ROOT)" \
-c "buildtype=$(CONFIGURATION)" \ -c "buildtype=$(Configuration)" \
-c "tmpdir=$(LLVM_OBJ_ROOT)/test/tmp" \ -c "tmpdir=$(LLVM_OBJ_ROOT)/test/tmp" \
-c "coresize=0" \ -c "coresize=0" \
-c "cc=$(CC)" \ -c "cc=$(CC)" \

View File

@ -9,16 +9,17 @@
LEVEL = ../.. LEVEL = ../..
LIBRARYNAME = LLVMexecve LIBRARYNAME = LLVMexecve
SHARED_LIBRARY = 1 SHARED_LIBRARY = 1
DONT_BUILD_RELINKED = 1
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
all:: llee all:: llee
llee: $(TOOLDIR)/llee llee: $(ToolDir)/llee
$(TOOLDIR)/llee: Makefile $(ToolDir)/llee: Makefile
@$(ECHO) Constructing llee shell script $(Echo) Constructing llee shell script
$(VERB) echo exec env LD_PRELOAD=$(LIBDIR)/libLLVMexecve$(SHLIBEXT) $$\* > $@ $(Verb) echo exec env LD_PRELOAD=$(LibDir)/libexecve$(SHLIBEXT) $$\* > $@
$(VERB) chmod u+x $@ $(Verb) chmod u+x $@
clean:: clean::
$(VERB) rm -f $(TOOLDIR)/llee $(Verb) rm -f $(ToolDir)/llee

View File

@ -8,31 +8,34 @@
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LEVEL = ../.. LEVEL = ../..
TOOLNAME = burg TOOLNAME = burg
BUILT_SOURCES = gram.tab.c BUILT_SOURCES = gram.tab.c gram.tab.h
EXTRA_DIST = gram.yc gram.tab.c gram.tab.h sample.gr EXTRA_DIST = gram.yc gram.tab.c gram.tab.h sample.gr
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
gram.tab.c gram.tab.h: gram.yc gram.tab.c gram.tab.h: gram.yc
$(VERB) $(BISON) -o gram.tab.c -d $< $(Verb) $(BISON) -o gram.tab.c -d $<
$(OBJDIR)/lex.o : gram.tab.h $(ObjDir)/lex.o : gram.tab.h
clean:: clean::
$(VERB) $(RM) -rf gram.tab.h gram.tab.c core* *.aux *.log *.dvi sample sample.c tmp $(Verb) $(RM) -rf gram.tab.h gram.tab.c core* *.aux *.log *.dvi sample sample.c tmp
#$(BUILD_OBJ_DIR)/Release/lex.o $(BUILD_OBJ_DIR)/Profile/lex.o $(BUILD_OBJ_DIR)/Debug/lex.o: gram.tab.h
doc.dvi: doc.tex doc.dvi: doc.tex
$(VERB) latex doc; latex doc $(Verb) latex doc; latex doc
check:: $(ToolBuildPath) $(BUILD_SRC_DIR)/sample.gr
test:: $(TOOLEXENAME_G) sample.gr $(ToolBuildPath) -I <$(BUILD_SRC_DIR)/sample.gr >sample.c \
$(TOOLEXENAME_G) -I <sample.gr >sample.c && $(CC) $(CFLAGS) -o sample sample.c && ./sample && $(CC) $(CFLAGS) -o sample sample.c && ./sample
$(TOOLEXENAME_G) -I sample.gr >tmp && cmp tmp sample.c $(ToolBuildPath) -I $(BUILD_SRC_DIR)/sample.gr >tmp \
$(TOOLEXENAME_G) -I <sample.gr -o tmp && cmp tmp sample.c && cmp tmp sample.c
$(TOOLEXENAME_G) -I sample.gr -o tmp && cmp tmp sample.c $(ToolBuildPath) -I <$(BUILD_SRC_DIR)/sample.gr -o tmp \
$(TOOLEXENAME_G) -I -O0 <sample.gr >tmp && cmp tmp sample.c && cmp tmp sample.c
$(TOOLEXENAME_G) -I -= <sample.gr >tmp && cmp tmp sample.c $(ToolBuildPath) -I $(BUILD_SRC_DIR)/sample.gr -o tmp \
&& cmp tmp sample.c
$(ToolBuildPath) -I -O0 <$(BUILD_SRC_DIR)/sample.gr >tmp \
&& cmp tmp sample.c
$(ToolBuildPath) -I -= <$(BUILD_SRC_DIR)/sample.gr >tmp \
&& cmp tmp sample.c
$(RM) -f tmp sample.c $(RM) -f tmp sample.c

View File

@ -20,5 +20,5 @@ include $(LEVEL)/Makefile.common
FileLexer.cpp: FileParser.h FileLexer.cpp: FileParser.h
clean:: clean::
$(VERB) $(RM) -f FileParser.cpp FileParser.h FileLexer.cpp CommandLine.cpp $(Verb) $(RM) -f FileParser.cpp FileParser.h FileLexer.cpp CommandLine.cpp
$(VERB) $(RM) -f FileParser.output $(Verb) $(RM) -f FileParser.output