[src/trunk]: src/bin/ksh kill gcc-4.5 hack.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6fb803da9623
branches:  trunk
changeset: 768301:6fb803da9623
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Aug 14 10:40:25 2011 +0000

description:
kill gcc-4.5 hack.

diffstat:

 bin/ksh/Makefile |   7 +------
 bin/ksh/eval.c   |  11 +++++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diffs (67 lines):

diff -r aef943b80613 -r 6fb803da9623 bin/ksh/Makefile
--- a/bin/ksh/Makefile  Sun Aug 14 09:38:05 2011 +0000
+++ b/bin/ksh/Makefile  Sun Aug 14 10:40:25 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.28 2011/06/22 02:49:41 mrg Exp $
+#      $NetBSD: Makefile,v 1.29 2011/08/14 10:40:25 christos Exp $
 
 WARNS=3
 
@@ -50,8 +50,3 @@
 CWARNFLAGS.clang+=     -Wno-format-security
 
 .include <bsd.prog.mk>
-
-# XXX
-.if ${HAVE_GCC} == 45
-COPTS.eval.c+= -Wno-error
-.endif
diff -r aef943b80613 -r 6fb803da9623 bin/ksh/eval.c
--- a/bin/ksh/eval.c    Sun Aug 14 09:38:05 2011 +0000
+++ b/bin/ksh/eval.c    Sun Aug 14 10:40:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eval.c,v 1.12 2009/11/24 16:00:42 seanb Exp $  */
+/*     $NetBSD: eval.c,v 1.13 2011/08/14 10:40:25 christos Exp $       */
 
 /*
  * Expansion - quoting, separation, substitution, globbing
@@ -6,7 +6,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: eval.c,v 1.12 2009/11/24 16:00:42 seanb Exp $");
+__RCSID("$NetBSD: eval.c,v 1.13 2011/08/14 10:40:25 christos Exp $");
 #endif
 
 
@@ -185,6 +185,7 @@
 
        x.split = 0;    /* XXX gcc */
        x.str = NULL;   /* XXX gcc */
+       x.u.strv = NULL;/* XXX gcc */
        if (cp == NULL)
                internal_errorf(1, "expand(NULL)");
        /* for alias, readonly, set, typeset commands */
@@ -714,7 +715,7 @@
        if (sp[0] == '\0')      /* Bad variable name */
                return -1;
 
-       xp->var = (struct tbl *) 0;
+       xp->var = NULL;
 
        /* ${#var}, string length or array size */
        if (sp[0] == '#' && (c = sp[1]) != '\0') {
@@ -785,10 +786,12 @@
                        return -1;
                }
                if (e->loc->argc == 0) {
+                       xp->u.strv = NULL;
                        xp->str = null;
                        state = c == '@' ? XNULLSUB : XSUB;
                } else {
-                       xp->u.strv = (const char **) e->loc->argv + 1;
+                       char **t = &e->loc->argv[1];
+                       xp->u.strv = (void *)(uintptr_t)t;
                        xp->str = *xp->u.strv++;
                        xp->split = c == '@'; /* $@ */
                        state = XARG;