Don't wrap initialized variables: binutils appears to be mishandling them

on arm and m88k

problems with optind observed by jsg@

7 files changed, 20 insertions, 8 deletions

diff --git a/lib/libc/hidden/ctype.h b/lib/libc/hidden/ctype.h
index 3f6efc7e5d5..8d8bda65eb0 100644
--- a/lib/libc/hidden/ctype.h
+++ b/lib/libc/hidden/ctype.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ctype.h,v 1.1 2015/09/13 11:38:08 guenther Exp $	*/
+/*	$OpenBSD: ctype.h,v 1.2 2015/09/19 04:02:21 guenther Exp $	*/
 /*
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
  *
@@ -20,9 +20,11 @@
 
 #include_next <ctype.h>
 
+#if 0
 extern PROTO_NORMAL(_ctype_);
 extern PROTO_NORMAL(_tolower_tab_);
 extern PROTO_NORMAL(_toupper_tab_);
+#endif
 
 PROTO_NORMAL(isalnum);
 PROTO_NORMAL(isalpha);
diff --git a/lib/libc/hidden/errno.h b/lib/libc/hidden/errno.h
index 7af2858746f..d54317ff4c9 100644
--- a/lib/libc/hidden/errno.h
+++ b/lib/libc/hidden/errno.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: errno.h,v 1.2 2015/09/10 18:13:46 guenther Exp $	*/
+/*	$OpenBSD: errno.h,v 1.3 2015/09/19 04:02:21 guenther Exp $	*/
 /*
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
  *
@@ -26,8 +26,10 @@
 extern const int sys_nerr;
 extern const char *const sys_errlist[];
 
+#if 0
 extern PROTO_NORMAL(sys_nerr);
 extern PROTO_NORMAL(sys_errlist);
+#endif
 
 /*PROTO_OVERRIDABLE(__errno);*/
 
diff --git a/lib/libc/hidden/getopt.h b/lib/libc/hidden/getopt.h
index 167af2db749..69bbe9244fc 100644
--- a/lib/libc/hidden/getopt.h
+++ b/lib/libc/hidden/getopt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getopt.h,v 1.1 2015/09/12 14:48:14 guenther Exp $	*/
+/*	$OpenBSD: getopt.h,v 1.2 2015/09/19 04:02:21 guenther Exp $	*/
 /*
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
  *
@@ -20,11 +20,11 @@
 
 #include_next <getopt.h>
 
+#if 0
 extern PROTO_NORMAL(opterr);
 extern PROTO_NORMAL(optind);
 extern PROTO_NORMAL(optopt);
 
-#if 0
 /* alas, COMMON symbols alias differently */
 extern PROTO_NORMAL(optarg);
 extern PROTO_NORMAL(optreset);
diff --git a/lib/libc/hidden/signal.h b/lib/libc/hidden/signal.h
index 78222d449cf..53b4998f9d9 100644
--- a/lib/libc/hidden/signal.h
+++ b/lib/libc/hidden/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.6 2015/09/13 07:36:58 guenther Exp $	*/
+/*	$OpenBSD: signal.h,v 1.7 2015/09/19 04:02:21 guenther Exp $	*/
 /*
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
  *
@@ -24,8 +24,10 @@ __BEGIN_HIDDEN_DECLS
 extern sigset_t __sigintr;
 __END_HIDDEN_DECLS
 
+#if 0
 extern PROTO_NORMAL(sys_siglist);
 extern PROTO_NORMAL(sys_signame);
+#endif
 
 PROTO_DEPRECATED(bsd_signal);
 PROTO_NORMAL(kill);             /* wrap to ban SIGTHR? */
diff --git a/lib/libc/hidden/stdio.h b/lib/libc/hidden/stdio.h
index 4d589438836..5d33bd3b98c 100644
--- a/lib/libc/hidden/stdio.h
+++ b/lib/libc/hidden/stdio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdio.h,v 1.4 2015/09/11 15:38:33 guenther Exp $	*/
+/*	$OpenBSD: stdio.h,v 1.5 2015/09/19 04:02:21 guenther Exp $	*/
 /*
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
  *
@@ -30,8 +30,10 @@ __END_HIDDEN_DECLS
 extern const int sys_nerr;
 extern const char *const sys_errlist[];
 
+#if 0
 extern PROTO_NORMAL(sys_nerr);
 extern PROTO_NORMAL(sys_errlist);
+#endif
 
 PROTO_NORMAL(__srget);
 PROTO_NORMAL(__swbuf);
diff --git a/lib/libc/hidden/stdlib.h b/lib/libc/hidden/stdlib.h
index 3b63f4004ae..9d0e771f4bb 100644
--- a/lib/libc/hidden/stdlib.h
+++ b/lib/libc/hidden/stdlib.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdlib.h,v 1.3 2015/09/13 20:29:23 guenther Exp $	*/
+/*	$OpenBSD: stdlib.h,v 1.4 2015/09/19 04:02:21 guenther Exp $	*/
 /*	$NetBSD: stdlib.h,v 1.25 1995/12/27 21:19:08 jtc Exp $	*/
 
 /*-
@@ -41,8 +41,10 @@ __BEGIN_HIDDEN_DECLS
 char	*__findenv(const char *, int, int *);
 __END_HIDDEN_DECLS
 
+#if 0
 extern PROTO_NORMAL(__mb_cur_max);
 /*extern PROTO_NORMAL(suboptarg);*/
+#endif
 
 PROTO_STD_DEPRECATED(_Exit);
 PROTO_DEPRECATED(a64l);
diff --git a/lib/libc/hidden/time.h b/lib/libc/hidden/time.h
index 188f40c8a60..ec118c393ac 100644
--- a/lib/libc/hidden/time.h
+++ b/lib/libc/hidden/time.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: time.h,v 1.2 2015/09/12 14:35:40 guenther Exp $	*/
+/*	$OpenBSD: time.h,v 1.3 2015/09/19 04:02:21 guenther Exp $	*/
 /*
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
  *
@@ -20,7 +20,9 @@
 
 #include_next <time.h>
 
+#if 0
 extern PROTO_NORMAL(tzname);
+#endif
 
 PROTO_NORMAL(asctime);
 PROTO_NORMAL(asctime_r);