Patchwork libgo patch committed: Update to weekly.2011-12-22

login
register
mail settings
Submitter Uros Bizjak
Date Jan. 15, 2012, 4:28 p.m.
Message ID <CAFULd4YsPzu9tXLLJfUZV=G0EOGSbfkANoFrVY3tNRfCK7KCVg@mail.gmail.com>
Download mbox | patch
Permalink /patch/136199/
State New
Headers show

Comments

Uros Bizjak - Jan. 15, 2012, 4:28 p.m.
On Sat, Jan 14, 2012 at 12:18 AM, Ian Lance Taylor <iant@google.com> wrote:

>> This is the same problem with -fdump-go-spec we discussed a couple of
>> months ago [1]. In short, alpha linux doesn't just include
>> <asm-generic/ioctls.h> with hardcoded numbers in asm/ioctls.h, but
>> builds ioctl arguments as shown in [1]. Probably, this is the right
>> way ...
>
> Oh yeah.
>
> I think I've worked out a way to handle this kind of thing.  With luck
> this patch will fix the problem.  Bootstrapped on
> x86_64-unknown-linux-gnu, although that doesn't really test it properly.
> Committed to mainline.  Please let me know if this helps.

The library compiles OK, with following small patch:

--cut here--
--cut here--

Thanks,
Uros.
Ian Taylor - Jan. 17, 2012, 2:13 p.m.
Uros Bizjak <ubizjak@gmail.com> writes:

> The library compiles OK, with following small patch:
>
> --cut here--
> Index: mksysinfo.sh
> ===================================================================
> --- mksysinfo.sh        (revision 183192)
> +++ mksysinfo.sh        (working copy)
> @@ -538,7 +538,7 @@
>  # We need TIOCGWINSZ.
>  if ! grep '^const TIOCGWINSZ' ${OUT} >/dev/null 2>&1; then
>    if grep '^const _TIOCGWINSZ_val' ${OUT} >/dev/null 2>&1; then
> -    echo 'const TIOCGWINSZ = TIOCGWINSZ_val' >> ${OUT}
> +    echo 'const TIOCGWINSZ = _TIOCGWINSZ_val' >> ${OUT}
>    fi
>  fi
>
> --cut here--

Whoops.  Thanks.  Committed.

Ian

Patch

Index: mksysinfo.sh
===================================================================
--- mksysinfo.sh        (revision 183192)
+++ mksysinfo.sh        (working copy)
@@ -538,7 +538,7 @@ 
 # We need TIOCGWINSZ.
 if ! grep '^const TIOCGWINSZ' ${OUT} >/dev/null 2>&1; then
   if grep '^const _TIOCGWINSZ_val' ${OUT} >/dev/null 2>&1; then
-    echo 'const TIOCGWINSZ = TIOCGWINSZ_val' >> ${OUT}
+    echo 'const TIOCGWINSZ = _TIOCGWINSZ_val' >> ${OUT}
   fi
 fi