Skip to contentSkip to conversation

package/micropython: remove unneeded patch

PATCH New Fabrice Fontaine 2 participants 2 messages Sep 3, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/micropython: remove unneeded patch

Remove patch which is already in version

Fixes:
- http://autobuild.buildroot.org/results/01da2ad39ea01c522fc5b431c4544bd91f58ac4a

---
 ..._vsnprintf-alias-for-gcc-9-and-above.patch | 32 -------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 package/micropython/0002-lib-utils-printf-Exclude-__GI_vsnprintf-alias-for-gcc-9-and-above.patch
package/micropython/0002-lib-utils-printf-Exclude-__GI_vsnprintf-alias-for-gcc-9-and-above.patch deleted +0 -32
deleted file mode 100644
index 161d97e5b9..0000000000
@@ -1,32 +0,0 @@
-From 7bbde67cb2dc52c04bd7020689a1227bddfa1b06 Mon Sep 17 00:00:00 2001
-From: Damien George <[email protected]>
-Date: Wed, 6 Feb 2019 01:12:51 +1100
-Subject: [PATCH] lib/utils/printf: Exclude __GI_vsnprintf alias for gcc 9 and
- above.
-
-See issue #4457.
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Retrieved from:
-https://github.com/micropython/micropython/commit/7bbde67cb2dc52c04bd7020689a1227bddfa1b06]
----
- lib/utils/printf.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/utils/printf.c b/lib/utils/printf.c
-index 1ceeea39ff..0c21fc4c0a 100644
---- a/lib/utils/printf.c
-+++ b/lib/utils/printf.c
-@@ -99,9 +99,11 @@ STATIC void strn_print_strn(void *data, const char *str, size_t len) {
-     strn_print_env->remain -= len;
- }
- 
--#if defined(__GNUC__) && !defined(__clang__)
-+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 9
- // uClibc requires this alias to be defined, or there may be link errors
- // when linkings against it statically.
-+// GCC 9 gives a warning about missing attributes so it's excluded until
-+// uClibc+GCC9 support is needed.
- int __GI_vsnprintf(char *str, size_t size, const char *fmt, va_list ap) __attribute__((weak, alias ("vsnprintf")));
- #endif
- 
Signature · 1 line
2.23.0.rc1