aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2022-06-18 18:19:28 -0700
committerIan Lance Taylor <iant@golang.org>2022-06-21 08:03:17 -0700
commit7905a9ac26707ed6ac49e40e35a9c8755c6574e3 (patch)
tree6af893d33fba2d059e928b6e38fe65bf52db4a7c
parentf1fcd6e3ad911945bc3c24a3a5c7ea99b910121e (diff)
downloadgcc-7905a9ac26707ed6ac49e40e35a9c8755c6574e3.zip
gcc-7905a9ac26707ed6ac49e40e35a9c8755c6574e3.tar.gz
gcc-7905a9ac26707ed6ac49e40e35a9c8755c6574e3.tar.bz2
libgo: #include <sys/types.h> when checking for loff_t
PR go/106033 Fixes golang/go#53469 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/413214
-rw-r--r--gcc/go/gofrontend/MERGE2
-rwxr-xr-xlibgo/configure5
-rw-r--r--libgo/configure.ac5
3 files changed, 9 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 4b75dd3..737bc48 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-a409e049737ec9a358a19233e017d957db3d6d2a
+77821de1a149c2e6ef9c154ae384c16292173039
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/configure b/libgo/configure
index b7ff9b3..61a4994 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -15549,7 +15549,10 @@ fi
CFLAGS_hold="$CFLAGS"
CFLAGS="$OSCFLAGS $CFLAGS"
-ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "#include <fcntl.h>
+ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "
+#include <sys/types.h>
+#include <fcntl.h>
+
"
if test "x$ac_cv_type_loff_t" = xyes; then :
diff --git a/libgo/configure.ac b/libgo/configure.ac
index bac58b0..274fcfc 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -604,7 +604,10 @@ AC_TYPE_OFF_T
CFLAGS_hold="$CFLAGS"
CFLAGS="$OSCFLAGS $CFLAGS"
-AC_CHECK_TYPES([loff_t], [], [], [[#include <fcntl.h>]])
+AC_CHECK_TYPES([loff_t], [], [], [[
+#include <sys/types.h>
+#include <fcntl.h>
+]])
CFLAGS="$CFLAGS_hold"
LIBS_hold="$LIBS"