[src/trunk]: src/external/cddl/osnet/dist/lib/libdtrace Fix dtrace build for ...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/04470904aee9
branches:  trunk
changeset: 336251:04470904aee9
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Sat Feb 21 15:13:20 2015 +0000

description:
Fix dtrace build for arm with gcc 4.8

diffstat:

 external/cddl/osnet/dist/lib/libdtrace/arm/dt_isadep.c     |   2 --
 external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c |   2 ++
 external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c  |  11 +++++------
 external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c  |   2 ++
 4 files changed, 9 insertions(+), 8 deletions(-)

diffs (66 lines):

diff -r 905a0d098d8c -r 04470904aee9 external/cddl/osnet/dist/lib/libdtrace/arm/dt_isadep.c
--- a/external/cddl/osnet/dist/lib/libdtrace/arm/dt_isadep.c    Sat Feb 21 15:00:30 2015 +0000
+++ b/external/cddl/osnet/dist/lib/libdtrace/arm/dt_isadep.c    Sat Feb 21 15:13:20 2015 +0000
@@ -75,8 +75,6 @@
 {
 
        uint32_t *text;
-       int i;
-       int srdepth = 0;
 
        dt_dprintf("%s: unimplemented\n", __func__);
        return (DT_PROC_ERR);
diff -r 905a0d098d8c -r 04470904aee9 external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c
--- a/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c        Sat Feb 21 15:00:30 2015 +0000
+++ b/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c        Sat Feb 21 15:13:20 2015 +0000
@@ -2187,6 +2187,8 @@
                                case DTRACEACT_FREOPEN:
                                        func = dtrace_freopen;
                                        break;
+                               default: /* XXX gcc 4.8 */
+                                       assert(0);
                                }
 
                                n = (*func)(dtp, fp, fmtdata, &data,
diff -r 905a0d098d8c -r 04470904aee9 external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c
--- a/external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c Sat Feb 21 15:00:30 2015 +0000
+++ b/external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c Sat Feb 21 15:13:20 2015 +0000
@@ -1039,10 +1039,12 @@
         * then resolve the referenced type as well (assuming the base type
         * is CTF_K_POINTER or CTF_K_ARRAY).  Otherwise [lr]ref = CTF_ERR.
         */
+       lbase = ctf_type_resolve(lfp, lp->dn_type);
+       lkind = ctf_type_kind(lfp, lbase);
+       rbase = ctf_type_resolve(rfp, rp->dn_type);
+       rkind = ctf_type_kind(rfp, rbase);
+
        if (!lp_is_int) {
-               lbase = ctf_type_resolve(lfp, lp->dn_type);
-               lkind = ctf_type_kind(lfp, lbase);
-
                if (lkind == CTF_K_POINTER) {
                        lref = ctf_type_resolve(lfp,
                            ctf_type_reference(lfp, lbase));
@@ -1053,9 +1055,6 @@
        }
 
        if (!rp_is_int) {
-               rbase = ctf_type_resolve(rfp, rp->dn_type);
-               rkind = ctf_type_kind(rfp, rbase);
-
                if (rkind == CTF_K_POINTER) {
                        rref = ctf_type_resolve(rfp,
                            ctf_type_reference(rfp, rbase));
diff -r 905a0d098d8c -r 04470904aee9 external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c
--- a/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c Sat Feb 21 15:00:30 2015 +0000
+++ b/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c Sat Feb 21 15:13:20 2015 +0000
@@ -295,7 +295,9 @@
     const dt_pfargd_t *pfd, const void *addr, size_t size, uint64_t normal)
 {
        double n = (double)normal;
+#if !defined(__arm__) && !defined(__powerpc__) && !defined(__mips__)
        long double ldn = (long double)normal;
+#endif
 
        switch (size) {
        case sizeof (float):