[libcxx] r293301 - Merging r292607:

[Hans Wennborg via cfe-commits]

Author: hans
Date: Fri Jan 27 10:41:31 2017
New Revision: 293301

URL: http://llvm.org/viewvc/llvm-project?rev=293301&view=rev
Log:
Merging r292607:
------------------------------------------------------------------------
r292607 | ericwf | 2017-01-20 04:54:45 -0800 (Fri, 20 Jan 2017) | 1 line

Don't default older GCC's to C++17, but C++14 or C++11 instead
------------------------------------------------------------------------

Modified:
    libcxx/branches/release_40/   (props changed)
    libcxx/branches/release_40/test/libcxx/test/config.py

Propchange: libcxx/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 27 10:41:31 2017
@@ -1,2 +1,2 @@
 /libcxx/branches/apple:136569-137939
-/libcxx/trunk:292013,292091,292990,293154
+/libcxx/trunk:292013,292091,292607,292990,293154

Modified: libcxx/branches/release_40/test/libcxx/test/config.py
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_40/test/libcxx/test/config.py?rev=293301&r1=293300&r2=293301&view=diff
==============================================================================
--- libcxx/branches/release_40/test/libcxx/test/config.py (original)
+++ libcxx/branches/release_40/test/libcxx/test/config.py Fri Jan 27 10:41:31 2017
@@ -403,6 +403,15 @@ class Configuration(object):
         if not std:
             # Choose the newest possible language dialect if none is given.
             possible_stds = ['c++1z', 'c++14', 'c++11', 'c++03']
+            if self.cxx.type == 'gcc':
+                maj_v, _, _ = self.cxx.version
+                maj_v = int(maj_v)
+                if maj_v < 7:
+                    possible_stds.remove('c++1z')
+                # FIXME: How many C++14 tests actually fail under GCC 5 and 6?
+                # Should we XFAIL them individually instead?
+                if maj_v <= 6:
+                    possible_stds.remove('c++14')
             for s in possible_stds:
                 if self.cxx.hasCompileFlag('-std=%s' % s):
                     std = s