Sfoglia il codice sorgente

Merge topic 'e2k_support'

d6746fd05c cmMakefile: Fix compilation on EDG-based compilers such as LCC
77c237d219 zstd: Fix incorrect pragma error on LCC compiler

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Acked-by: Igor S. Gerasimov <[email protected]>
Merge-request: !6579
Brad King 4 anni fa
parent
commit
b2726f13bd
2 ha cambiato i file con 5 aggiunte e 6 eliminazioni
  1. 4 5
      Source/cmMakefile.cxx
  2. 1 1
      Utilities/cmzstd/lib/common/compiler.h

+ 4 - 5
Source/cmMakefile.cxx

@@ -3982,11 +3982,10 @@ cmValue cmMakefile::GetProperty(const std::string& prop) const
   if (prop == "TESTS") {
     std::vector<std::string> keys;
     // get list of keys
-    std::transform(this->Tests.begin(), this->Tests.end(),
-                   std::back_inserter(keys),
-                   [](decltype(this->Tests)::value_type const& pair) {
-                     return pair.first;
-                   });
+    const auto* t = this;
+    std::transform(
+      t->Tests.begin(), t->Tests.end(), std::back_inserter(keys),
+      [](decltype(t->Tests)::value_type const& pair) { return pair.first; });
     output = cmJoin(keys, ";");
     return cmValue(output);
   }

+ 1 - 1
Utilities/cmzstd/lib/common/compiler.h

@@ -139,7 +139,7 @@
 
 /* vectorization
  * older GCC (pre gcc-4.3 picked as the cutoff) uses a different syntax */
-#if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__)
+#if !defined(__INTEL_COMPILER) && !defined(__clang__) && !defined(__LCC__) && defined(__GNUC__)
 #  if (__GNUC__ == 4 && __GNUC_MINOR__ > 3) || (__GNUC__ >= 5)
 #    define DONT_VECTORIZE __attribute__((optimize("no-tree-vectorize")))
 #  else