diff mbox series

libgo patch committed: Don't include <linux/fs.h> in sysinfo.c

Message ID CAOyqgcW0t4VwknycqfDkAnH_LBdFCzxS7Nn_-5vK5oQ3YAiRbA@mail.gmail.com
State New
Headers show
Series libgo patch committed: Don't include <linux/fs.h> in sysinfo.c | expand

Commit Message

Ian Lance Taylor July 13, 2022, 4:02 p.m. UTC 
This libgo patch stops including <linux/fs.h> when building
gen-sysinfo.go.  Removing this doesn't change anything at least with
glibc 2.33.  The include was added in https://go.dev/cl/6100049 but
it's not clear why.  This should fix GCC PR 106266.  Bootstrapped and
ran Go testsuite on x86_64-pc-linux-gnu.  Committed to mainline.

Ian
9b487dbc298242fdde127e7827e728545c308aac

Comments

Richard Biener July 21, 2022, 10:19 a.m. UTC | #1 
On Wed, Jul 13, 2022 at 6:03 PM Ian Lance Taylor via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
> This libgo patch stops including <linux/fs.h> when building
> gen-sysinfo.go.  Removing this doesn't change anything at least with
> glibc 2.33.  The include was added in https://go.dev/cl/6100049 but
> it's not clear why.  This should fix GCC PR 106266.  Bootstrapped and
> ran Go testsuite on x86_64-pc-linux-gnu.  Committed to mainline.

Btw, active branches are affected the same way - can you please backport?

> Ian
Martin Liška July 21, 2022, 11:52 a.m. UTC | #2 
On 7/21/22 12:19, Richard Biener via Gcc-patches wrote:
> On Wed, Jul 13, 2022 at 6:03 PM Ian Lance Taylor via Gcc-patches
> <gcc-patches@gcc.gnu.org> wrote:
>>
>> This libgo patch stops including <linux/fs.h> when building
>> gen-sysinfo.go.  Removing this doesn't change anything at least with
>> glibc 2.33.  The include was added in https://go.dev/cl/6100049 but
>> it's not clear why.  This should fix GCC PR 106266.  Bootstrapped and
>> ran Go testsuite on x86_64-pc-linux-gnu.  Committed to mainline.
> 
> Btw, active branches are affected the same way - can you please backport?

I've just done that.

Martin

> 
>> Ian
Ian Lance Taylor July 21, 2022, 6:54 p.m. UTC | #3 
On Thu, Jul 21, 2022 at 4:53 AM Martin Liška <mliska@suse.cz> wrote:
>
> On 7/21/22 12:19, Richard Biener via Gcc-patches wrote:
> > On Wed, Jul 13, 2022 at 6:03 PM Ian Lance Taylor via Gcc-patches
> > <gcc-patches@gcc.gnu.org> wrote:
> >>
> >> This libgo patch stops including <linux/fs.h> when building
> >> gen-sysinfo.go.  Removing this doesn't change anything at least with
> >> glibc 2.33.  The include was added in https://go.dev/cl/6100049 but
> >> it's not clear why.  This should fix GCC PR 106266.  Bootstrapped and
> >> ran Go testsuite on x86_64-pc-linux-gnu.  Committed to mainline.
> >
> > Btw, active branches are affected the same way - can you please backport?
>
> I've just done that.

Thanks.

Ian
diff mbox series

Patch

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 7c5c45672d7..5ea0406cd8e 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@ 
-d295a0a2c96c0f7c3abd94fea3aa4e2303bf2af2
+ff68b1a147eb60082fd60c198db0ef5477ade938
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
index a4259c02ded..fc0210992fa 100644
--- a/libgo/sysinfo.c
+++ b/libgo/sysinfo.c
@@ -158,9 +158,6 @@ 
 #if defined(HAVE_LINUX_ETHER_H)
 #include <linux/ether.h>
 #endif
-#if defined(HAVE_LINUX_FS_H)
-#include <linux/fs.h>
-#endif
 #if defined(HAVE_LINUX_REBOOT_H)
 #include <linux/reboot.h>
 #endif