From: Ian Lance Taylor <iant@golang.org>
To: Matthias Klose <doko@ubuntu.com>
Cc: Andreas Schwab <schwab@linux-m68k.org>,
gcc-patches <gcc-patches@gcc.gnu.org>,
"gofrontend-dev@googlegroups.com"
<gofrontend-dev@googlegroups.com>
Subject: Re: libgo patch committed: Change build procedure to use build tags
Date: Sun, 07 Aug 2016 22:33:00 -0000 [thread overview]
Message-ID: <CAOyqgcVWFY2iNnWs1pJ4+eca42FB_i8vPdkF3eTKdV_OJVqrEw@mail.gmail.com> (raw)
In-Reply-To: <acc28e36-bc6e-5b4f-b9c5-7036cb8e8f7e@ubuntu.com>
[-- Attachment #1: Type: text/plain, Size: 815 bytes --]
On Sun, Aug 7, 2016 at 8:18 AM, Matthias Klose <doko@ubuntu.com> wrote:
> On 07.08.2016 14:14, Andreas Schwab wrote:
>> That breaks ia64:
>>
>> ../../../libgo/go/internal/syscall/unix/getrandom_linux.go:29:5: error: reference to undefined name 'randomTrap'
>> if randomTrap == 0 {
>> ^
>> ../../../libgo/go/internal/syscall/unix/getrandom_linux.go:38:34: error: reference to undefined name 'randomTrap'
>> r1, _, errno := syscall.Syscall(randomTrap,
>> ^
>> make[4]: *** [internal/syscall/unix.lo] Error 1
>
> same on s390x.
Thanks for the reports. This patch should fix these problems, and
also fix the build for Alpha GNU/Linux. Bootstrapped on
x86_64-pc-linux-gnu and verified that the ia64, s390, and alpha should
pick the right files. Committed to mainline.
Ian
[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 6172 bytes --]
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE (revision 239210)
+++ gcc/go/gofrontend/MERGE (working copy)
@@ -1,4 +1,4 @@
-b50a0c3fa975186f934b76e25dae42eb65148d67
+eeeeff3e3dd6c09aaefdf13cce99a5beff47a095
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
Index: libgo/configure.ac
===================================================================
--- libgo/configure.ac (revision 238743)
+++ libgo/configure.ac (working copy)
@@ -191,6 +191,7 @@ is_386=no
is_alpha=no
is_arm=no
is_arm64=no
+is_ia64=no
is_m68k=no
mips_abi=unknown
is_ppc=no
@@ -229,6 +230,10 @@ changequote([,])dnl
GOARCH=amd64
fi
;;
+ ia64-*-*)
+ is_ia64=yes
+ GOARCH=ia64
+ ;;
m68k*-*-*)
is_m68k=yes
GOARCH=m68k
@@ -311,6 +316,7 @@ AM_CONDITIONAL(LIBGO_IS_386, test $is_38
AM_CONDITIONAL(LIBGO_IS_ALPHA, test $is_alpha = yes)
AM_CONDITIONAL(LIBGO_IS_ARM, test $is_arm = yes)
AM_CONDITIONAL(LIBGO_IS_ARM64, test $is_arm64 = yes)
+AM_CONDITIONAL(LIBGO_IS_IA64, test $is_ia64 = yes)
AM_CONDITIONAL(LIBGO_IS_M68K, test $is_m68k = yes)
AM_CONDITIONAL(LIBGO_IS_MIPS, test $mips_abi != unknown)
AM_CONDITIONAL(LIBGO_IS_MIPSO32, test $mips_abi = o32)
Index: libgo/go/internal/syscall/unix/getrandom_linux_alpha.go
===================================================================
--- libgo/go/internal/syscall/unix/getrandom_linux_alpha.go (revision 0)
+++ libgo/go/internal/syscall/unix/getrandom_linux_alpha.go (working copy)
@@ -0,0 +1,9 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix
+
+// Linux getrandom system call number.
+// See GetRandom in getrandom_linux.go.
+const randomTrap uintptr = 511
Index: libgo/go/internal/syscall/unix/getrandom_linux_ia64.go
===================================================================
--- libgo/go/internal/syscall/unix/getrandom_linux_ia64.go (revision 0)
+++ libgo/go/internal/syscall/unix/getrandom_linux_ia64.go (working copy)
@@ -0,0 +1,9 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix
+
+// Linux getrandom system call number.
+// See GetRandom in getrandom_linux.go.
+const randomTrap uintptr = 1339
Index: libgo/go/internal/syscall/unix/getrandom_linux_s390.go
===================================================================
--- libgo/go/internal/syscall/unix/getrandom_linux_s390.go (revision 0)
+++ libgo/go/internal/syscall/unix/getrandom_linux_s390.go (working copy)
@@ -0,0 +1,9 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix
+
+// Linux getrandom system call number.
+// See GetRandom in getrandom_linux.go.
+const randomTrap uintptr = 349
Index: libgo/match.sh
===================================================================
--- libgo/match.sh (revision 239189)
+++ libgo/match.sh (working copy)
@@ -116,7 +116,7 @@ for f in $gofiles; do
android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
tag1=nonmatchingtag
;;
- 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | mipso32 | mipsn32 | mipsn64 | mipso64 | ppc | s390 | s390x | sparc | sparc64)
+ 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | mipso32 | mipsn32 | mipsn64 | mipso64 | ppc | s390 | s390x | sparc | sparc64)
tag1=nonmatchingtag
;;
esac
@@ -128,7 +128,7 @@ for f in $gofiles; do
android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
tag2=nonmatchingtag
;;
- 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | mipso32 | mipsn32 | mipsn64 | mipso64 | ppc | s390 | s390x | sparc | sparc64)
+ 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | mipso32 | mipsn32 | mipsn64 | mipso64 | ppc | s390 | s390x | sparc | sparc64)
tag2=nonmatchingtag
;;
esac
Index: libgo/testsuite/gotest
===================================================================
--- libgo/testsuite/gotest (revision 239189)
+++ libgo/testsuite/gotest (working copy)
@@ -295,7 +295,7 @@ x)
android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
tag1=nonmatchingtag
;;
- 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | mipso32 | mipsn32 | mipsn64 | mipso64 | ppc | s390 | s390x | sparc | sparc64)
+ 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | mipso32 | mipsn32 | mipsn64 | mipso64 | ppc | s390 | s390x | sparc | sparc64)
tag1=nonmatchingtag
;;
esac
@@ -307,7 +307,7 @@ x)
android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
tag2=nonmatchingtag
;;
- 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | mipso32 | mipsn32 | mipsn64 | mipso64 | ppc | s390 | s390x | sparc | sparc64)
+ 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | mipso32 | mipsn32 | mipsn64 | mipso64 | ppc | s390 | s390x | sparc | sparc64)
tag2=nonmatchingtag
;;
esac
next prev parent reply other threads:[~2016-08-07 22:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-06 0:36 Ian Lance Taylor
2016-08-07 12:14 ` Andreas Schwab
2016-08-07 15:18 ` Matthias Klose
2016-08-07 22:33 ` Ian Lance Taylor [this message]
2016-09-04 16:24 ` Matthias Klose
2016-09-23 21:53 ` Ian Lance Taylor
2016-08-08 18:15 ` Lynn A. Boger
2016-08-08 18:26 ` Ian Lance Taylor
2016-08-08 19:07 ` Lynn A. Boger
2016-08-08 20:34 ` Ian Lance Taylor
2016-08-09 15:46 ` Lynn A. Boger
2016-08-11 15:16 ` Rainer Orth
2016-08-11 21:36 ` Ian Lance Taylor
2016-08-12 9:15 ` Rainer Orth
2016-08-12 13:56 ` Rainer Orth
2016-08-13 2:53 ` Ian Lance Taylor
2016-08-13 0:14 ` Ian Lance Taylor
2016-08-12 11:20 ` Andreas Krebbel
2016-08-13 0:23 ` Ian Lance Taylor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAOyqgcVWFY2iNnWs1pJ4+eca42FB_i8vPdkF3eTKdV_OJVqrEw@mail.gmail.com \
--to=iant@golang.org \
--cc=doko@ubuntu.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=gofrontend-dev@googlegroups.com \
--cc=schwab@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).