Uros Bizjak <ubiz...@gmail.com> writes: > This still doesn't fix the build for alpha due to extra struct. From > sysinfo.go: > > type Timespec struct { Sec Timespec_sec_t; Nsec Timespec_nsec_t; } > type Stat_t struct { Dev uint64; Ino uint64; Rdev uint64; Size int64; > Blocks uint64; Mode uint32; Uid uint32; Gid uint32; Blksize uint32; > Nlink uint32; __pad0 int32; Go0 struct { Atime Timespec; }; Go1 struct > { Mtime Timespec; }; Go2 struct { Ctime Timespec; }; __unused > [2+1]int64; }
I finally got back to this. I think this patch should fix this problem. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian
diff -r 0785cb0479d8 -r 23e3bdca9ee3 libgo/mksysinfo.sh --- a/libgo/mksysinfo.sh Fri May 27 15:31:49 2011 -0700 +++ b/libgo/mksysinfo.sh Tue May 31 11:05:02 2011 -0700 @@ -358,6 +358,7 @@ -e 's/\([^a-zA-Z0-9_]\)_timespec_t\([^a-zA-Z0-9_]\)/\1Timespec\2/g' \ -e 's/\([^a-zA-Z0-9_]\)_timespec\([^a-zA-Z0-9_]\)/\1Timespec\2/g' \ -e 's/\([^a-zA-Z0-9_]\)_timestruc_t\([^a-zA-Z0-9_]\)/\1Timestruc\2/g' \ + -e 's/Godump_[0-9] struct { \([^;]*;\) };/\1/g' \ >> ${OUT} # The directory searching types.