blob: 61c552e2636aad55b5ac012c6c5ab71657d3ac70 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From f35d65517a59565758107c5b1a51a5fa382f8d1a Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Tue, 12 Jul 2022 19:42:43 -0700
Subject: [PATCH] libgo: don't include <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.
Fixes PR go/106266
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/417294
---
gcc/go/gofrontend/MERGE | 2 +-
libgo/sysinfo.c | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
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 @@
-70ca85f08edf63f46c87d540fa99c45e2903edc2
+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
--
2.31.1
|
