Attachment 176064 Details for Bug 209457 – armv6 fix

[patch] armv6 fix

shells_ksh93.patch (text/plain), 2.34 KB, created by Mikael Urankar on 2016-10-22 16:35:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2016-10-22 16:35:56 UTC

Size: 2.34 KB

patch

obsolete

>Index: files/patch-src-lib-libast-hash-hashalloc.c
>===================================================================
>--- files/patch-src-lib-libast-hash-hashalloc.c	(revision 424477)
>+++ files/patch-src-lib-libast-hash-hashalloc.c	(working copy)
>@@ -1,20 +1,19 @@
>---- src/lib/libast/hash/hashalloc.c.orig	2013-12-28 22:09:43.000000000 +0100
>-+++ src/lib/libast/hash/hashalloc.c	2013-12-28 22:43:14.000000000 +0100
>-@@ -49,6 +49,7 @@
>- 	va_list*		vp = va;
>- 	Hash_region_f		region = 0;
>- 	void*			handle;
>-+	va_listarg		tmpval;
>- 
>- 	va_start(ap, ref);
>- 
>-@@ -151,7 +152,8 @@
>+--- src/lib/libast/hash/hashalloc.c.orig	2006-11-07 UTC
>++++ src/lib/libast/hash/hashalloc.c
>+@@ -151,7 +151,16 @@ hashalloc(Hash_table_t* ref, ...)
>  				va_copy(*vp, ap);
>  				vp++;
>  			}
>--			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
>-+			tmpval = va_listval(va_arg(ap, va_listarg));
>-+			va_copy(ap, tmpval);
>++#if __clang__ && __SIZEOF_POINTER__ == 4
>++			{
>++				va_list		np;
>++
>++				np = va_listval(va_arg(ap, va_listarg));
>++				va_copy(ap, np);
>++			}
>++#else
>+ 			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
>++#endif
>  			break;
>  		case 0:
>  			if (vp > va)
>Index: files/patch-src-lib-libast-string-tokscan.c
>===================================================================
>--- files/patch-src-lib-libast-string-tokscan.c	(revision 424477)
>+++ files/patch-src-lib-libast-string-tokscan.c	(working copy)
>@@ -1,20 +1,19 @@
>---- ./src/lib/libast/string/tokscan.c.orig	2013-12-28 22:16:20.000000000 +0100
>-+++ ./src/lib/libast/string/tokscan.c	2013-12-28 22:43:28.000000000 +0100
>-@@ -188,6 +188,7 @@
>- 	char**		p_string;
>- 	char*		prv_f = 0;
>- 	va_list		prv_ap;
>-+	va_listarg	tmpval;
>- 
>- 	va_start(ap, fmt);
>- 	if (!*s || *s == '\n')
>-@@ -233,7 +234,8 @@
>+--- src/lib/libast/string/tokscan.c.orig	2006-11-07 UTC
>++++ src/lib/libast/string/tokscan.c
>+@@ -233,7 +233,16 @@ tokscan(register char* s, char** nxt, co
>  			prv_f = f;
>  			f = va_arg(ap, char*);
>  			va_copy(prv_ap, ap);
>--			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
>-+			tmpval = va_listval(va_arg(ap, va_listarg));
>-+			va_copy(ap, tmpval);
>++#if __clang__ && __SIZEOF_POINTER__ == 4
>++			{
>++				va_list		np;
>++
>++				np = va_listval(va_arg(ap, va_listarg));
>++				va_copy(ap, np);
>++			}
>++#else
>+ 			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
>++#endif
>  			continue;
>  		case 'c':
>  			p_char = va_arg(ap, char*);

Actions: View | Diff

Attachments on bug 209457: 170219 | 170234 | 176064