mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-10-01 06:21:56 -09:00
package/uqmi: update patch for fix compile error (gcc false error reporting)
Update the patch to to avoid gcc false error reporting (apply pragma ignored
only for gcc >= 12.x (as the warning '-Wdangling-pointer' was introduced
with gcc-12.x).
Fixes:
- http://autobuild.buildroot.net/results/df380f921b74527b77290a658de0c57680083afa
.../build/uqmi-0a19b5b77140465c29e2afa7d611fe93abc9672f/dev.c:213:32: error: unknown option after '#pragma GCC diagnostic' kind [-Werror=pragmas]
213 | #pragma GCC diagnostic ignored "-Wdangling-pointer"
| ^~~~~~~~~~~~~~~~~~~~
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 6219046db6)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
committed by
Peter Korsgaard
parent
91059234f4
commit
0399011fa8
@@ -1,10 +1,10 @@
|
|||||||
From 4c2eb926efb4de24af5a3b1e8c18195198827491 Mon Sep 17 00:00:00 2001
|
From 63ab887be90c7fe37d537ea75e60eb95d6d87d3f Mon Sep 17 00:00:00 2001
|
||||||
From: Peter Seiderer <ps.report@gmx.net>
|
From: Peter Seiderer <ps.report@gmx.net>
|
||||||
Date: Sun, 5 Mar 2023 22:08:13 +0100
|
Date: Sun, 5 Mar 2023 22:08:13 +0100
|
||||||
Subject: [PATCH] uqmi: avoid gcc false error reporting (storing the address of
|
Subject: [PATCH] uqmi: avoid gcc-12.x false error reporting (storing the
|
||||||
local variable 'complete' in '*req.complete')
|
address of local variable 'complete' in '*req.complete')
|
||||||
|
|
||||||
Avoid gcc false error reporting (req->complete is later reset to NULL
|
Avoid gcc-12.x false error reporting (req->complete is later reset to NULL
|
||||||
in case of use of local complete):
|
in case of use of local complete):
|
||||||
|
|
||||||
dev.c:217:23: error: storing the address of local variable 'complete' in '*req.complete' [-Werror=dangling-pointer=]
|
dev.c:217:23: error: storing the address of local variable 'complete' in '*req.complete' [-Werror=dangling-pointer=]
|
||||||
@@ -12,27 +12,30 @@ in case of use of local complete):
|
|||||||
| ~~~~~~~~~~~~~~^~~~~~~~~~~
|
| ~~~~~~~~~~~~~~^~~~~~~~~~~
|
||||||
|
|
||||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||||
|
[Upstream: http://lists.openwrt.org/pipermail/openwrt-devel/2023-March/040667.html]
|
||||||
[Upstream: http://lists.openwrt.org/pipermail/openwrt-devel/2023-March/040633.html]
|
|
||||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||||
|
---
|
||||||
|
Changes v1 -> v2:
|
||||||
|
- apply pragma ignored only for gcc >= 12.x (as the warning
|
||||||
|
'-Wdangling-pointer' was introduced with gcc-12.x)
|
||||||
---
|
---
|
||||||
dev.c | 12 ++++++++++++
|
dev.c | 12 ++++++++++++
|
||||||
1 file changed, 12 insertions(+)
|
1 file changed, 12 insertions(+)
|
||||||
|
|
||||||
diff --git a/dev.c b/dev.c
|
diff --git a/dev.c b/dev.c
|
||||||
index bd10207..b8ac273 100644
|
index bd10207..dbd42d4 100644
|
||||||
--- a/dev.c
|
--- a/dev.c
|
||||||
+++ b/dev.c
|
+++ b/dev.c
|
||||||
@@ -203,6 +203,15 @@ void qmi_request_cancel(struct qmi_dev *qmi, struct qmi_request *req)
|
@@ -203,6 +203,15 @@ void qmi_request_cancel(struct qmi_dev *qmi, struct qmi_request *req)
|
||||||
__qmi_request_complete(qmi, req, NULL);
|
__qmi_request_complete(qmi, req, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
+/* avoid gcc false error reporting:
|
+/* avoid gcc-12.x false error reporting:
|
||||||
+ * dev.c:217:23: error: storing the address of local variable ‘complete’ in ‘*req.complete’ [-Werror=dangling-pointer=]
|
+ * dev.c:217:23: error: storing the address of local variable ‘complete’ in ‘*req.complete’ [-Werror=dangling-pointer=]
|
||||||
+ * 217 | req->complete = &complete;
|
+ * 217 | req->complete = &complete;
|
||||||
+ * | ~~~~~~~~~~~~~~^~~~~~~~~~~
|
+ * | ~~~~~~~~~~~~~~^~~~~~~~~~~
|
||||||
+ */
|
+ */
|
||||||
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
+#if __GNUC__ >= 12
|
||||||
+#pragma GCC diagnostic push
|
+#pragma GCC diagnostic push
|
||||||
+#pragma GCC diagnostic ignored "-Wdangling-pointer"
|
+#pragma GCC diagnostic ignored "-Wdangling-pointer"
|
||||||
+#endif
|
+#endif
|
||||||
@@ -43,7 +46,7 @@ index bd10207..b8ac273 100644
|
|||||||
|
|
||||||
return req->ret;
|
return req->ret;
|
||||||
}
|
}
|
||||||
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
+#if __GNUC__ >= 12
|
||||||
+#pragma GCC diagnostic pop
|
+#pragma GCC diagnostic pop
|
||||||
+#endif
|
+#endif
|
||||||
|
|
||||||
Reference in New Issue
Block a user