6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-28 04:33:05 +00:00
Code Issues Projects Releases Wiki Activity

Revert r67334 and r37349 which break "make check" on Linux.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@67368 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nick Lewycky 2009-03-20 07:56:31 +00:00
parent 8fc2d0ee8d
commit faf880fd5d
5 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Makefile.rules
View File

@ -437,7 +437,7 @@ ifeq ($(OS),Darwin)
SharedLinkOptions=-Wl,-flat_namespace -Wl,-undefined -Wl,suppress -bundle \ SharedLinkOptions=-Wl,-flat_namespace -Wl,-undefined -Wl,suppress -bundle \
-mmacosx-version-min=$(DARWIN_VERSION) -mmacosx-version-min=$(DARWIN_VERSION)
TargetCommonOpts += -mmacosx-version-min=$(DARWIN_VERSION) CompileCommonOpts += -mmacosx-version-min=$(DARWIN_VERSION)
else else
ifeq ($(OS),Cygwin) ifeq ($(OS),Cygwin)
SharedLinkOptions=-shared -nostdlib -Wl,--export-all-symbols \ SharedLinkOptions=-shared -nostdlib -Wl,--export-all-symbols \
@ -536,10 +536,10 @@ ifdef UNIVERSAL
else else
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
TargetCommonOpts = -m64 CompileCommonOpts += -m64
else else
ifeq ($(ARCH),x86) ifeq ($(ARCH),x86)
TargetCommonOpts = -m32 CompileCommonOpts += -m32
endif endif
endif endif
endif endif
@ -560,35 +560,33 @@ CPP.Flags += $(sort -I$(PROJ_OBJ_DIR) -I$(PROJ_SRC_DIR) \
ifeq ($(BUILD_COMPONENT), 1) ifeq ($(BUILD_COMPONENT), 1)
Compile.C = $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(C.Flags.NoRelink) \ Compile.C = $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(C.Flags.NoRelink) \
$(TargetCommonOpts) $(CompileCommonOpts) -c $(CompileCommonOpts) -c
Compile.CXX = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \ Compile.CXX = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
$(TargetCommonOpts) $(CompileCommonOpts) -c $(CompileCommonOpts) -c
Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(TargetCommonOpts) \ Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) \
$(CompileCommonOpts) $(CXX.Flags) $(CXX.Flags.NoRelink) -E $(CXX.Flags.NoRelink) -E
Link = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \ Link = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
$(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) $(Strip) $(CompileCommonOpts) $(LD.Flags) $(Strip)
Relink = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) \ Relink = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) \
$(CompileCommonOpts) $(Relink.Flags) $(Relink.Flags)
else else
Compile.C = $(CC) $(CPP.Flags) $(C.Flags) $(C.Flags.NoRelink) \ Compile.C = $(CC) $(CPP.Flags) $(C.Flags) $(C.Flags.NoRelink) \
$(TargetCommonOpts) $(CompileCommonOpts) -c $(CompileCommonOpts) -c
Compile.CXX = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \ Compile.CXX = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
$(TargetCommonOpts) $(CompileCommonOpts) -c $(CompileCommonOpts) -c
Preprocess.CXX= $(CXX) $(CPP.Flags) $(TargetCommonOpts) \ Preprocess.CXX= $(CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) \
$(CompileCommonOpts) $(CXX.Flags) $(CXX.Flags.NoRelink) -E $(CXX.Flags.NoRelink) -E
Link = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \ Link = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
$(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) $(Strip) $(CompileCommonOpts) $(LD.Flags) $(Strip)
Relink = $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) \ Relink = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) \
$(CompileCommonOpts) $(Relink.Flags) $(Relink.Flags)
endif endif
BCCompile.C = $(LLVMGCCWITHPATH) $(CPP.Flags) $(C.Flags) \ BCCompile.C = $(LLVMGCCWITHPATH) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts)
$(TargetCommonOpts) $(CompileCommonOpts) Preprocess.C = $(CC) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts) -E
Preprocess.C = $(CC) $(CPP.Flags) $(C.Flags) \
$(TargetCommonOpts) $(CompileCommonOpts) -E
BCCompile.CXX = $(LLVMGXXWITHPATH) $(CPP.Flags) $(CXX.Flags) \ BCCompile.CXX = $(LLVMGXXWITHPATH) $(CPP.Flags) $(CXX.Flags) \
$(TargetCommonOpts) $(CompileCommonOpts) $(CompileCommonOpts)
ProgInstall = $(INSTALL) $(Install.StripFlag) -m 0755 ProgInstall = $(INSTALL) $(Install.StripFlag) -m 0755
ScriptInstall = $(INSTALL) -m 0755 ScriptInstall = $(INSTALL) -m 0755

2
test/BugPoint/misopt-basictest.ll
View File

@ -1,4 +1,4 @@
; RUN: bugpoint %s -dce -bugpoint-deletecalls -simplifycfg -silence-passes %bugpoint_topts ; RUN: bugpoint %s -dce -bugpoint-deletecalls -simplifycfg -silence-passes
@.LC0 = internal global [13 x i8] c"Hello World\0A\00" ; <[13 x i8]*> [#uses=1] @.LC0 = internal global [13 x i8] c"Hello World\0A\00" ; <[13 x i8]*> [#uses=1]

2
test/BugPoint/remove_arguments_test.ll
View File

@ -1,4 +1,4 @@
; RUN: bugpoint %s -bugpoint-crashcalls -silence-passes ; RUN: bugpoint %s -bugpoint-crashcalls -silence-passes
; Test to make sure that arguments are removed from the function if they are ; Test to make sure that arguments are removed from the function if they are
; unnecessary. ; unnecessary.

14
test/Makefile
View File

@ -87,9 +87,6 @@ DSYMUTIL=dsymutil
else else
DSYMUTIL=true DSYMUTIL=true
endif endif
ifeq ($(OS),Darwin)
BUGPOINT_TOPTS="-gcc-tool-args $(TargetCommonOpts)"
endif
FORCE: FORCE:
@ -111,13 +108,12 @@ site.exp: FORCE
@echo 'set objdir "$(LLVM_OBJ_ROOT)/test"' >>site.tmp @echo 'set objdir "$(LLVM_OBJ_ROOT)/test"' >>site.tmp
@echo 'set gccpath "$(CC)"' >>site.tmp @echo 'set gccpath "$(CC)"' >>site.tmp
@echo 'set gxxpath "$(CXX)"' >>site.tmp @echo 'set gxxpath "$(CXX)"' >>site.tmp
@echo 'set compile_c "' $(CC) $(CPP.Flags) $(TargetCommonOpts) $(CompileCommonOpts) -c '"' >>site.tmp @echo 'set compile_c "' $(CC) $(CPP.Flags) $(CompileCommonOpts) -c '"' >>site.tmp
@echo 'set compile_cxx "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) $(CompileCommonOpts) -c '"' >> site.tmp @echo 'set compile_cxx "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) -c '"' >> site.tmp
@echo 'set link "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) '"' >>site.tmp @echo 'set link "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags) '"' >>site.tmp
@echo 'set llvmgcc "$(LLVMGCC) $(TargetCommonOpts) $(EXTRA_OPTIONS)"' >> site.tmp @echo 'set llvmgcc "$(LLVMGCC) $(EXTRA_OPTIONS)"' >> site.tmp
@echo 'set llvmgxx "$(LLVMGCC) $(TargetCommonOpts) $(EXTRA_OPTIONS)"' >> site.tmp @echo 'set llvmgxx "$(LLVMGCC) $(EXTRA_OPTIONS)"' >> site.tmp
@echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp @echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp
@echo 'set bugpoint_topts $(BUGPOINT_TOPTS)' >> site.tmp
@echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp
@echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> site.tmp @echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> site.tmp
@echo 'set valgrind "$(VALGRIND)"' >> site.tmp @echo 'set valgrind "$(VALGRIND)"' >> site.tmp

6
test/lib/llvm.exp
View File

@ -48,8 +48,8 @@ proc execOneLine { test PRS outcome lineno line } {
proc substitute { line test tmpFile } { proc substitute { line test tmpFile } {
global srcroot objroot srcdir objdir subdir target_triplet prcontext global srcroot objroot srcdir objdir subdir target_triplet prcontext
global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlc global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlc
global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir llvmdsymutil
global llvmdsymutil valgrind grep gas bugpoint_topts global valgrind grep gas
set path [file join $srcdir $subdir] set path [file join $srcdir $subdir]
# Substitute all Tcl variables. # Substitute all Tcl variables.
@ -77,8 +77,6 @@ proc substitute { line test tmpFile } {
regsub -all {%llvmdsymutil} $new_line "$llvmdsymutil" new_line regsub -all {%llvmdsymutil} $new_line "$llvmdsymutil" new_line
#replace %llvmlibsdir with configure library directory #replace %llvmlibsdir with configure library directory
regsub -all {%llvmlibsdir} $new_line "$llvmlibsdir" new_line regsub -all {%llvmlibsdir} $new_line "$llvmlibsdir" new_line
#replace %bugpoint_topts with actual bugpoint target options
regsub -all {%bugpoint_topts} $new_line "$bugpoint_topts" new_line
#replace %p with path to source, #replace %p with path to source,
regsub -all {%p} $new_line [file join $srcdir $subdir] new_line regsub -all {%p} $new_line [file join $srcdir $subdir] new_line
#replace %s with filename #replace %s with filename