[PATCH] libgo: Recognize off64_t / loff_t type definition of musl libc

75 views
Skip to first unread message

soe...@soeren-tempel.net

unread,
Apr 24, 2022, 6:20:10 AM4/24/22
to gofront...@googlegroups.com, ia...@golang.org, gcc-p...@gcc.gnu.org
From: Sören Tempel <soere...@soeren-tempel.net>

The libgo code assumes both off64_t and loff_t to be present. For
example, for the splice(2) function prototype. Similar to glibc,
musl libc supports these types but defines them as macros, not as
typedefs. Unfortunately, -fdump-go-spec only recognizes types defined
using typedef. To workaround that, this commit adds explicit typedefs
for these types if off64_t or loff_t are defined as macros.

Furthermore, loff_t is only defined on musl with -D_GNU_SOURCE and
requires an include of fcntl.h (this is in accordance with the splice(2)
man page). Therefore, the configure script has also been adjusted
accordingly.
---
libgo/configure | 6 +++++-
libgo/configure.ac | 6 +++++-
libgo/sysinfo.c | 14 ++++++++++++++
3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/libgo/configure b/libgo/configure
index ffe17c9b..b83ddfb3 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -15546,7 +15546,10 @@ _ACEOF

fi

-ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
+CFLAGS_hold=$CFLAGS
+CFLAGS="$CFLAGS -D_GNU_SOURCE"
+ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "#include <fcntl.h>
+"
if test "x$ac_cv_type_loff_t" = xyes; then :

cat >>confdefs.h <<_ACEOF
@@ -15556,6 +15559,7 @@ _ACEOF

fi

+CFLAGS=$CFLAGS_hold

LIBS_hold="$LIBS"
LIBS="$LIBS -lm"
diff --git a/libgo/configure.ac b/libgo/configure.ac
index 7e2b98ba..b8f7d1a0 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -601,7 +601,11 @@ AC_STRUCT_DIRENT_D_TYPE

AC_CHECK_FUNCS(accept4 dup3 epoll_create1 faccessat fallocate fchmodat fchownat futimesat getxattr inotify_add_watch inotify_init inotify_init1 inotify_rm_watch listxattr mkdirat mknodat open64 openat pipe2 removexattr renameat setxattr sync_file_range splice syscall tee unlinkat unshare utimensat)
AC_TYPE_OFF_T
-AC_CHECK_TYPES([loff_t])
+
+CFLAGS_hold=$CFLAGS
+CFLAGS="$CFLAGS -D_GNU_SOURCE"
+AC_CHECK_TYPES([loff_t], [], [], [[#include <fcntl.h>]])
+CFLAGS=$CFLAGS_hold

LIBS_hold="$LIBS"
LIBS="$LIBS -lm"
diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
index 8ce061e2..22f52e5b 100644
--- a/libgo/sysinfo.c
+++ b/libgo/sysinfo.c
@@ -343,6 +343,20 @@ enum {
#endif
};

+// musl libc has both off64_t and loff_t. However, both of these types
+// are defined as CPP macros, not as C typedefs. Unfortunately, the GCC
+// option -fdump-go-spec only recognizes types defined using typedefs.
+#if defined(HAVE_OFF64_T) && defined(off64_t)
+typedef off64_t __musl_off64_t;
+#undef off64_t
+typedef __musl_off64_t off64_t;
+#endif
+#if defined(HAVE_LOFF_T) && defined(loff_t)
+typedef loff_t __musl_loff_t;
+#undef loff_t
+typedef __musl_loff_t loff_t;
+#endif
+
// SIOCGIFMTU can't be added in the above enum as it might
// be signed in some OSes.
#ifdef SIOCGIFMTU

Sören Tempel

unread,
May 7, 2022, 7:18:38 AM5/7/22
to gofront...@googlegroups.com, ia...@golang.org, gcc-p...@gcc.gnu.org
PING.

Summary: gcc-go currently assumes that both loff_t and off64_t are defined
as a typedef. However, musl defines them as a CPP macro causing gccgo to
not compile with musl libc.

See: https://gcc.gnu.org/pipermail/gcc-patches/2022-April/593527.html

If an alternative solution to the problem is preferred, please let me know.

Ian Lance Taylor

unread,
May 9, 2022, 7:33:22 PM5/9/22
to soe...@soeren-tempel.net, gofront...@googlegroups.com, gcc-p...@gcc.gnu.org
On Sun, Apr 24, 2022 at 3:20 AM <soe...@soeren-tempel.net> wrote:
>
> From: Sören Tempel <soere...@soeren-tempel.net>
>
> The libgo code assumes both off64_t and loff_t to be present. For
> example, for the splice(2) function prototype. Similar to glibc,
> musl libc supports these types but defines them as macros, not as
> typedefs. Unfortunately, -fdump-go-spec only recognizes types defined
> using typedef. To workaround that, this commit adds explicit typedefs
> for these types if off64_t or loff_t are defined as macros.
>
> Furthermore, loff_t is only defined on musl with -D_GNU_SOURCE and
> requires an include of fcntl.h (this is in accordance with the splice(2)
> man page). Therefore, the configure script has also been adjusted
> accordingly.

I see uses of loff_t but I don't see any uses of off64_t.

We don't have to treat loff_t differently based on whether it is a
macro, we can just use a different name.

Does this patch work for you?

Ian
patch.txt

Sören Tempel

unread,
May 12, 2022, 2:22:46 PM5/12/22
to Ian Lance Taylor, gofront...@googlegroups.com, gcc-p...@gcc.gnu.org
Hi Ian,

Thanks for following up on this, comments below.

Ian Lance Taylor <ia...@golang.org> wrote:
> I see uses of loff_t but I don't see any uses of off64_t.

The off64_t type is used for defining Offset_t:

https://github.com/golang/gofrontend/blob/4bdff733a0c2a9ddc3eff104b1be03df058a79c4/libgo/mksysinfo.sh#L406-L410

On musl, _HAVE_OFF64_T is defined since autoconf doesn't mind it
being defined as a macro but -fdump-go-spec does, hence you end up
with the following compilation error (even with your patch applied):

sysinfo.go:7896:15: error: use of undefined type '_off64_t'
7896 | type Offset_t _off64_t

> We don't have to treat loff_t differently based on whether it is a
> macro, we can just use a different name.

Sounds good to me.

> Does this patch work for you?

Apart from off64_t stuff, there is only one minor issue (see below).

> index 7e2b98ba6..487099a33 100644
> --- a/libgo/configure.ac
> +++ b/libgo/configure.ac
> @@ -579,7 +579,7 @@ AC_C_BIGENDIAN
> +
> +CFLAGS_hold="$CFLAGS"
> +CFLAGS="$OSCFLAGS $CFLAGS"
> AC_CHECK_TYPES([loff_t])
> +CFLAGS="$CFLAGS_hold"

The AC_CHECK_TYPES invocation is missing an include of fcntl.h (which
defines loff_t in musl) and as such fails and causes libgo compilation
to fail with "reference to undefined name '_libgo_loff_t_type'" as
HAVE_LOFF_T is not defined. The invocation needs to be changed to:

AC_CHECK_TYPES([loff_t], [], [], [[#include <fcntl.h>]])

and this needs to be adjusted accordingly in configure as well.

Sincerely,
Sören

Ian Lance Taylor

unread,
May 12, 2022, 5:04:29 PM5/12/22
to Sören Tempel, gcc-p...@gcc.gnu.org, gofront...@googlegroups.com
On Thu, May 12, 2022 at 11:23 AM Sören Tempel via Gcc-patches
<gcc-p...@gcc.gnu.org> wrote:
>
> The off64_t type is used for defining Offset_t:
>
> https://github.com/golang/gofrontend/blob/4bdff733a0c2a9ddc3eff104b1be03df058a79c4/libgo/mksysinfo.sh#L406-L410
>
> On musl, _HAVE_OFF64_T is defined since autoconf doesn't mind it
> being defined as a macro but -fdump-go-spec does, hence you end up
> with the following compilation error (even with your patch applied):

Ah, thanks.


> Apart from off64_t stuff, there is only one minor issue (see below).
>
> > index 7e2b98ba6..487099a33 100644
> > --- a/libgo/configure.ac
> > +++ b/libgo/configure.ac
> > @@ -579,7 +579,7 @@ AC_C_BIGENDIAN
> > +
> > +CFLAGS_hold="$CFLAGS"
> > +CFLAGS="$OSCFLAGS $CFLAGS"
> > AC_CHECK_TYPES([loff_t])
> > +CFLAGS="$CFLAGS_hold"
>
> The AC_CHECK_TYPES invocation is missing an include of fcntl.h (which
> defines loff_t in musl) and as such fails and causes libgo compilation
> to fail with "reference to undefined name '_libgo_loff_t_type'" as
> HAVE_LOFF_T is not defined. The invocation needs to be changed to:
>
> AC_CHECK_TYPES([loff_t], [], [], [[#include <fcntl.h>]])
>
> and this needs to be adjusted accordingly in configure as well.

Hmmm, I added fcntl.h to AC_CHECK_HEADERS. I thought that would be
enough to cause it to be included in future tests. Perhaps not.

Ian

Sören Tempel

unread,
May 18, 2022, 3:22:20 AM5/18/22
to Ian Lance Taylor, gcc-p...@gcc.gnu.org, gofront...@googlegroups.com
I modified your patch to also define libgo_off_t_type (along to
libgo_loff_t_type) and used that to define Offset_t in mksysinfo.sh.
Furthermore, I fixed the include for the loff_t feature check.

With those two modifications your patch works for me (see attachment).

Greetings,
Sören

Ian Lance Taylor <ia...@golang.org> wrote:
patch.txt

Sören Tempel

unread,
May 31, 2022, 3:41:14 PM5/31/22
to Ian Lance Taylor, gcc-p...@gcc.gnu.org, gofront...@googlegroups.com
PING.

If there is anything else that needs to be addressed please let me know.
> diff --git a/libgo/config.h.in b/libgo/config.h.in
> index 25b8ab8f9ee..2c3c7469675 100644
> --- a/libgo/config.h.in
> +++ b/libgo/config.h.in
> @@ -70,6 +70,9 @@
> /* Define to 1 if you have the `fchownat' function. */
> #undef HAVE_FCHOWNAT
>
> +/* Define to 1 if you have the <fcntl.h> header file. */
> +#undef HAVE_FCNTL_H
> +
> /* Define to 1 if you have the `futimesat' function. */
> #undef HAVE_FUTIMESAT
>
> diff --git a/libgo/configure b/libgo/configure
> index ffe17c9be55..13e21d60c62 100755
> --- a/libgo/configure
> +++ b/libgo/configure
> @@ -15249,7 +15249,7 @@ $as_echo "#define HAVE_GETIPINFO 1" >>confdefs.h
> fi
>
>
> -for ac_header in port.h sched.h semaphore.h sys/file.h sys/mman.h syscall.h sys/epoll.h sys/event.h sys/inotify.h sys/ptrace.h sys/syscall.h sys/sysctl.h sys/user.h sys/utsname.h sys/select.h sys/socket.h net/bpf.h net/if.h net/if_arp.h net/route.h netpacket/packet.h sys/prctl.h sys/mount.h sys/vfs.h sys/statfs.h sys/timex.h sys/sysinfo.h utime.h linux/ether.h linux/fs.h linux/ptrace.h linux/reboot.h netinet/in_syst.h netinet/ip.h netinet/ip_mroute.h netinet/if_ether.h lwp.h
> +for ac_header in fcntl.h port.h sched.h semaphore.h sys/file.h sys/mman.h syscall.h sys/epoll.h sys/event.h sys/inotify.h sys/ptrace.h sys/syscall.h sys/sysctl.h sys/user.h sys/utsname.h sys/select.h sys/socket.h net/bpf.h net/if.h net/if_arp.h net/route.h netpacket/packet.h sys/prctl.h sys/mount.h sys/vfs.h sys/statfs.h sys/timex.h sys/sysinfo.h utime.h linux/ether.h linux/fs.h linux/ptrace.h linux/reboot.h netinet/in_syst.h netinet/ip.h netinet/ip_mroute.h netinet/if_ether.h lwp.h
> do :
> as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
> ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
> @@ -15546,7 +15546,10 @@ _ACEOF
>
> fi
>
> -ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
> +
> +CFLAGS_hold="$CFLAGS"
> +CFLAGS="$OSCFLAGS $CFLAGS"
> +ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "#include <fcntl.h>"
> if test "x$ac_cv_type_loff_t" = xyes; then :
>
> cat >>confdefs.h <<_ACEOF
> @@ -15556,6 +15559,7 @@ _ACEOF
>
> fi
>
> +CFLAGS="$CFLAGS_hold"
>
> LIBS_hold="$LIBS"
> LIBS="$LIBS -lm"
> diff --git a/libgo/configure.ac b/libgo/configure.ac
> index 7e2b98ba67c..bac58b07b41 100644
> --- a/libgo/configure.ac
> +++ b/libgo/configure.ac
> @@ -579,7 +579,7 @@ AC_C_BIGENDIAN
>
> GCC_CHECK_UNWIND_GETIPINFO
>
> -AC_CHECK_HEADERS(port.h sched.h semaphore.h sys/file.h sys/mman.h syscall.h sys/epoll.h sys/event.h sys/inotify.h sys/ptrace.h sys/syscall.h sys/sysctl.h sys/user.h sys/utsname.h sys/select.h sys/socket.h net/bpf.h net/if.h net/if_arp.h net/route.h netpacket/packet.h sys/prctl.h sys/mount.h sys/vfs.h sys/statfs.h sys/timex.h sys/sysinfo.h utime.h linux/ether.h linux/fs.h linux/ptrace.h linux/reboot.h netinet/in_syst.h netinet/ip.h netinet/ip_mroute.h netinet/if_ether.h lwp.h)
> +AC_CHECK_HEADERS(fcntl.h port.h sched.h semaphore.h sys/file.h sys/mman.h syscall.h sys/epoll.h sys/event.h sys/inotify.h sys/ptrace.h sys/syscall.h sys/sysctl.h sys/user.h sys/utsname.h sys/select.h sys/socket.h net/bpf.h net/if.h net/if_arp.h net/route.h netpacket/packet.h sys/prctl.h sys/mount.h sys/vfs.h sys/statfs.h sys/timex.h sys/sysinfo.h utime.h linux/ether.h linux/fs.h linux/ptrace.h linux/reboot.h netinet/in_syst.h netinet/ip.h netinet/ip_mroute.h netinet/if_ether.h lwp.h)
>
> AC_CHECK_HEADERS([netinet/icmp6.h], [], [],
> [#include <netinet/in.h>
> @@ -601,7 +601,11 @@ AC_STRUCT_DIRENT_D_TYPE
>
> AC_CHECK_FUNCS(accept4 dup3 epoll_create1 faccessat fallocate fchmodat fchownat futimesat getxattr inotify_add_watch inotify_init inotify_init1 inotify_rm_watch listxattr mkdirat mknodat open64 openat pipe2 removexattr renameat setxattr sync_file_range splice syscall tee unlinkat unshare utimensat)
> AC_TYPE_OFF_T
> -AC_CHECK_TYPES([loff_t])
> +
> +CFLAGS_hold="$CFLAGS"
> +CFLAGS="$OSCFLAGS $CFLAGS"
> +AC_CHECK_TYPES([loff_t], [], [], [[#include <fcntl.h>]])
> +CFLAGS="$CFLAGS_hold"
>
> LIBS_hold="$LIBS"
> LIBS="$LIBS -lm"
> diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
> index 96974bd3269..d41af5e28b3 100644
> --- a/libgo/go/syscall/libcall_linux.go
> +++ b/libgo/go/syscall/libcall_linux.go
> @@ -209,19 +209,19 @@ func Gettid() (tid int) {
> //sys Setxattr(path string, attr string, data []byte, flags int) (err error)
> //setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int
>
> -//sys splice(rfd int, roff *_loff_t, wfd int, woff *_loff_t, len int, flags int) (n int64, err error)
> -//splice(rfd _C_int, roff *_loff_t, wfd _C_int, woff *_loff_t, len Size_t, flags _C_uint) Ssize_t
> +//sys splice(rfd int, roff *_libgo_loff_t_type, wfd int, woff *_libgo_loff_t_type, len int, flags int) (n int64, err error)
> +//splice(rfd _C_int, roff *_libgo_loff_t_type, wfd _C_int, woff *_libgo_loff_t_type, len Size_t, flags _C_uint) Ssize_t
> func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
> - var lroff _loff_t
> - var plroff *_loff_t
> + var lroff _libgo_loff_t_type
> + var plroff *_libgo_loff_t_type
> if roff != nil {
> - lroff = _loff_t(*roff)
> + lroff = _libgo_loff_t_type(*roff)
> plroff = &lroff
> }
> - var lwoff _loff_t
> - var plwoff *_loff_t
> + var lwoff _libgo_loff_t_type
> + var plwoff *_libgo_loff_t_type
> if woff != nil {
> - lwoff = _loff_t(*woff)
> + lwoff = _libgo_loff_t_type(*woff)
> plwoff = &lwoff
> }
> n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
> diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
> index 0c52ea5d71a..5aa309155c3 100755
> --- a/libgo/mksysinfo.sh
> +++ b/libgo/mksysinfo.sh
> @@ -403,11 +403,7 @@ fi
> # Some basic types.
> echo 'type Size_t _size_t' >> ${OUT}
> echo "type Ssize_t _ssize_t" >> ${OUT}
> -if grep '^const _HAVE_OFF64_T = ' gen-sysinfo.go > /dev/null 2>&1; then
> - echo "type Offset_t _off64_t" >> ${OUT}
> -else
> - echo "type Offset_t _off_t" >> ${OUT}
> -fi
> +echo "type Offset_t _libgo_off_t_type" >> ${OUT}
> echo "type Mode_t _mode_t" >> ${OUT}
> echo "type Pid_t _pid_t" >> ${OUT}
> echo "type Uid_t _uid_t" >> ${OUT}
> diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
> index 8ce061e2f5f..a4259c02ded 100644
> --- a/libgo/sysinfo.c
> +++ b/libgo/sysinfo.c
> @@ -357,6 +357,18 @@ enum {
> };
> #endif
>
> +#if defined(HAVE_LOFF_T)
> +// loff_t can be defined as a macro; for -fgo-dump-spec make sure we
> +// see a typedef.
> +typedef loff_t libgo_loff_t_type;
> +#endif
> +
> +#if defined(HAVE_OFF64_T)
> +typedef off64_t libgo_off_t_type;
> +#else
> +typedef off_t libgo_off_t_type;
> +#endif
> +
> // The following section introduces explicit references to types and
> // constants of interest to support bootstrapping libgo using a
> // compiler that doesn't support -fdump-go-spec (e.g., clang), via
> @@ -537,7 +549,8 @@ SREF(timex);
> // From sys/types.h
> TREF(pid_t);
> TREF(off_t);
> -TREF(loff_t);
> +TREF(libgo_loff_t_type);
> +TREF(libgo_off_t_type);
> TREF(size_t);
> TREF(ssize_t);
> TREF(mode_t);

Ian Lance Taylor

unread,
Jun 17, 2022, 5:27:30 PM6/17/22
to Sören Tempel, gcc-p...@gcc.gnu.org, gofront...@googlegroups.com
On Tue, May 31, 2022 at 12:41 PM Sören Tempel <soe...@soeren-tempel.net> wrote:
>
> PING.
>
> If there is anything else that needs to be addressed please let me know.

Thanks. Committed as follows. Sorry for the delay.

Ian
patch.txt

Andreas Schwab

unread,
Jun 18, 2022, 3:18:52 AM6/18/22
to Ian Lance Taylor via Gcc-patches, Sören Tempel, Ian Lance Taylor, gofront...@googlegroups.com
../../../libgo/go/syscall/libcall_linux.go:220:25: error: reference to undefined name '_libgo_loff_t_type'
220 | lroff = _libgo_loff_t_type(*roff)
| ^
../../../libgo/go/syscall/libcall_linux.go:226:25: error: reference to undefined name '_libgo_loff_t_type'
226 | lwoff = _libgo_loff_t_type(*woff)
| ^
../../../libgo/go/syscall/libcall_linux.go:217:19: error: use of undefined type '_libgo_loff_t_type'
217 | var lroff _libgo_loff_t_type
| ^
../../../libgo/go/syscall/libcall_linux.go:217:19: error: use of undefined type '_libgo_loff_t_type'
../../../libgo/go/syscall/libcall_linux.go:217:19: error: use of undefined type '_libgo_loff_t_type'
../../../libgo/go/syscall/libcall_linux.go:217:19: error: use of undefined type '_libgo_loff_t_type'
../../../libgo/go/syscall/libcall_linux.go:217:19: error: use of undefined type '_libgo_loff_t_type'
../../../libgo/go/syscall/libcall_linux.go:217:19: error: use of undefined type '_libgo_loff_t_type'
../../../libgo/go/syscall/libcall_linux.go:217:19: error: use of undefined type '_libgo_loff_t_type'
../../../libgo/go/syscall/libcall_linux.go:217:19: error: use of undefined type '_libgo_loff_t_type'
make[4]: *** [Makefile:3038: syscall.lo] Error 1

From config.log:

configure:15552: checking for loff_t
configure:15552: /opt/gcc/gcc-20220618/Build/./gcc/xgcc -B/opt/gcc/gcc-20220618/Build/./gcc/ -B/usr/aarch64-suse-linux/bin/ -B/usr/aarch64-suse-linux/lib/ -isystem /usr/aarch64-suse-linux/include -isystem /usr/aarch64-suse-linux/sys-include -c -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g conftest.c >&5
conftest.c: In function 'main':
conftest.c:104:13: error: 'loff_t' undeclared (first use in this function); did you mean 'off_t'?
104 | if (sizeof (loff_t))
| ^~~~~~
| off_t
conftest.c:104:13: note: each undeclared identifier is reported only once for each function it appears in
configure:15552: $? = 1

--
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."

Ian Lance Taylor

unread,
Jun 18, 2022, 11:28:51 AM6/18/22
to Andreas Schwab, Ian Lance Taylor via Gcc-patches, gofront...@googlegroups.com, Sören Tempel
What target?

What is the output of

grep loff_t TARGET/libgo/gen-sysinfo.go

?

Thanks.

Ian

Andreas Schwab

unread,
Jun 18, 2022, 11:59:25 AM6/18/22
to Ian Lance Taylor, Ian Lance Taylor via Gcc-patches, gofront...@googlegroups.com, Sören Tempel
On Jun 18 2022, Ian Lance Taylor wrote:

> What target?

aarch64-suse-linux, of course.

> What is the output of
>
> grep loff_t TARGET/libgo/gen-sysinfo.go

type ___loff_t int64
type _loff_t int64
type ___kernel_loff_t int64

Eric Botcazou

unread,
Jun 20, 2022, 3:39:17 AM6/20/22
to Andreas Schwab, Ian Lance Taylor, gcc-p...@gcc.gnu.org, Sören Tempel, gofront...@googlegroups.com
> aarch64-suse-linux, of course.

Likewise on x86_64-suse-linux.

> > What is the output of
> >
> > grep loff_t TARGET/libgo/gen-sysinfo.go
>
> type ___loff_t int64
> type _loff_t int64
> type ___kernel_loff_t int64

Ditto.

--
Eric Botcazou


Sören Tempel

unread,
Jun 21, 2022, 3:34:45 AM6/21/22
to Eric Botcazou, Andreas Schwab, Ian Lance Taylor, gcc-p...@gcc.gnu.org, gofront...@googlegroups.com
Hi,

The problem is: glibc defines loff_t in sys/types.h, not fcntl.h (where musl
defines it). I falsely assumed that the newly committed AC_CHECK_TYPES
invocation would include fcntl.h *in addition to* AC_INCLUDES_DEFAULT.
However, as it turns out specifying includes for AC_CHECK_TYPES overwrites the
default instead of appending to it.

The patch below should fix this by appending to AC_INCLUDES_DEFAULT explicitly.
Alternatively, we could try to add fcntl.h to AC_INCLUDES_DEFAULT, though my
autotools knowledge is severely limited and hence I am not sure how this would
be achieved.

diff --git a/libgo/configure b/libgo/configure
index b7ff9b3..273af1d 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -15549,8 +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" "
+$ac_includes_default
+#include <fcntl.h>
+ "
if test "x$ac_cv_type_loff_t" = xyes; then :

cat >>confdefs.h <<_ACEOF
diff --git a/libgo/configure.ac b/libgo/configure.ac
index bac58b0..b237392 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -604,7 +604,9 @@ AC_TYPE_OFF_T

CFLAGS_hold="$CFLAGS"
CFLAGS="$OSCFLAGS $CFLAGS"
-AC_CHECK_TYPES([loff_t], [], [], [[#include <fcntl.h>]])
+AC_CHECK_TYPES([loff_t], [], [], [
+AC_INCLUDES_DEFAULT
+#include <fcntl.h>])
CFLAGS="$CFLAGS_hold"

LIBS_hold="$LIBS"

Franz Sirl

unread,
Jun 21, 2022, 11:02:50 AM6/21/22
to Sören Tempel, Eric Botcazou, gcc-p...@gcc.gnu.org, Andreas Schwab, Ian Lance Taylor, gofront...@googlegroups.com
Hi,

the patch restores bootstrap for me on x86_64-suse-linux.

Franz.

Ian Lance Taylor

unread,
Jun 21, 2022, 11:03:46 AM6/21/22
to Andreas Schwab, Sören Tempel, Ian Lance Taylor via Gcc-patches, gofront...@googlegroups.com
On Sat, Jun 18, 2022 at 8:59 AM Andreas Schwab <sch...@linux-m68k.org> wrote:
>
> On Jun 18 2022, Ian Lance Taylor wrote:
>
> > What target?
>
> aarch64-suse-linux, of course.

Thanks. Sorry for missing that.


> > What is the output of
> >
> > grep loff_t TARGET/libgo/gen-sysinfo.go
>
> type ___loff_t int64
> type _loff_t int64
> type ___kernel_loff_t int64

Hmmm, it does work as expected on gcc114 in the GCC compile farm,
which seems to be Linux 3.13 and glibc 4.8.4. On that system I see

> grep loff_t aarch64-unknown-linux-gnu/libgo/gen-sysinfo.go
type ___loff_t int64
type _loff_t int64
type ___kernel_loff_t int64
type _libgo_loff_t_type int64

Still, I may see the problem. I've committed this patch that should fix it.

Ian
patch.txt

Andreas Schwab

unread,
Jun 21, 2022, 11:16:12 AM6/21/22
to Ian Lance Taylor via Gcc-patches, Ian Lance Taylor, gofront...@googlegroups.com, Sören Tempel
On Jun 21 2022, Ian Lance Taylor via Gcc-patches wrote:

> which seems to be Linux 3.13 and glibc 4.8.4. On that system I see

That's stone age.

Ian Lance Taylor

unread,
Jun 21, 2022, 12:53:21 PM6/21/22
to Andreas Schwab, Ian Lance Taylor via Gcc-patches, Sören Tempel, gofront...@googlegroups.com
On Tue, Jun 21, 2022 at 8:16 AM Andreas Schwab <sch...@linux-m68k.org> wrote:
>
> On Jun 21 2022, Ian Lance Taylor via Gcc-patches wrote:
>
> > which seems to be Linux 3.13 and glibc 4.8.4. On that system I see
>
> That's stone age.

I don't know who maintains these systems on the GCC compile farm.

Ian
Reply all
Reply to author
Forward
0 new messages