diff mbox

[gofrontend-dev,1/4] Gccgo port to s390[x] -- part II

Message ID yddoaskjul6.fsf@lokon.CeBiTec.Uni-Bielefeld.DE
State New
Headers show

Commit Message

Rainer Orth Nov. 6, 2014, 2:02 p.m. UTC 
Ian Taylor <iant@golang.org> writes:

> On Tue, Nov 4, 2014 at 4:15 AM, Dominik Vogt <vogt@linux.vnet.ibm.com> wrote:
>> See commit comment and ChangeLog for details.
>
> Committed patch 0001 with various formatting fixes, as attached.

Unfortunately, the mksysinfo.sh part broke Solaris bootstrap: there's no
type _ucred in gen-sysinfo.go, so the grep in upcase_fields fails.  Due
to the use of set -e, the whole script aborts.

I've used the following to allow bootstrap to continue
but one could consider changing upcase_fields instead.

It seems something changed again in godump within the last few days,
making this patch

	https://gcc.gnu.org/ml/gcc-patches/2014-11/msg00080.html

unnecessary.

	Rainer
diff mbox

Patch

diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -746,7 +746,9 @@  grep '^const _SCM_' gen-sysinfo.go | \
   sed -e 's/^\(const \)_\(SCM_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT}
 
 # The ucred struct.
-upcase_fields "_ucred" "Ucred" >> ${OUT}
+if grep '^type _ucred ' gen-sysinfo.go > /dev/null; then
+  upcase_fields "_ucred" "Ucred" >> ${OUT}
+fi
 
 # The ip_mreq struct.
 grep '^type _ip_mreq ' gen-sysinfo.go | \