From 888a9854256974585874eb982fceda24cd7842d3 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 29 Aug 2017 21:00:46 +0000 Subject: [PATCH] libgo: fix Stat_t on AIX Reviewed-on: https://go-review.googlesource.com/59911 From-SVN: r251436 --- gcc/go/gofrontend/MERGE | 2 +- libgo/mksysinfo.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 3351558b27f..b224ba9e9fd 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -a28f1d8aa306bdb5166af1f087e5f5027ce51d6d +03a2c6be0c6e2b8ef62a5a424c5518bfb7cce0b9 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh index fe0bb545605..7a74269443f 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -462,6 +462,7 @@ fi | sed -e 's/type _stat64/type Stat_t/' \ -e 's/st_ctim/Ctim/' \ -e 's/\([^a-zA-Z0-9_]\)_timeval\([^a-zA-Z0-9_]\)/\1Timeval\2/g' \ -e 's/\([^a-zA-Z0-9_]\)_timespec_t\([^a-zA-Z0-9_]\)/\1Timespec\2/g' \ + -e 's/\([^a-zA-Z0-9_]\)_st_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' \ -- 2.30.2