clang: fix bug in panic code.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>

sys/include/libc.h

@@ -762,7 +762,7 @@ extern char *argv0;
 #define	ARGF()		(_argt=_args, _args="",\
 				(*_argt? _argt: argv[1]? (argc--, *++argv): 0))
 #define	EARGF(x)	(_argt=_args, _args="",\
-				(*_argt? _argt: argv[1]? (argc--, *++argv): ((x), abort(), (char*)0)))
+				(*_argt? _argt: argv[1]? (argc--, *++argv): ((x), argc = *(volatile int*)0, (char*)0)))
 
 #define	ARGC()		_argc
 

sys/src/libc/port/strtoll.c

@@ -14,11 +14,7 @@
 #define VLONG_MIN	(1LL<<63)
 
 int64_t
-<<<<<<< HEAD
-strtoll(char *nptr, char **endptr, int base)
-=======
 strtoll(const char *nptr, char **endptr, int base)
->>>>>>> 064e99309... Changed strto[l|ul|ull] functions to have correct signature
 {
 	char *p;
 	int64_t n, nn, m;

sys/src/libc/port/strtoul.c

@@ -13,11 +13,7 @@
 #define ULONG_MAX	4294967295UL
 
 uint32_t
-<<<<<<< HEAD
-strtoul(char *nptr, char **endptr, int base)
-=======
 strtoul(const char *nptr, char **endptr, int base)
->>>>>>> 064e99309... Changed strto[l|ul|ull] functions to have correct signature
 {
 	char *p;
 	uint32_t n, nn, m;