Skip to content

LLVM submodule #1125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 19 commits into from
Closed

LLVM submodule #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
da58ae3
Add an LLVM git submodule
brson Oct 31, 2011
1bdfb69
Add submodule management to configure script
brson Oct 31, 2011
f959586
Add mk/llvm.mk
brson Nov 1, 2011
4e08d43
Reconfigure when the git submodule status changes
brson Nov 1, 2011
b13acf7
Call LLVM's configure script from ours
brson Nov 1, 2011
191bc94
Tie the LLVM build into ours
brson Nov 1, 2011
f09af1f
Use LLVM directly from the build directory
brson Nov 1, 2011
fed44ac
LLVM build cleanup
brson Nov 2, 2011
d91ed3e
Begin remove old LLVM configuration code
brson Nov 2, 2011
c0450da
Cleanup LLVM build rules after rebase onto x64 changes
brson Nov 2, 2011
6954d4e
Parameterize the LLVM build over the target triples
brson Nov 2, 2011
6a0db5a
Use $(MAKE) for recursive make
brson Nov 3, 2011
80452a9
configure: Use i686 as the CPU type instead of i386
brson Nov 3, 2011
9273328
Cleanup configure script
brson Nov 3, 2011
12f013b
Add clean-all rule which also cleans LLVM
brson Nov 3, 2011
184fe1e
Change the LLVM repo to git://github.com/brson/llvm.git
brson Nov 3, 2011
d2b7693
configure: Quote the git command
brson Nov 3, 2011
e4aa891
Build LLVM with -fno-omit-frame-pointer on Linux
brson Nov 3, 2011
72a8b18
configure: Handle absolute source paths when configuring LLVM
brson Nov 4, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "src/llvm"]
path = src/llvm
url = git://github.com/brson/llvm.git
48 changes: 42 additions & 6 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ CFG_INFO := $(info cfg: make restarts: $(MAKE_RESTARTS))
endif

CFG_INFO := $(info cfg: shell host triple $(CFG_HOST_TRIPLE))
CFG_INFO := $(info cfg: llvm host triple $(CFG_LLVM_TRIPLE))
CFG_INFO := $(info cfg: llvm target triples $(CFG_TARGET_TRIPLES))

ifdef CFG_DISABLE_OPTIMIZE
$(info cfg: disabling rustc optimization (CFG_DISABLE_OPTIMIZE))
Expand Down Expand Up @@ -194,6 +192,36 @@ COMPILER_CRATE := $(S)src/comp/rustc.rc
COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
rustc.rc *.rs */*.rs */*/*.rs))

######################################################################
# LLVM macros
######################################################################

define DEF_LLVM_VARS
# The configure script defines these variables with the target triples
# separated by Z. This defines new ones with the expected format.
CFG_LLVM_BUILD_DIR_$(1):=$$(CFG_LLVM_BUILD_DIR_$(subst -,_,$(1)))
CFG_LLVM_INST_DIR_$(1):=$$(CFG_LLVM_INST_DIR_$(subst -,_,$(1)))

# Any rules that depend on LLVM should depend on LLVM_CONFIG
LLVM_CONFIG_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-config
LLVM_VERSION_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --version)
LLVM_BINDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --bindir)
LLVM_INCDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --includedir)
LLVM_LIBDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --libdir)
LLVM_LIBS_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --libs)
LLVM_LDFLAGS_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --ldflags)
LLVM_CXXFLAGS_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --cxxflags)
LLVM_HOST_TRIPLE_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --host-target)

LLVM_AS_$(1)=$$(LLVM_BINDIR_$(1))/llvm-as$$(X)
LLC_$(1)=$$(LLVM_BINDIR_$(1))/llc$$(X)

endef

$(foreach target,$(CFG_TARGET_TRIPLES), \
$(eval $(call DEF_LLVM_VARS,$(target))))


######################################################################
# Exports for sub-utilities
######################################################################
Expand All @@ -213,10 +241,6 @@ export CFG_PREFIX
# Subprograms
######################################################################

LLVM_AS := $(CFG_LLVM_BINDIR)/llvm-as$(X)

LLC := $(CFG_LLVM_BINDIR)/llc$(X)

######################################################################
# Per-stage targets and runner
######################################################################
Expand Down Expand Up @@ -318,6 +342,17 @@ endif
# Re-configuration
######################################################################

# This is a pretty expensive operation but I don't see any way to avoid it
SUBMODULE_STATUS=$(shell cd "$(CFG_SRC_DIR)" && "$(CFG_GIT)" submodule status)
# Look through for submodules prefixed with '-' (need init), or '+' (need update)
NEED_GIT_RECONFIG=$(shell echo "$(SUBMODULE_STATUS)" | grep -c '^\(+\|-\)')

ifeq ($(NEED_GIT_RECONFIG),0)
else
# If the submodules have changed then always execute config.mk
.PHONY: config.mk
endif

config.mk: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
@$(call E, cfg: reconfiguring)
$(Q)$(S)configure $(CFG_CONFIGURE_ARGS)
Expand All @@ -335,6 +370,7 @@ include $(CFG_SRC_DIR)/mk/rustllvm.mk
include $(CFG_SRC_DIR)/mk/autodep.mk
include $(CFG_SRC_DIR)/mk/tools.mk
include $(CFG_SRC_DIR)/mk/docs.mk
include $(CFG_SRC_DIR)/mk/llvm.mk

######################################################################
# Secondary makefiles, conditionalized for speed
Expand Down
Loading