This is an archive of the discontinued LLVM Phabricator instance.

Differential D15498

Merge ENABLE_THREADS and ENABLE_STD_THREADS markers
ClosedPublic

Authored by tberghammer on Dec 14 2015, 8:22 AM.

Details

Reviewers
zturner
labath
Commits
rG0ecdae1bdca9: Merge ENABLE_THREADS and ENABLE_STD_THREADS markers
rLLDB255641: Merge ENABLE_THREADS and ENABLE_STD_THREADS markers
rL255641: Merge ENABLE_THREADS and ENABLE_STD_THREADS markers
Summary

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 meaning but they converged to the point where they are used interchangeably. This CL removes the ENABLE_STD_THREADS one to simplify the test suite and avoid some confusion.

Note: This CL is a preparation to get test running on android compiled with clang

Diff Detail

Repository
rL LLVM

Event Timeline

tberghammer updated this revision to Diff 42725.Dec 14 2015, 8:22 AM
tberghammer retitled this revision from to Merge ENABLE_THREADS and ENABLE_STD_THREADS markers.
tberghammer updated this object.
tberghammer added reviewers: labath, zturner.
tberghammer added a subscriber: lldb-commits.
Herald added subscribers: danalbert, tberghammer. · View Herald TranscriptDec 14 2015, 8:22 AM
labath accepted this revision.Dec 14 2015, 9:37 AM
labath edited edge metadata.

Looks like a nice simplification.

This revision is now accepted and ready to land.Dec 14 2015, 9:37 AM
zturner accepted this revision.Dec 14 2015, 10:37 AM
zturner edited edge metadata.
Closed by commit rL255641: Merge ENABLE_THREADS and ENABLE_STD_THREADS markers (authored by tberghammer). · Explain WhyDec 15 2015, 4:14 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lldb/
trunk/
packages/
Python/
lldbsuite/
test/
api/
multithreaded/
2 lines
functionalities/
stop-hook/
multiple_threads/
2 lines
thread/
2 lines
backtrace_all/
2 lines
break_after_join/
2 lines
create_after_attach/
10 lines
watchpoint/
hello_watchlocation/
2 lines
multiple_threads/
2 lines
watchpoint_set_command/
2 lines
make/
2 lines
python_api/
watchpoint/
watchlocation/
2 lines

Diff 42832

lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/Makefile

LEVEL = ../../make LEVEL = ../../make
ENABLE_STD_THREADS := YES ENABLE_THREADS := YES
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules
clean:: clean::
rm -rf $(wildcard *.o *.d *.dSYM) rm -rf $(wildcard *.o *.d *.dSYM)

lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile

LEVEL = ../../../make LEVEL = ../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
ENABLE_STD_THREADS := YES ENABLE_THREADS := YES
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile

LEVEL = ../../make LEVEL = ../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
ENABLE_STD_THREADS := YES ENABLE_THREADS := YES
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile

LEVEL = ../../../make LEVEL = ../../../make
CXXFLAGS += -std=c++11 CXXFLAGS += -std=c++11
CXX_SOURCES := ParallelTask.cpp CXX_SOURCES := ParallelTask.cpp
ENABLE_STD_THREADS := YES ENABLE_THREADS := YES
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile

LEVEL = ../../../make LEVEL = ../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
ENABLE_STD_THREADS := YES ENABLE_THREADS := YES
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile

LEVEL = ../../../make LEVEL = ../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
ENABLE_STD_THREADS := YES ENABLE_THREADS := YES
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile

LEVEL = ../../../make LEVEL = ../../../make
ENABLE_STD_THREADS := YES ENABLE_THREADS := YES
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile

LEVEL = ../../../make LEVEL = ../../../make
ENABLE_STD_THREADS := YES ENABLE_THREADS := YES
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile

LEVEL = ../../../make LEVEL = ../../../make
ENABLE_STD_THREADS := YES ENABLE_THREADS := YES
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules

Show First 20 Lines • Show All 202 Lines • ▼ Show 20 Lines
endif endif
CXXFLAGS += -std=c++11 CXXFLAGS += -std=c++11
CXXFLAGS += $(CFLAGS) CXXFLAGS += $(CFLAGS)
LD = $(CC) LD = $(CC)
LDFLAGS ?= $(CFLAGS) LDFLAGS ?= $(CFLAGS)
LDFLAGS += $(LD_EXTRAS) LDFLAGS += $(LD_EXTRAS)
ifeq (,$(filter $(OS), Windows_NT Android)) ifeq (,$(filter $(OS), Windows_NT Android))
ifneq (,$(filter YES,$(ENABLE_THREADS) $(ENABLE_STD_THREADS))) ifneq (,$(filter YES,$(ENABLE_THREADS)))
LDFLAGS += -pthread LDFLAGS += -pthread
endif endif
endif endif
OBJECTS = OBJECTS =
EXE ?= a.out EXE ?= a.out
ifneq "$(DYLIB_NAME)" "" ifneq "$(DYLIB_NAME)" ""
ifeq "$(OS)" "Darwin" ifeq "$(OS)" "Darwin"
▲ Show 20 Lines • Show All 377 Lines • Show Last 20 Lines

lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile

LEVEL = ../../../make LEVEL = ../../../make
ENABLE_STD_THREADS := YES ENABLE_THREADS := YES
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules