public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [PATCH] Fix up mksysinfo.sh
@ 2012-06-29 20:07 Jakub Jelinek
  2012-07-09 11:15 ` Ian Lance Taylor
  0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2012-06-29 20:07 UTC (permalink / raw)
  To: Ian Lance Taylor; +Cc: gcc-patches

Hi!

The recent mksysinfo.sh change for glibc 2.16 bits/resource.h unfortunately
doesn't work, because the sed invocation two lines earlier removes the {}s
this sed command is looking for.
The following makes gcc 4.7 as well as trunk build in Fedora rawhide.

--- libgo/mksysinfo.sh	2012-06-29 14:23:30.684708901 +0200
+++ libgo/mksysinfo.sh	2012-06-29 14:23:20.782761973 +0200
@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go |
 # The rusage struct.
 rusage=`grep '^type _rusage struct' gen-sysinfo.go`
 if test "$rusage" != ""; then
-  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
-  rusage=`echo $rusage | sed -e 's/^ *//'`
   # Remove anonymous unions from GNU/Linux <bits/resource.h>.
   rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'`
+  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
+  rusage=`echo $rusage | sed -e 's/^ *//'`
   nrusage=
   while test -n "$rusage"; do
     field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`

	Jakub

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] Fix up mksysinfo.sh
  2012-06-29 20:07 [PATCH] Fix up mksysinfo.sh Jakub Jelinek
@ 2012-07-09 11:15 ` Ian Lance Taylor
  0 siblings, 0 replies; 2+ messages in thread
From: Ian Lance Taylor @ 2012-07-09 11:15 UTC (permalink / raw)
  To: Jakub Jelinek; +Cc: gcc-patches, gofrontend-dev

On Fri, Jun 29, 2012 at 11:34 AM, Jakub Jelinek <jakub@redhat.com> wrote:
>
> The recent mksysinfo.sh change for glibc 2.16 bits/resource.h unfortunately
> doesn't work, because the sed invocation two lines earlier removes the {}s
> this sed command is looking for.
> The following makes gcc 4.7 as well as trunk build in Fedora rawhide.

Thanks.  Patch committed to trunk and 4.7 branch.

Ian

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-07-09 11:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-29 20:07 [PATCH] Fix up mksysinfo.sh Jakub Jelinek
2012-07-09 11:15 ` Ian Lance Taylor

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).