diff options
author | Kuan-Yi Li <kyli@abysm.org> | 2021-09-17 14:27:47 +0800 |
---|---|---|
committer | Stijn Tintel <stijn@linux-ipv6.be> | 2021-09-21 21:07:55 +0300 |
commit | b62a4cfc9330e9631a372a11fa9e09ac809080f5 (patch) | |
tree | 906ee44926c39f2088e66a3cdf164a6787839465 /package/network/utils/layerscape/restool/patches/0001-restool-fix-get_device_file-function.patch | |
parent | 17d19a7d4398789ae8da3daf8e0db167d58b0782 (diff) | |
download | upstream-b62a4cfc9330e9631a372a11fa9e09ac809080f5.tar.gz upstream-b62a4cfc9330e9631a372a11fa9e09ac809080f5.tar.bz2 upstream-b62a4cfc9330e9631a372a11fa9e09ac809080f5.zip |
restool: fix compilation with GCC 10
GCC 10 defaults to `-fno-common` and complains about multiple definition
of `mc_status` in restool.
Backport a patch from upstream to fix compilation with host GCC 10.
Signed-off-by: Kuan-Yi Li <kyli@abysm.org>
Diffstat (limited to 'package/network/utils/layerscape/restool/patches/0001-restool-fix-get_device_file-function.patch')
-rw-r--r-- | package/network/utils/layerscape/restool/patches/0001-restool-fix-get_device_file-function.patch | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/package/network/utils/layerscape/restool/patches/0001-restool-fix-get_device_file-function.patch b/package/network/utils/layerscape/restool/patches/0001-restool-fix-get_device_file-function.patch index 2745fd02a0..65d381cbc5 100644 --- a/package/network/utils/layerscape/restool/patches/0001-restool-fix-get_device_file-function.patch +++ b/package/network/utils/layerscape/restool/patches/0001-restool-fix-get_device_file-function.patch @@ -16,11 +16,9 @@ Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com> restool.c | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) -diff --git a/restool.c b/restool.c -index 7553659..78fd1bf 100644 --- a/restool.c +++ b/restool.c -@@ -1185,8 +1185,13 @@ out: +@@ -1193,8 +1193,13 @@ out: static int get_device_file(void) { @@ -34,7 +32,7 @@ index 7553659..78fd1bf 100644 memset(restool.device_file, '\0', DEV_FILE_SIZE); -@@ -1214,10 +1219,6 @@ static int get_device_file(void) +@@ -1222,10 +1227,6 @@ static int get_device_file(void) goto out; } } else { @@ -45,7 +43,7 @@ index 7553659..78fd1bf 100644 d = opendir("/dev"); if (!d) { -@@ -1227,26 +1228,34 @@ static int get_device_file(void) +@@ -1235,26 +1236,34 @@ static int get_device_file(void) } while ((dir = readdir(d)) != NULL) { if (strncmp(dir->d_name, "dprc.", 5) == 0) { @@ -92,7 +90,7 @@ index 7553659..78fd1bf 100644 } else { error = -1; if (num_dev_files == 0) -@@ -1255,6 +1264,9 @@ static int get_device_file(void) +@@ -1263,6 +1272,9 @@ static int get_device_file(void) ERROR_PRINTF("error: multiple root containers\n"); } } @@ -102,6 +100,3 @@ index 7553659..78fd1bf 100644 out: return error; } --- -2.17.1 - |