Merge bb77b39 into 507c06e

Author: gladk

src/sysinfo.cc

@@ -404,7 +404,11 @@ int GetNumCPUs() {
     if (ln.empty()) continue;
     size_t SplitIdx = ln.find(':');
     std::string value;
+#if defined(__s390__)
+    if (SplitIdx != std::string::npos) value = ln.substr(SplitIdx - 1, 2);
+#else
     if (SplitIdx != std::string::npos) value = ln.substr(SplitIdx + 1);
+#endif
     if (ln.size() >= Key.size() && ln.compare(0, Key.size(), Key) == 0) {
       NumCPUs++;
       if (!value.empty()) {