diff mbox series

libgo patch committed: Don't define CacheLinePadSize for mips64x

Message ID CAOyqgcU5mnmHC8b+UZ__gJMkNk0emscrgcey0xB1XfZevzdxpQ@mail.gmail.com
State New
Headers show
Series libgo patch committed: Don't define CacheLinePadSize for mips64x | expand

Commit Message

Ian Lance Taylor Nov. 30, 2020, 8:24 p.m. UTC 
This libgo patch changes the internal/cpu package to not define
CacheLinePadSize for mips64x.  For libgo the definition always comes
from the generated file cpugen.go.  This fixes GCC PR 98041.
Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu.  Committed
to mainline.

Ian
eafb46ce90c23efd22c61d941face060bb9f11f3
diff mbox series

Patch

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index eec3d0708e5..45f62b3bec5 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@ 
-84506e0f6bf282765856cb5aeb17124222f73042
+2cc5c746ddfbaeb731f10f2232b9a488df12b71e
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/go/internal/cpu/cpu_mips64x.go b/libgo/go/internal/cpu/cpu_mips64x.go
index 0c4794a70ac..af10a5071ea 100644
--- a/libgo/go/internal/cpu/cpu_mips64x.go
+++ b/libgo/go/internal/cpu/cpu_mips64x.go
@@ -6,8 +6,6 @@ 
 
 package cpu
 
-const CacheLinePadSize = 32
-
 // This is initialized by archauxv and should not be changed after it is
 // initialized.
 var HWCap uint