projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add interface for section override. Use this for Sparc, since it should use named...
[oota-llvm.git]
/
Makefile.rules
diff --git
a/Makefile.rules
b/Makefile.rules
index a9421c6e13e52168a891c43fd06bd3e1957ec6e9..a7a4879910995f71ae4f3751ff4300c93bb2d8a4 100644
(file)
--- a/
Makefile.rules
+++ b/
Makefile.rules
@@
-159,7
+159,7
@@
endif
#------------------------------------------------------------------------
ifneq ($(PROJ_OBJ_DIR),$(PROJ_SRC_DIR))
#------------------------------------------------------------------------
ifneq ($(PROJ_OBJ_DIR),$(PROJ_SRC_DIR))
-Makefile: $(PROJ_SRC_DIR)/Makefile
+Makefile: $(PROJ_SRC_DIR)/Makefile
$(ExtraMakefiles)
$(Echo) "Updating Makefile"
$(Verb) $(MKDIR) $(@D)
$(Verb) $(CP) -f $< $@
$(Echo) "Updating Makefile"
$(Verb) $(MKDIR) $(@D)
$(Verb) $(CP) -f $< $@
@@
-171,11
+171,11
@@
$(PROJ_OBJ_DIR)/Makefile% : $(PROJ_SRC_DIR)/Makefile%
@case '$?' in \
*Makefile.rules) ;; \
*.in) ;; \
@case '$?' in \
*Makefile.rules) ;; \
*.in) ;; \
- *) $(Echo) "Updating $(@F)" ; \
+ *) $(Echo
Cmd
) "Updating $(@F)" ; \
$(MKDIR) $(@D) ; \
$(CP) -f $< $@ ;; \
esac
$(MKDIR) $(@D) ; \
$(CP) -f $< $@ ;; \
esac
-
+
endif
#------------------------------------------------------------------------
endif
#------------------------------------------------------------------------
@@
-226,7
+226,7
@@
else
# Darwin requires -fstrict-aliasing to be explicitly enabled.
ifeq ($(OS),Darwin)
# Darwin requires -fstrict-aliasing to be explicitly enabled.
ifeq ($(OS),Darwin)
- EXTRA_OPTIONS += -fstrict-aliasing
+ EXTRA_OPTIONS += -fstrict-aliasing
-Wstrict-aliasing
endif
CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
endif
CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
@@
-451,11
+451,15
@@
ifdef UNIVERSAL
DISABLE_AUTO_DEPENDENCIES=1
endif
DISABLE_AUTO_DEPENDENCIES=1
endif
+ifeq ($(OS),SunOS)
+CPP.BaseFlags += -include llvm/System/Solaris.h
+endif
+
LD.Flags += -L$(LibDir) -L$(LLVMLibDir)
CPP.BaseFlags += -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
# All -I flags should go here, so that they don't confuse llvm-config.
LD.Flags += -L$(LibDir) -L$(LLVMLibDir)
CPP.BaseFlags += -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
# All -I flags should go here, so that they don't confuse llvm-config.
-CPP.Flags += $(
patsubst %,-I%/include,$(sort
\
- $(
PROJ_OBJ_DIR) $(PROJ_SRC_DIR)
\
+CPP.Flags += $(
sort -I$(PROJ_OBJ_DIR) -I$(PROJ_SRC_DIR)
\
+ $(
patsubst %,-I%/include,
\
$(PROJ_OBJ_ROOT) $(PROJ_SRC_ROOT) \
$(LLVM_OBJ_ROOT) $(LLVM_SRC_ROOT))) \
$(CPP.BaseFlags)
$(PROJ_OBJ_ROOT) $(PROJ_SRC_ROOT) \
$(LLVM_OBJ_ROOT) $(LLVM_SRC_ROOT))) \
$(CPP.BaseFlags)
@@
-701,7
+705,7
@@
ifdef LINK_COMPONENTS
$(LLVM_CONFIG):
@echo "*** llvm-config doesn't exist - rebuilding it."
@$(MAKE) -C $(PROJ_OBJ_ROOT)/tools/llvm-config
$(LLVM_CONFIG):
@echo "*** llvm-config doesn't exist - rebuilding it."
@$(MAKE) -C $(PROJ_OBJ_ROOT)/tools/llvm-config
-
+
$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG)
ProjLibsOptions += $(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS))
$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG)
ProjLibsOptions += $(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS))
@@
-728,7
+732,7
@@
$(warning Modules require llvm-gcc but no llvm-gcc is available ****)
else
Module := $(LibDir)/$(MODULE_NAME).bc
else
Module := $(LibDir)/$(MODULE_NAME).bc
-LinkModule := $(LLVMLD) -L$(CFERuntimeLibDir)
+LinkModule := $(LLVMLD) -L$(CFERuntimeLibDir)
-r
ifdef EXPORTED_SYMBOL_FILE
ifdef EXPORTED_SYMBOL_FILE
@@
-805,7
+809,7
@@
SharedLibKindMessage := "Loadable Module"
else
SharedLibKindMessage := "Shared Library"
endif
else
SharedLibKindMessage := "Shared Library"
endif
-$(LibName.LA): $(ObjectsLO) $(LibDir)/.dir
+$(LibName.LA): $(ObjectsLO) $(
ProjLibsPaths) $(LLVMLibsPaths) $(
LibDir)/.dir
$(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \
$(LIBRARYNAME)$(SHLIBEXT)
$(Verb) $(LTLink) -o $@ $(ObjectsLO) $(ProjLibsOptions) \
$(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \
$(LIBRARYNAME)$(SHLIBEXT)
$(Verb) $(LTLink) -o $@ $(ObjectsLO) $(ProjLibsOptions) \
@@
-1086,7
+1090,7
@@
ifndef DISABLE_AUTO_DEPENDENCIES
DEPEND_OPTIONS = -MMD -MP -MF "$(ObjDir)/$*.d.tmp" \
-MT "$(ObjDir)/$*.lo" -MT "$(ObjDir)/$*.o" -MT "$(ObjDir)/$*.d"
DEPEND_OPTIONS = -MMD -MP -MF "$(ObjDir)/$*.d.tmp" \
-MT "$(ObjDir)/$*.lo" -MT "$(ObjDir)/$*.o" -MT "$(ObjDir)/$*.d"
-
+
# If the build succeeded, move the dependency file over. If it failed, put an
# empty file there.
DEPEND_MOVEFILE = then $(MV) -f "$(ObjDir)/$*.d.tmp" "$(ObjDir)/$*.d"; \
# If the build succeeded, move the dependency file over. If it failed, put an
# empty file there.
DEPEND_MOVEFILE = then $(MV) -f "$(ObjDir)/$*.d.tmp" "$(ObjDir)/$*.d"; \
@@
-1292,9
+1296,14
@@
$(ObjDir)/%GenCodeEmitter.inc.tmp: %.td $(ObjDir)/.dir
$(TARGET:%=$(ObjDir)/%GenDAGISel.inc.tmp): \
$(ObjDir)/%GenDAGISel.inc.tmp : %.td $(ObjDir)/.dir
$(TARGET:%=$(ObjDir)/%GenDAGISel.inc.tmp): \
$(ObjDir)/%GenDAGISel.inc.tmp : %.td $(ObjDir)/.dir
- $(Echo) "Building $(<F) instruction selector implementation with tblgen"
+ $(Echo) "Building $(<F)
DAG
instruction selector implementation with tblgen"
$(Verb) $(TableGen) -gen-dag-isel -o $(call SYSPATH, $@) $<
$(Verb) $(TableGen) -gen-dag-isel -o $(call SYSPATH, $@) $<
+$(TARGET:%=$(ObjDir)/%GenFastISel.inc.tmp): \
+$(ObjDir)/%GenFastISel.inc.tmp : %.td $(ObjDir)/.dir
+ $(Echo) "Building $(<F) \"fast\" instruction selector implementation with tblgen"
+ $(Verb) $(TableGen) -gen-fast-isel -o $(call SYSPATH, $@) $<
+
$(TARGET:%=$(ObjDir)/%GenSubtarget.inc.tmp): \
$(ObjDir)/%GenSubtarget.inc.tmp : %.td $(ObjDir)/.dir
$(Echo) "Building $(<F) subtarget information with tblgen"
$(TARGET:%=$(ObjDir)/%GenSubtarget.inc.tmp): \
$(ObjDir)/%GenSubtarget.inc.tmp : %.td $(ObjDir)/.dir
$(Echo) "Building $(<F) subtarget information with tblgen"
@@
-1342,8
+1351,8
@@
$(PROJ_SRC_DIR)/%.cpp: $(PROJ_SRC_DIR)/%.l
$(SED) 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \
$(SED) 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' \
> $(PROJ_SRC_DIR)/$*.cpp
$(SED) 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \
$(SED) 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' \
> $(PROJ_SRC_DIR)/$*.cpp
-
-# IFF the .l file has changed since it was last checked into
CVS
, copy the .l
+
+# IFF the .l file has changed since it was last checked into
SVN
, copy the .l
# file to .l.cvs and the generated .cpp file to .cpp.cvs. We use this mechanism
# so that people without flex can build LLVM by copying the .cvs files to the
# source location and building them.
# file to .l.cvs and the generated .cpp file to .cpp.cvs. We use this mechanism
# so that people without flex can build LLVM by copying the .cvs files to the
# source location and building them.
@@
-1385,7
+1394,7
@@
$(PROJ_SRC_DIR)/%.cpp $(PROJ_SRC_DIR)/%.h : $(PROJ_SRC_DIR)/%.y
$(Verb) $(MV) -f $*.tab.c $(PROJ_SRC_DIR)/$*.cpp
$(Verb) $(MV) -f $*.tab.h $(PROJ_SRC_DIR)/$*.h
$(Verb) $(MV) -f $*.tab.c $(PROJ_SRC_DIR)/$*.cpp
$(Verb) $(MV) -f $*.tab.h $(PROJ_SRC_DIR)/$*.h
-# IFF the .y file has changed since it was last checked into
CVS
, copy the .y
+# IFF the .y file has changed since it was last checked into
SVN
, copy the .y
# file to .y.cvs and the generated .cpp/.h file to .cpp.cvs/.h.cvs. We use this
# mechanism so that people without flex can build LLVM by copying the .cvs files
# to the source location and building them.
# file to .y.cvs and the generated .cpp/.h file to .cpp.cvs/.h.cvs. We use this
# mechanism so that people without flex can build LLVM by copying the .cvs files
# to the source location and building them.
@@
-1738,10
+1747,17
@@
endif
endif
check-line-length:
endif
check-line-length:
- @egrep -n '.{81}' $(Sources)
+ @echo searching for overlength lines in files: $(Sources)
+ @echo
+ @echo
+ @egrep -n '.{81}' $(Sources) /dev/null
check-for-tabs:
check-for-tabs:
- @egrep -n ' ' $(Sources)
+ @echo searching for tabs in files: $(Sources)
+ @echo
+ @echo
+ @egrep -n ' ' $(Sources) /dev/null
+
check-footprint:
@ls -l $(LibDir) | awk '\
BEGIN { sum = 0; } \
check-footprint:
@ls -l $(LibDir) | awk '\
BEGIN { sum = 0; } \