musl: merge changes from git, includes further getopt fixes

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43939

1 files changed, 0 insertions, 20 deletions

diff --git a/toolchain/musl/patches/110-getopt_optional_argument_fix.patch b/toolchain/musl/patches/110-getopt_optional_argument_fix.patch
deleted file mode 100644
index 7deebdc251..0000000000
--- a/toolchain/musl/patches/110-getopt_optional_argument_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/misc/getopt.c
-+++ b/src/misc/getopt.c
-@@ -55,7 +55,9 @@ int getopt(int argc, char * const argv[]
- 		return '?';
- 	}
- 	if (optstring[i+1] == ':') {
-+		if (optstring[i+2] == ':') optarg = 0;
- 		if (optind >= argc) {
-+			if (optstring[i+2] == ':') return c;
- 			if (optstring[0] == ':') return ':';
- 			if (opterr) {
- 				write(2, argv[0], strlen(argv[0]));
-@@ -65,7 +67,6 @@ int getopt(int argc, char * const argv[]
- 			}
- 			return '?';
- 		}
--		if (optstring[i+2] == ':') optarg = 0;
- 		if (optstring[i+2] != ':' || optpos) {
- 			optarg = argv[optind++] + optpos;
- 			optpos = 0;