Merge pull request prometheus#288 from pgier/cpuinfo-multi-platform-b…

…ug-fixes cpuinfo: fix platform constraints
remijouannet · May 7, 2020 · 62a2467 · 62a2467
2 parents 52609b4 + e8f8192
commit 62a2467
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/cpuinfo_amd64.go → cpuinfo_default.go b/cpuinfo_amd64.go → cpuinfo_default.go
@@ -12,7 +12,7 @@
 // limitations under the License.
 
 // +build linux
-// +build amd64
+// +build 386 amd64
 
 package procfs
 

diff --git a/cpuinfo_ppc64.go b/cpuinfo_ppc64.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 // +build linux
-// +build ppc64,ppc64le
 
 package procfs
 

diff --git a/cpuinfo_ppc64le.go b/cpuinfo_ppc64le.go
@@ -0,0 +1,18 @@
+// Copyright 2020 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build linux
+
+package procfs
+
+var parseCPUInfo = parseCPUInfoPPC
diff --git a/cpuinfo_s390x.go b/cpuinfo_s390x.go
@@ -12,8 +12,7 @@
 // limitations under the License.
 
 // +build linux
-// +build s390x
 
 package procfs
 
-var parseCPUInfo = parseCPUInfoS390x
+var parseCPUInfo = parseCPUInfoS390X