Skip to content

Commit

Permalink
Merge branch 'z80' of github.com:AHelper/llvm-z80-target into z80
Browse files Browse the repository at this point in the history
  • Loading branch information
AHelper committed Nov 2, 2012
2 parents c192ba4 + 35ea20c commit f72c713
Show file tree
Hide file tree
Showing 40 changed files with 39,813 additions and 1,270 deletions.
2 changes: 2 additions & 0 deletions .gitignore
@@ -0,0 +1,2 @@

.DS_Store
70 changes: 0 additions & 70 deletions Makefile.common

This file was deleted.

4 changes: 0 additions & 4 deletions ModuleInfo.txt

This file was deleted.

68 changes: 0 additions & 68 deletions build-for-llvm-top.sh

This file was deleted.

21 changes: 21 additions & 0 deletions projects/LLVMBuild.txt
@@ -0,0 +1,21 @@
;===- ./projects/LLVMBuild.txt ---------------------------------*- Conf -*--===;
;
; The LLVM Compiler Infrastructure
;
; This file is distributed under the University of Illinois Open Source
; License. See LICENSE.TXT for details.
;
;===------------------------------------------------------------------------===;
;
; This is an LLVMBuild description file for the components in this subdirectory.
;
; For more information on the LLVMBuild system, please see:
;
; http://llvm.org/docs/LLVMBuild.html
;
;===------------------------------------------------------------------------===;

[component_0]
type = Group
name = Projects
parent = $ROOT
5 changes: 4 additions & 1 deletion projects/Makefile
Expand Up @@ -14,9 +14,12 @@ include $(LEVEL)/Makefile.config
# Before 2008.06.24 it lived in llvm-test, so exclude that as well for now.
DIRS:= $(filter-out llvm-test test-suite,$(patsubst $(PROJ_SRC_DIR)/%/Makefile,%,$(wildcard $(PROJ_SRC_DIR)/*/Makefile)))

# Don't build compiler-rt either, it isn't designed to be built directly.
# Don't build compiler-rt, it isn't designed to be built directly.
DIRS := $(filter-out compiler-rt,$(DIRS))

# Don't build libcxx, it isn't designed to be built directly.
DIRS := $(filter-out libcxx,$(DIRS))

# Sparc cannot link shared libraries (libtool problem?)
ifeq ($(ARCH), Sparc)
DIRS := $(filter-out sample, $(DIRS))
Expand Down
12 changes: 8 additions & 4 deletions projects/sample/Makefile.common.in
@@ -1,7 +1,7 @@
# Set the name of the project here
PROJECT_NAME := sample
PROJ_VERSION := 0.9

# Set this variable to the top of the LLVM source tree.
LLVM_SRC_ROOT = @LLVM_SRC@

Expand All @@ -13,10 +13,14 @@ LLVM_OBJ_ROOT = @LLVM_OBJ@
PROJ_SRC_ROOT := $(subst //,/,@abs_top_srcdir@)

# Set the root directory of this project's object files
PROJ_OBJ_ROOT := $(subst //,/,@abs_top_objdir@)
PROJ_OBJ_ROOT := $(subst //,/,@abs_top_builddir@)

# Set the root directory of this project's install prefix
PROJ_INSTALL_ROOT := @prefix@

# Include LLVM's Master Makefile.
include $(LLVM_SRC_ROOT)/Makefile.common
# Configuration file to set paths specific to local installation of LLVM
include $(PROJ_OBJ_ROOT)/Makefile.llvm.config

# Include all of the build rules used for making LLVM
include $(PROJ_SRC_ROOT)/Makefile.llvm.rules

0 comments on commit f72c713

Please sign in to comment.