On Thu, Jan 23, 2020 at 11:32 AM Maciej W. Rozycki <ma...@wdc.com> wrote: > > On Tue, 21 Jan 2020, Ian Lance Taylor wrote: > > > I've committed a patch to update libgo to Go 1.14beta1. As usual with > > these updates the patch is far too large to include in this e-mail > > message. I've included the diffs for gccgo-specific files. > > It seems to have broken the `riscv64-linux-gnu' target: > > cpugen.go:2:7: error: redefinition of 'CacheLinePadSize' > 2 | const CacheLinePadSize = 64 > | ^ > .../libgo/go/internal/cpu/cpu_riscv64.go:7:7: note: previous definition of > 'CacheLinePadSize' was here > 7 | const CacheLinePadSize = 32 > | ^ > make[4]: *** [Makefile:2830: internal/cpu.lo] Error 1 > make[4]: Leaving directory '.../riscv64-linux-gnu/libgo'
Thanks. Fixed like so. Committed to mainline. Ian
b83c78fe8fd12ce6c14fe2ca234edbbdac22cd79 diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index a8ba3afe86e..fc1dbaca8b9 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -7d3081ce69dda123d77e35e8b9d282e40e9465e2 +10a8dbfc9945c672d59af8edb9790e2019cdeb27 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_riscv64.go b/libgo/go/internal/cpu/cpu_riscv64.go index c49cab79fdc..d920fcf7a6d 100644 --- a/libgo/go/internal/cpu/cpu_riscv64.go +++ b/libgo/go/internal/cpu/cpu_riscv64.go @@ -3,5 +3,3 @@ // license that can be found in the LICENSE file. package cpu - -const CacheLinePadSize = 32
