Skip to content

Commit 18ca80c

Browse files
nlewyckynlewycky
committed
Revert r67334 and r37349 which break "make check" on Linux.
llvm-svn: 67368
1 parent 0e75994 commit 18ca80c

File tree

5 files changed

+29
-37
lines changed

5 files changed

+29
-37
lines changed

‎llvm/Makefile.rules‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ ifeq ($(OS),Darwin)
437437

438438
SharedLinkOptions=-Wl,-flat_namespace -Wl,-undefined -Wl,suppress -bundle \
439439
-mmacosx-version-min=$(DARWIN_VERSION)
440-
TargetCommonOpts += -mmacosx-version-min=$(DARWIN_VERSION)
440+
CompileCommonOpts += -mmacosx-version-min=$(DARWIN_VERSION)
441441
else
442442
ifeq ($(OS),Cygwin)
443443
SharedLinkOptions=-shared -nostdlib -Wl,--export-all-symbols \
@@ -536,10 +536,10 @@ ifdef UNIVERSAL
536536
else
537537
ifeq ($(OS),Darwin)
538538
ifeq ($(ARCH),x86_64)
539-
TargetCommonOpts = -m64
539+
CompileCommonOpts += -m64
540540
else
541541
ifeq ($(ARCH),x86)
542-
TargetCommonOpts = -m32
542+
CompileCommonOpts += -m32
543543
endif
544544
endif
545545
endif
@@ -560,35 +560,33 @@ CPP.Flags += $(sort -I$(PROJ_OBJ_DIR) -I$(PROJ_SRC_DIR) \
560560

561561
ifeq ($(BUILD_COMPONENT), 1)
562562
Compile.C = $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(C.Flags.NoRelink) \
563-
$(TargetCommonOpts) $(CompileCommonOpts) -c
563+
$(CompileCommonOpts) -c
564564
Compile.CXX = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
565-
$(TargetCommonOpts) $(CompileCommonOpts) -c
566-
Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(TargetCommonOpts) \
567-
$(CompileCommonOpts) $(CXX.Flags) $(CXX.Flags.NoRelink) -E
565+
$(CompileCommonOpts) -c
566+
Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) \
567+
$(CXX.Flags.NoRelink) -E
568568
Link = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
569-
$(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) $(Strip)
570-
Relink = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) \
571-
$(CompileCommonOpts) $(Relink.Flags)
569+
$(CompileCommonOpts) $(LD.Flags) $(Strip)
570+
Relink = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) \
571+
$(Relink.Flags)
572572
else
573573
Compile.C = $(CC) $(CPP.Flags) $(C.Flags) $(C.Flags.NoRelink) \
574-
$(TargetCommonOpts) $(CompileCommonOpts) -c
574+
$(CompileCommonOpts) -c
575575
Compile.CXX = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
576-
$(TargetCommonOpts) $(CompileCommonOpts) -c
577-
Preprocess.CXX= $(CXX) $(CPP.Flags) $(TargetCommonOpts) \
578-
$(CompileCommonOpts) $(CXX.Flags) $(CXX.Flags.NoRelink) -E
576+
$(CompileCommonOpts) -c
577+
Preprocess.CXX= $(CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) \
578+
$(CXX.Flags.NoRelink) -E
579579
Link = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
580-
$(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) $(Strip)
581-
Relink = $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) \
582-
$(CompileCommonOpts) $(Relink.Flags)
580+
$(CompileCommonOpts) $(LD.Flags) $(Strip)
581+
Relink = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) \
582+
$(Relink.Flags)
583583
endif
584584

585-
BCCompile.C = $(LLVMGCCWITHPATH) $(CPP.Flags) $(C.Flags) \
586-
$(TargetCommonOpts) $(CompileCommonOpts)
587-
Preprocess.C = $(CC) $(CPP.Flags) $(C.Flags) \
588-
$(TargetCommonOpts) $(CompileCommonOpts) -E
585+
BCCompile.C = $(LLVMGCCWITHPATH) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts)
586+
Preprocess.C = $(CC) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts) -E
589587

590588
BCCompile.CXX = $(LLVMGXXWITHPATH) $(CPP.Flags) $(CXX.Flags) \
591-
$(TargetCommonOpts) $(CompileCommonOpts)
589+
$(CompileCommonOpts)
592590

593591
ProgInstall = $(INSTALL) $(Install.StripFlag) -m 0755
594592
ScriptInstall = $(INSTALL) -m 0755

‎llvm/test/BugPoint/misopt-basictest.ll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: bugpoint %s -dce -bugpoint-deletecalls -simplifycfg -silence-passes %bugpoint_topts
1+
; RUN: bugpoint %s -dce -bugpoint-deletecalls -simplifycfg -silence-passes
22

33
@.LC0 = internal global [13 x i8] c"Hello World\0A\00" ; <[13 x i8]*> [#uses=1]
44

‎llvm/test/BugPoint/remove_arguments_test.ll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: bugpoint %s -bugpoint-crashcalls -silence-passes
1+
; RUN: bugpoint %s -bugpoint-crashcalls -silence-passes
22

33
; Test to make sure that arguments are removed from the function if they are
44
; unnecessary.

‎llvm/test/Makefile‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ DSYMUTIL=dsymutil
8787
else
8888
DSYMUTIL=true
8989
endif
90-
ifeq ($(OS),Darwin)
91-
BUGPOINT_TOPTS="-gcc-tool-args $(TargetCommonOpts)"
92-
endif
9390

9491
FORCE:
9592

@@ -111,13 +108,12 @@ site.exp: FORCE
111108
@echo 'set objdir "$(LLVM_OBJ_ROOT)/test"' >>site.tmp
112109
@echo 'set gccpath "$(CC)"' >>site.tmp
113110
@echo 'set gxxpath "$(CXX)"' >>site.tmp
114-
@echo 'set compile_c "' $(CC) $(CPP.Flags) $(TargetCommonOpts) $(CompileCommonOpts) -c '"' >>site.tmp
115-
@echo 'set compile_cxx "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) $(CompileCommonOpts) -c '"' >> site.tmp
116-
@echo 'set link "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) '"' >>site.tmp
117-
@echo 'set llvmgcc "$(LLVMGCC) $(TargetCommonOpts) $(EXTRA_OPTIONS)"' >> site.tmp
118-
@echo 'set llvmgxx "$(LLVMGCC) $(TargetCommonOpts) $(EXTRA_OPTIONS)"' >> site.tmp
111+
@echo 'set compile_c "' $(CC) $(CPP.Flags) $(CompileCommonOpts) -c '"' >>site.tmp
112+
@echo 'set compile_cxx "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) -c '"' >> site.tmp
113+
@echo 'set link "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags) '"' >>site.tmp
114+
@echo 'set llvmgcc "$(LLVMGCC) $(EXTRA_OPTIONS)"' >> site.tmp
115+
@echo 'set llvmgxx "$(LLVMGCC) $(EXTRA_OPTIONS)"' >> site.tmp
119116
@echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp
120-
@echo 'set bugpoint_topts $(BUGPOINT_TOPTS)' >> site.tmp
121117
@echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp
122118
@echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> site.tmp
123119
@echo 'set valgrind "$(VALGRIND)"' >> site.tmp

‎llvm/test/lib/llvm.exp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ proc execOneLine { test PRS outcome lineno line } {
4848
proc substitute { line test tmpFile } {
4949
global srcroot objroot srcdir objdir subdir target_triplet prcontext
5050
global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlc
51-
global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir
52-
global llvmdsymutil valgrind grep gas bugpoint_topts
51+
global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir llvmdsymutil
52+
global valgrind grep gas
5353
set path [file join $srcdir $subdir]
5454

5555
# Substitute all Tcl variables.
@@ -77,8 +77,6 @@ proc substitute { line test tmpFile } {
7777
regsub -all {%llvmdsymutil} $new_line "$llvmdsymutil" new_line
7878
#replace %llvmlibsdir with configure library directory
7979
regsub -all {%llvmlibsdir} $new_line "$llvmlibsdir" new_line
80-
#replace %bugpoint_topts with actual bugpoint target options
81-
regsub -all {%bugpoint_topts} $new_line "$bugpoint_topts" new_line
8280
#replace %p with path to source,
8381
regsub -all {%p} $new_line [file join $srcdir $subdir] new_line
8482
#replace %s with filename

0 commit comments

Comments
 (0)