On Sat, Sep 7, 2019 at 8:20 AM Andreas Schwab <sch...@linux-m68k.org> wrote:
>
> On Sep 07 2019, Bernd Edlinger <bernd.edlin...@hotmail.de> wrote:
>
> > Hi Ian,
> >
> >> gotools:
> >>
> >> 2019-09-06 Ian Lance Taylor <i...@golang.org>
> >>
> >> * Makefile.am (check-carchive-test): Just run "go test", not "go
> >> test carchive_test.go".
> >> * Makefile.in: Regenerate.
> >>
> >> gcc/testsuite:
> >>
> >> 2019-09-06 Ian Lance Taylor <i...@golang.org>
> >>
> >> * go.test/test/fixedbugs/bug369.go: Update to match libgo update
> >> to Go 1.13beta1.
> >>
> >
> > this patch can't build on arm anymore:
>
> Or any other non-x86 architecture.
Sorry for the breakage. I just committed this patch, which should fix
the problem. Let me know if it doesn't.
Ian
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE (revision 275540)
+++ gcc/go/gofrontend/MERGE (working copy)
@@ -1,4 +1,4 @@
-17bef47f464983fd8513f88f3f159d28e2423e79
+03fa49394bb4b37453795bef3119e5b40c929aee
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
Index: libgo/Makefile.am
===================================================================
--- libgo/Makefile.am (revision 275473)
+++ libgo/Makefile.am (working copy)
@@ -683,6 +683,12 @@ else
syscall_lib_clone_lo =
endif
+if LIBGO_IS_X86
+golangorg_x_sys_cpu_gccgo_lo = golang.org/x/sys/cpu_gccgo.lo
+else
+golangorg_x_sys_cpu_gccgo_lo =
+endif
+
PACKAGES = $(shell cat $(srcdir)/libgo-packages.txt)
libgo_go_objs = \
@@ -700,7 +706,7 @@ libgo_go_objs = \
runtime/internal/atomic_c.lo \
sync/atomic_c.lo \
internal/cpu/cpu_gccgo.lo \
- golang.org/x/sys/cpu_gccgo.lo
+ $(golangorg_x_sys_cpu_gccgo_lo)
libgo_ldflags = \
-version-info $(libtool_VERSION) $(PTHREAD_CFLAGS) $(AM_LDFLAGS)
Index: libgo/configure.ac
===================================================================
--- libgo/configure.ac (revision 275473)
+++ libgo/configure.ac (working copy)
@@ -354,6 +354,8 @@ AC_SUBST(GOARCH)
AC_SUBST(ALLGOARCH)
AC_SUBST(ALLGOARCHFAMILY)
+AM_CONDITIONAL(LIBGO_IS_X86, test "$GOARCH" = "386" -o "$GOARCH" = "amd64" -o
"$GOARCH" = "amd64p32")
+
FUNCTION_DESCRIPTORS=false
case ${host} in
rs6000*-*-* | powerpc*-*-*)
