From eafb46ce90c23efd22c61d941face060bb9f11f3 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 28 Nov 2020 11:29:25 -0800 Subject: internal/cpu: don't define CacheLinePadSize for mips64x For libgo the definition comes from the generated file cpugen.go. Fixes PR go/98041 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/273866 --- gcc/go/gofrontend/MERGE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc') diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index eec3d07..45f62b3 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. -- cgit v1.1