Index: lldb/trunk/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
===================================================================
--- lldb/trunk/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
+++ lldb/trunk/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
@@ -23,7 +23,6 @@
 
     @expectedFailureFreeBSD("llvm.org/pr18832")
     @dwarf_test
-    @expectedFailureGcc #xfail to get buildbot green, test failed with gcc4.8.2
     def test_hello_watchlocation_with_dwarf(self):
         """Test watching a location with '-s size' option."""
         self.buildDwarf(dictionary=self.d)
Index: lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
===================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
@@ -22,7 +22,6 @@
 
     @expectedFailureFreeBSD('llvm.org/pr18832')
     @dwarf_test
-    @expectedFailureGcc #xfail to get buildbot green, test failed with gcc4.8.2
     def test_watchlocation_with_dwarf_using_watchpoint_set(self):
         """Test watching a location with 'watchpoint set expression -w write -s size' option."""
         self.buildDwarf(dictionary=self.d)
Index: lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
===================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
@@ -13,7 +13,6 @@
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureFreeBSD('llvm.org/pr18832')
-    @expectedFailureGcc #xfail to get buildbot green, test failed with gcc4.8.2
     def test_error_cases_with_watchpoint_set(self):
         """Test error cases with the 'watchpoint set' command."""
         self.buildDwarf(dictionary=self.d)
Index: lldb/trunk/test/make/Makefile.rules
===================================================================
--- lldb/trunk/test/make/Makefile.rules
+++ lldb/trunk/test/make/Makefile.rules
@@ -65,7 +65,7 @@
 # ARCHFLAG is the flag used to tell the compiler which architecture
 # to compile for. The default is the flag that clang accepts.
 #----------------------------------------------------------------------
-ARCHFLAG ?= -arch 
+ARCHFLAG ?= -arch
 
 #----------------------------------------------------------------------
 # Change any build/tool options needed
@@ -129,23 +129,9 @@
 LDFLAGS ?= $(CFLAGS)
 LDFLAGS += $(LD_EXTRAS)
 ifeq (,$(filter $(OS), Windows_NT Android))
-    ifeq "$(ENABLE_THREADS)" "YES"
-        LDFLAGS += -lpthread
-    else
-        ifeq "$(ENABLE_STD_THREADS)" "YES"
-            # with the specific combination of Linux, g++, std=c++11, adding the 
-            # linker flag -lpthread, will cause a program to hang when a std::conditional_variable
-            # is used in a program that links lldb (see bugzilla 21553)
-            ifeq "$(OS)" "Linux"
-                ifeq (,$(findstring gcc,$(CC))) 
-                    # Linux, but not gcc
-                    LDFLAGS += -lpthread
-                endif
-            else
-                LDFLAGS += -lpthread
-            endif
-        endif
-    endif
+	ifneq (,$(filter YES,$(ENABLE_THREADS) $(ENABLE_STD_THREADS)))
+		LDFLAGS += -lpthread
+	endif
 endif
 OBJECTS =
 EXE ?= a.out
@@ -153,8 +139,8 @@
 ifneq "$(DYLIB_NAME)" ""
 	ifeq "$(OS)" "Darwin"
 		DYLIB_FILENAME = lib$(DYLIB_NAME).dylib
-  else ifeq "$(OS)" "Windows_NT"
-    DYLIB_FILENAME = $(DYLIB_NAME).dll
+	else ifeq "$(OS)" "Windows_NT"
+		DYLIB_FILENAME = $(DYLIB_NAME).dll
 	else
 		DYLIB_FILENAME = lib$(DYLIB_NAME).so
 	endif
@@ -499,7 +485,6 @@
 	@echo '  flavor = $(flavor $*)'
 	@echo '   value = $(value  $*)'
 
-
 ### Local Variables: ###
 ### mode:makefile ###
 ### End: ###