forked from OSchip/llvm-project
Merge ENABLE_THREADS and ENABLE_STD_THREADS markers
Both of these markers are used in the test suit for annotating when a test needs multi threaded support. Previously they had slightly different meening but they converged to the point where they are used interchangably. This CL removes the ENABLE_STD_THREADS one to simplify the test suite and avoid some confusion. Differential revision: http://reviews.llvm.org/D15498 llvm-svn: 255641
This commit is contained in:
parent
d60e2a3ebf
commit
0ecdae1bdc
|
@ -1,6 +1,6 @@
|
|||
LEVEL = ../../make
|
||||
|
||||
ENABLE_STD_THREADS := YES
|
||||
ENABLE_THREADS := YES
|
||||
CXX_SOURCES := main.cpp
|
||||
|
||||
include $(LEVEL)/Makefile.rules
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
LEVEL = ../../../make
|
||||
|
||||
CXX_SOURCES := main.cpp
|
||||
ENABLE_STD_THREADS := YES
|
||||
ENABLE_THREADS := YES
|
||||
|
||||
include $(LEVEL)/Makefile.rules
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
LEVEL = ../../make
|
||||
|
||||
CXX_SOURCES := main.cpp
|
||||
ENABLE_STD_THREADS := YES
|
||||
ENABLE_THREADS := YES
|
||||
include $(LEVEL)/Makefile.rules
|
||||
|
|
|
@ -2,5 +2,5 @@ LEVEL = ../../../make
|
|||
|
||||
CXXFLAGS += -std=c++11
|
||||
CXX_SOURCES := ParallelTask.cpp
|
||||
ENABLE_STD_THREADS := YES
|
||||
ENABLE_THREADS := YES
|
||||
include $(LEVEL)/Makefile.rules
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
LEVEL = ../../../make
|
||||
|
||||
CXX_SOURCES := main.cpp
|
||||
ENABLE_STD_THREADS := YES
|
||||
ENABLE_THREADS := YES
|
||||
include $(LEVEL)/Makefile.rules
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
LEVEL = ../../../make
|
||||
|
||||
CXX_SOURCES := main.cpp
|
||||
ENABLE_STD_THREADS := YES
|
||||
include $(LEVEL)/Makefile.rules
|
||||
LEVEL = ../../../make
|
||||
|
||||
CXX_SOURCES := main.cpp
|
||||
ENABLE_THREADS := YES
|
||||
include $(LEVEL)/Makefile.rules
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
LEVEL = ../../../make
|
||||
|
||||
ENABLE_STD_THREADS := YES
|
||||
ENABLE_THREADS := YES
|
||||
CXX_SOURCES := main.cpp
|
||||
|
||||
include $(LEVEL)/Makefile.rules
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
LEVEL = ../../../make
|
||||
|
||||
ENABLE_STD_THREADS := YES
|
||||
ENABLE_THREADS := YES
|
||||
CXX_SOURCES := main.cpp
|
||||
|
||||
include $(LEVEL)/Makefile.rules
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
LEVEL = ../../../make
|
||||
|
||||
ENABLE_STD_THREADS := YES
|
||||
ENABLE_THREADS := YES
|
||||
CXX_SOURCES := main.cpp
|
||||
|
||||
include $(LEVEL)/Makefile.rules
|
||||
|
|
|
@ -208,7 +208,7 @@ LD = $(CC)
|
|||
LDFLAGS ?= $(CFLAGS)
|
||||
LDFLAGS += $(LD_EXTRAS)
|
||||
ifeq (,$(filter $(OS), Windows_NT Android))
|
||||
ifneq (,$(filter YES,$(ENABLE_THREADS) $(ENABLE_STD_THREADS)))
|
||||
ifneq (,$(filter YES,$(ENABLE_THREADS)))
|
||||
LDFLAGS += -pthread
|
||||
endif
|
||||
endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
LEVEL = ../../../make
|
||||
|
||||
ENABLE_STD_THREADS := YES
|
||||
ENABLE_THREADS := YES
|
||||
CXX_SOURCES := main.cpp
|
||||
|
||||
include $(LEVEL)/Makefile.rules
|
||||
|
|
Loading…
Reference in New Issue