[llvm-branch-commits] [lldb] 95d1461 - Makefile.rules: Delete GCC 4.6 workaround

[Fangrui Song via llvm-branch-commits]

Author: Fangrui Song
Date: 2021-01-17T13:16:38-08:00
New Revision: 95d146182fdf2315e74943b93fb3bb0cbafc5d89

URL: https://github.com/llvm/llvm-project/commit/95d146182fdf2315e74943b93fb3bb0cbafc5d89
DIFF: https://github.com/llvm/llvm-project/commit/95d146182fdf2315e74943b93fb3bb0cbafc5d89.diff

LOG: Makefile.rules: Delete GCC 4.6 workaround

5.1 is the minimum supported version.

Added: 
    

Modified: 
    lldb/packages/Python/lldbsuite/test/make/Makefile.rules

Removed: 
    


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index 5f6218db4d6d..a7efa15e09df 100644
--- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -513,20 +513,6 @@ ifneq "$(strip $(ARCHIVE_OBJCXX_SOURCES))" ""
 	endif
 endif
 
-#----------------------------------------------------------------------
-# Check if we are compiling with gcc 4.6
-#----------------------------------------------------------------------
-ifneq "$(strip $(CXX_SOURCES) $(OBJCXX_SOURCES))" ""
-ifneq "$(filter g++,$(CXX))" ""
-	CXXVERSION = $(shell $(CXX) -dumpversion | cut -b 1-3)
-	ifeq "$(CXXVERSION)" "4.6"
-		# GCC 4.6 cannot handle -std=c++11, so replace it with -std=c++0x
-		# instead. FIXME: remove once GCC version is upgraded.
-		override CXXFLAGS := $(subst -std=c++11,-std=c++0x,$(CXXFLAGS))
-	endif
-endif
-endif
-
 ifeq ($(findstring clang, $(CXX)), clang)
 	CXXFLAGS += --driver-mode=g++
 endif