@zigc/lib 0.17.0-dev.607 → 0.17.0-dev.644

package/std/Io/Threaded.zig

@@ -12409,7 +12409,7 @@ fn openSocketPosix(
 
     if (options.ip6_only) {
         if (posix.IPV6 == void) return error.OptionUnsupported;
-        try setSocketOptionPosix(socket_fd, posix.IPPROTO.IPV6, posix.IPV6.V6ONLY, 0);
+        try setSocketOptionPosix(socket_fd, posix.IPPROTO.IPV6, posix.IPV6.V6ONLY, 1);
     }
 
     return socket_fd;

package/std/Io/Uring.zig

@@ -2739,6 +2739,7 @@ fn dirOpenDir(
             error.FileBusy => return errnoBug(.TXTBSY),
             error.PathAlreadyExists => return errnoBug(.EXIST), // Not creating.
             error.OperationUnsupported => return errnoBug(.OPNOTSUPP), // No TMPFILE, no locks.
+            error.ReadOnlyFileSystem => return errnoBug(.ROFS), // Not creating.
             else => |e| return e,
         },
     };
@@ -3164,6 +3165,7 @@ fn dirRealPathFile(
     }, 0) catch |err| switch (err) {
         error.WouldBlock => return errnoBug(.AGAIN),
         error.OperationUnsupported => return errnoBug(.OPNOTSUPP), // Not asking for locks.
+        error.ReadOnlyFileSystem => return errnoBug(.ROFS), // Not creating.
         else => |e| return e,
     };
     defer ev.closeAsync(fd);
@@ -5984,7 +5986,7 @@ fn socket(
 
     if (options.ip6_only) {
         if (linux.IPV6 == void) return error.OptionUnsupported;
-        try ev.setsockopt(cancel_region, socket_fd, linux.IPPROTO.IPV6, linux.IPV6.V6ONLY, 0);
+        try ev.setsockopt(cancel_region, socket_fd, linux.IPPROTO.IPV6, linux.IPV6.V6ONLY, 1);
     }
 
     return socket_fd;

package/std/Target.zig

@@ -538,7 +538,7 @@ pub const Os = struct {
 
                             break :blk default_min;
                         },
-                        .max = .{ .major = 10, .minor = 1, .patch = 0 },
+                        .max = .{ .major = 11, .minor = 0, .patch = 0 },
                     },
                 },
                 .openbsd => .{
@@ -2802,6 +2802,8 @@ pub const DynamicLinker = struct {
                 .mips64,
                 .mips64el,
                 .powerpc,
+                .riscv32,
+                .riscv64,
                 .sh,
                 .sheb,
                 .sparc,

package/std/debug/Pdb.zig

@@ -26,10 +26,11 @@ pub const Module = struct {
     symbols: []u8,
     subsect_info: []u8,
     checksum_offset: ?usize,
-    /// The inlinee source lines, sorted by inlinee. This saves us from repeatedly doing linear
-    /// searches over all inlinees. We prefer binary search over a hashmap as LLVM somtimes outputs
-    /// multiple entries for a single inlinee ID, see `getInlineeSourceLines` for more info.
-    inlinee_source_lines: []InlineeSourceLine,
+    /// The inlinee source lines, sorted by inlinee, then file, then line number.
+    /// This saves us from repeatedly doing linear searches over all inlinees.
+    /// We prefer binary search over a hashmap as LLVM somtimes outputs multiple entries
+    /// for a single inlinee ID, see `getInlineeSourceLines` for more info.
+    inlinee_source_lines: []*align(1) const pdb.InlineeSourceLine,
 
     pub fn deinit(self: *Module, allocator: Allocator) void {
         allocator.free(self.module_name);
@@ -669,44 +670,68 @@ pub fn getSymbolName(self: *Pdb, proc_sym: *align(1) const pdb.ProcSym) []const
     return std.mem.sliceTo(@as([*:0]const u8, @ptrCast(&proc_sym.name[0])), 0);
 }
 
-pub const InlineeSourceLine = struct {
-    signature: pdb.InlineeSourceLineSignature,
-    info: *align(1) const pdb.InlineeSourceLine,
+fn inlineeSourceLineLessThan(
+    _: void,
+    lhs: *align(1) const pdb.InlineeSourceLine,
+    rhs: *align(1) const pdb.InlineeSourceLine,
+) bool {
+    if (lhs.inlinee < rhs.inlinee) return true;
+    if (lhs.inlinee > rhs.inlinee) return false;
+    if (lhs.file_id < rhs.file_id) return true;
+    if (lhs.file_id > rhs.file_id) return false;
+    return lhs.source_line_num < rhs.source_line_num;
+}
 
-    fn lessThan(_: void, lhs: InlineeSourceLine, rhs: InlineeSourceLine) bool {
-        return lhs.info.inlinee < rhs.info.inlinee;
-    }
+fn compareInlineeSourceLineInlinee(
+    inlinee: u32,
+    inlinee_src_line: *align(1) const pdb.InlineeSourceLine,
+) std.math.Order {
+    return std.math.order(inlinee, inlinee_src_line.inlinee);
+}
 
-    fn compare(inlinee: u32, self: InlineeSourceLine) std.math.Order {
-        return std.math.order(inlinee, self.info.inlinee);
+pub const InlineeSourceLocationIterator = struct {
+    /// The iterator assumes that all source lines in the slice are associated
+    /// with the same inlinee, and that it is sorted by file, then line number.
+    lines: []*align(1) const pdb.InlineeSourceLine,
+
+    pub const empty: InlineeSourceLocationIterator = .{ .lines = &.{} };
+
+    pub fn next(iter: *InlineeSourceLocationIterator) ?*align(1) const pdb.InlineeSourceLine {
+        if (iter.lines.len == 0) return null;
+        const line = iter.lines[0];
+        iter.lines = iter.lines[1..];
+        // Filter out duplicate entries
+        while (iter.lines.len != 0 and
+            iter.lines[0].file_id == line.file_id and
+            iter.lines[0].source_line_num == line.source_line_num)
+        {
+            iter.lines = iter.lines[1..];
+        }
+        return line;
     }
 };
 
-/// Returns all `InlineeSourceLine`s for a given module with the given inlinee. Ideally there would
-/// only be one entry per inlinee, but LLVM appears to assign all functions that share a name the
-/// same inlinee ID. This appears to be a bug, so the best the caller can do right now is print all
-/// the results.
-pub fn getInlineeSourceLines(
-    self: *Pdb,
-    mod: *Module,
-    inlinee: u32,
-) []const InlineeSourceLine {
+/// Returns all `pdb.InlineeSourceLine`s for a given module with the given inlinee. Ideally
+/// there would only be one entry per inlinee, but LLVM appears to assign all functions that share
+/// a name the same inlinee ID. This is a bug: https://github.com/llvm/llvm-project/issues/191787
+/// The best the caller can do right now is print all the results.
+pub fn getInlineeSourceLines(self: *Pdb, mod: *Module, inlinee: u32) InlineeSourceLocationIterator {
     _ = self;
 
     // Binary search to an arbitrary match, if there are other matches they will be adjacent
     const any = std.sort.binarySearch(
-        InlineeSourceLine,
+        *align(1) const pdb.InlineeSourceLine,
         mod.inlinee_source_lines,
         inlinee,
-        InlineeSourceLine.compare,
-    ) orelse return &.{};
+        compareInlineeSourceLineInlinee,
+    ) orelse return .empty;
 
     // Linearly scan to the first match
     const begin = b: {
         var begin = any;
         while (begin > 0) {
             const prev = begin - 1;
-            if (mod.inlinee_source_lines[prev].info.inlinee != inlinee) break;
+            if (mod.inlinee_source_lines[prev].inlinee != inlinee) break;
             begin = prev;
         }
         break :b begin;
@@ -716,13 +741,13 @@ pub fn getInlineeSourceLines(
     const end = b: {
         var end = any + 1;
         while (end < mod.inlinee_source_lines.len and
-            mod.inlinee_source_lines[end].info.inlinee == inlinee) : (end += 1)
+            mod.inlinee_source_lines[end].inlinee == inlinee) : (end += 1)
         {}
         break :b end;
     };
 
-    // Return a slice of all the matches
-    return mod.inlinee_source_lines[begin..end];
+    // Return an iterator over all matches (the iterator filters out duplicate entries)
+    return .{ .lines = mod.inlinee_source_lines[begin..end] };
 }
 
 pub fn getLineNumberInfo(self: *Pdb, gpa: Allocator, module: *Module, address: u64) !std.debug.SourceLocation {
@@ -845,7 +870,7 @@ pub fn getModule(self: *Pdb, index: usize) !?*Module {
     mod.subsect_info = try reader.readAlloc(gpa, mod.mod_info.c13_byte_size);
     errdefer gpa.free(mod.subsect_info);
     mod.inlinee_source_lines = b: {
-        var inlinee_source_lines: std.ArrayList(InlineeSourceLine) = .empty;
+        var inlinee_source_lines: std.ArrayList(*align(1) const pdb.InlineeSourceLine) = .empty;
         defer inlinee_source_lines.deinit(gpa);
         var subsects: Io.Reader = .fixed(mod.subsect_info);
         while (subsects.takeStructPointer(pdb.DebugSubsectionHeader) catch null) |subsect_hdr| {
@@ -866,15 +891,17 @@ pub fn getModule(self: *Pdb, index: usize) !?*Module {
                             return error.InvalidDebugInfo;
                     }
 
-                    try inlinee_source_lines.append(gpa, .{
-                        .signature = inlinee_source_line_signature,
-                        .info = info,
-                    });
+                    try inlinee_source_lines.append(gpa, info);
                 }
             }
         }
 
-        std.mem.sortUnstable(InlineeSourceLine, inlinee_source_lines.items, {}, InlineeSourceLine.lessThan);
+        std.mem.sortUnstable(
+            *align(1) const pdb.InlineeSourceLine,
+            inlinee_source_lines.items,
+            {},
+            inlineeSourceLineLessThan,
+        );
         break :b try inlinee_source_lines.toOwnedSlice(gpa);
     };
     errdefer gpa.free(mod.inlinee_source_lines);

package/std/debug/SelfInfo/Elf.zig

@@ -108,15 +108,19 @@ pub const can_unwind: bool = s: {
         // Not supported yet: arm
         .haiku => &.{
             .aarch64,
-            .m68k,
             .riscv64,
             .x86,
             .x86_64,
         },
-        // Not supported yet: arm/armeb/thumb/thumbeb, xtensa/xtensaeb
+        .illumos => &.{
+            .x86,
+            .x86_64,
+        },
+        // Not supported yet: arm/armeb/thumb/thumbeb, hppa, hppa64, microblaze/microblazeel, xtensa/xtensaeb
         .linux => &.{
             .aarch64,
             .aarch64_be,
+            .alpha,
             .arc,
             .csky,
             .loongarch32,
@@ -146,19 +150,23 @@ pub const can_unwind: bool = s: {
         .freebsd => &.{
             .aarch64,
             .riscv64,
+            .x86,
             .x86_64,
         },
-        // Not supported yet: arm/armeb, mips64/mips64el
+        // Not supported yet: arm/armeb, hppa, mips64/mips64el, sh/sheb
         .netbsd => &.{
             .aarch64,
             .aarch64_be,
+            .alpha,
             .m68k,
             .mips,
             .mipsel,
+            .riscv32,
+            .riscv64,
             .x86,
             .x86_64,
         },
-        // Not supported yet: arm
+        // Not supported yet: arm, hppa, sh
         .openbsd => &.{
             .aarch64,
             .m88k,
@@ -169,11 +177,6 @@ pub const can_unwind: bool = s: {
             .x86_64,
         },
 
-        .illumos => &.{
-            .x86,
-            .x86_64,
-        },
-
         else => unreachable,
     };
     for (archs) |a| {

package/std/debug/SelfInfo/Windows.zig

@@ -311,15 +311,13 @@ const Module = struct {
 
                         // If our address points into this site, get the source location(s) it
                         // points at
-                        for (pdb.getInlineeSourceLines(
-                            module,
-                            inline_site.inlinee,
-                        )) |inlinee_src_line| {
+                        var line_iter = pdb.getInlineeSourceLines(module, inline_site.inlinee);
+                        while (line_iter.next()) |inlinee_src_line| {
                             const maybe_loc = pdb.getInlineSiteSourceLocation(
                                 text_arena,
                                 module,
                                 inline_site,
-                                inlinee_src_line.info,
+                                inlinee_src_line,
                                 offset_in_func,
                             ) catch continue;
                             const loc = maybe_loc orelse continue;

package/std/debug/cpu_context.zig

@@ -1980,6 +1980,8 @@ const signal_ucontext_t = switch (native_os) {
         .thumbeb,
         .csky,
         .hexagon,
+        .hppa,
+        .hppa64,
         .m68k,
         .mips,
         .mipsel,
@@ -2051,19 +2053,19 @@ const signal_ucontext_t = switch (native_os) {
                     pc: u32,
                 },
                 // https://github.com/torvalds/linux/blob/cd5a0afbdf8033dc83786315d63f8b325bdba2fd/arch/parisc/include/uapi/asm/sigcontext.h
-                .hppa => extern struct {
-                    _flags: u32,
-                    _psw: u32,
-                    r1_19: [19]u32,
-                    r20: u32,
-                    r21: u32,
-                    r22: u32,
-                    r23_29: [7]u32,
-                    r30: u32,
-                    r31: u32,
+                .hppa, .hppa64 => extern struct {
+                    _flags: usize,
+                    _psw: usize,
+                    r1_19: [19]usize,
+                    r20: usize,
+                    r21: usize,
+                    r22: usize,
+                    r23_29: [7]usize,
+                    r30: usize,
+                    r31: usize,
                     _fr: [32]f64,
-                    _iasq: [2]u32,
-                    iaoq: [2]u32,
+                    _iasq: [2]usize,
+                    iaoq: [2]usize,
                 },
                 // https://github.com/torvalds/linux/blob/cd5a0afbdf8033dc83786315d63f8b325bdba2fd/arch/m68k/include/asm/ucontext.h
                 .m68k => extern struct {
@@ -2259,8 +2261,30 @@ const signal_ucontext_t = switch (native_os) {
                 pc: u64,
             },
             // https://github.com/freebsd/freebsd-src/blob/55c28005f544282b984ae0e15dacd0c108d8ab12/sys/x86/include/ucontext.h
+            .x86 => extern struct {
+                _onstack: i32 align(16),
+                _gs: i32,
+                _fs: i32,
+                _es: i32,
+                _ds: i32,
+                edi: u32,
+                esi: u32,
+                ebp: u32,
+                _isp: i32,
+                ebx: u32,
+                edx: u32,
+                ecx: u32,
+                eax: u32,
+                _trapno: i32,
+                _err: i32,
+                eip: u32,
+                _cs: i32,
+                _eflags: i32,
+                esp: u32,
+            },
+            // https://github.com/freebsd/freebsd-src/blob/55c28005f544282b984ae0e15dacd0c108d8ab12/sys/x86/include/ucontext.h
             .x86_64 => extern struct {
-                _onstack: i64,
+                _onstack: i64 align(16),
                 rdi: u64,
                 rsi: u64,
                 rdx: u64,
@@ -2492,7 +2516,7 @@ const signal_ucontext_t = switch (native_os) {
         // https://github.com/openbsd/src/blob/42468faed8369d07ae49ae02dd71ec34f59b66cd/sys/arch/sparc64/include/signal.h
         .sparc64 => @compileError("sparc64-openbsd ucontext_t missing"),
         // https://github.com/openbsd/src/blob/42468faed8369d07ae49ae02dd71ec34f59b66cd/sys/arch/sh/include/signal.h
-        .sh, .sheb => extern struct {
+        .sh => extern struct {
             pc: u32,
             _sr: i32,
             _gbr: i32,
@@ -2579,6 +2603,20 @@ const signal_ucontext_t = switch (native_os) {
                 r: [15]u32 align(8),
                 pc: u32,
             },
+            // https://github.com/NetBSD/src/blob/861008c62187bf7bc0aac4d81e52ed6eee4d0c74/sys/arch/hppa/include/mcontext.h
+            .hppa => extern struct {
+                r1_19: [19]u32 align(8),
+                r20: u32,
+                r21: u32,
+                r22: u32,
+                r23_29: [7]u32,
+                r30: u32,
+                r31: u32,
+                _sar: u32,
+                _pcsqh: u32,
+                _pcsqt: u32,
+                iaoq: [2]u32,
+            },
             // https://github.com/NetBSD/src/blob/861008c62187bf7bc0aac4d81e52ed6eee4d0c74/sys/arch/m68k/include/mcontext.h
             .m68k => extern struct {
                 d: [8]u32,
@@ -2602,6 +2640,16 @@ const signal_ucontext_t = switch (native_os) {
                 lr: u32,
                 pc: u32,
             },
+            // https://github.com/NetBSD/src/blob/861008c62187bf7bc0aac4d81e52ed6eee4d0c74/sys/arch/riscv/include/mcontext.h
+            .riscv32, .riscv64 => extern struct {
+                ra_sp_gp_tp: [4]usize align(8),
+                t0_2: [3]usize,
+                s0_1: [2]usize,
+                a: [8]usize,
+                s2_11: [10]usize,
+                t3_6: [4]usize,
+                pc: usize,
+            },
             // https://github.com/NetBSD/src/blob/861008c62187bf7bc0aac4d81e52ed6eee4d0c74/sys/arch/sparc/include/mcontext.h
             .sparc => @compileError("sparc-netbsd mcontext_t missing"),
             .sparc64 => @compileError("sparc64-netbsd mcontext_t missing"),

package/std/zig/target.zig

@@ -78,7 +78,6 @@ pub const available_libcs = [_]ArchOsAbi{
     .{ .arch = .mips64el, .os = .openbsd, .abi = .none, .os_ver = .{ .major = 4, .minor = 7, .patch = 0 } },
     .{ .arch = .powerpc, .os = .linux, .abi = .musleabi, .os_ver = .{ .major = 1, .minor = 3, .patch = 45 } },
     .{ .arch = .powerpc, .os = .linux, .abi = .musleabihf, .os_ver = .{ .major = 1, .minor = 3, .patch = 45 } },
-    .{ .arch = .powerpc, .os = .netbsd, .abi = .eabi, .os_ver = .{ .major = 6, .minor = 0, .patch = 0 } },
     .{ .arch = .powerpc, .os = .netbsd, .abi = .eabihf, .os_ver = .{ .major = 1, .minor = 4, .patch = 0 } },
     .{ .arch = .powerpc, .os = .openbsd, .abi = .eabihf, .os_ver = .{ .major = 2, .minor = 8, .patch = 0 } },
     .{ .arch = .powerpc64, .os = .freebsd, .abi = .none, .os_ver = .{ .major = 8, .minor = 0, .patch = 0 } },
@@ -89,9 +88,11 @@ pub const available_libcs = [_]ArchOsAbi{
     .{ .arch = .powerpc64le, .os = .linux, .abi = .musl, .os_ver = .{ .major = 3, .minor = 14, .patch = 0 } },
     .{ .arch = .riscv32, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 4, .minor = 15, .patch = 0 }, .glibc_min = .{ .major = 2, .minor = 33, .patch = 0 }, .glibc_triple = "riscv32-linux-gnu-rv32imafdc-ilp32d" },
     .{ .arch = .riscv32, .os = .linux, .abi = .musl, .os_ver = .{ .major = 4, .minor = 15, .patch = 0 } },
+    .{ .arch = .riscv32, .os = .netbsd, .abi = .none, .os_ver = .{ .major = 11, .minor = 0, .patch = 0 } },
     .{ .arch = .riscv64, .os = .freebsd, .abi = .none, .os_ver = .{ .major = 12, .minor = 0, .patch = 0 } },
     .{ .arch = .riscv64, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 4, .minor = 15, .patch = 0 }, .glibc_min = .{ .major = 2, .minor = 27, .patch = 0 }, .glibc_triple = "riscv64-linux-gnu-rv64imafdc-lp64d" },
     .{ .arch = .riscv64, .os = .linux, .abi = .musl, .os_ver = .{ .major = 4, .minor = 15, .patch = 0 } },
+    .{ .arch = .riscv64, .os = .netbsd, .abi = .none, .os_ver = .{ .major = 11, .minor = 0, .patch = 0 } },
     .{ .arch = .riscv64, .os = .openbsd, .abi = .none, .os_ver = .{ .major = 7, .minor = 0, .patch = 0 } },
     .{ .arch = .s390x, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 2, .minor = 4, .patch = 2 } },
     .{ .arch = .s390x, .os = .linux, .abi = .musl, .os_ver = .{ .major = 2, .minor = 4, .patch = 2 } },

package/std/zig.zig

@@ -65,6 +65,18 @@ pub const Color = enum {
             .off => .no_color,
         };
     }
+
+    /// Determine the preference for color or no color based on the NO_COLOR and
+    /// CLICOLOR_FORCE environment variables. Color is always disabled on WASI per
+    /// https://github.com/WebAssembly/WASI/issues/162
+    pub fn settingFromEnvironment(environ_map: *const std.process.Environ.Map) Color {
+        return if (@import("builtin").os.tag == .wasi or EnvVar.NO_COLOR.isSet(environ_map))
+            .off
+        else if (EnvVar.CLICOLOR_FORCE.isSet(environ_map))
+            .on
+        else
+            .auto;
+    }
 };
 
 /// There are many assumptions in the entire codebase that Zig source files can

package/libc/include/arm-netbsd-eabi/machine/frame.h

@@ -1,130 +0,0 @@
-/*	$NetBSD: frame.h,v 1.23 2022/04/02 11:16:07 skrll Exp $	*/
-
-/*
- * Copyright (c) 1994-1997 Mark Brinicombe.
- * Copyright (c) 1994 Brini.
- * All rights reserved.
- *
- * This code is derived from software written for Brini by Mark Brinicombe
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Brini.
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BRINI ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL BRINI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-/*
- * arm/frame.h - Stack frames structures
- */
-
-#ifndef _ARM_FRAME_H_
-#define _ARM_FRAME_H_
-
-#ifndef _LOCORE
-
-#include <sys/signal.h>
-#include <sys/ucontext.h>
-
-/*
- * Trap frame.  Pushed onto the kernel stack on a trap (synchronous exception).
- */
-
-typedef struct trapframe {
-	register_t tf_spsr;
-	register_t tf_fill; /* fill here so r0 will be dword aligned */
-	register_t tf_r0;
-	register_t tf_r1;
-	register_t tf_r2;
-	register_t tf_r3;
-	register_t tf_r4;
-	register_t tf_r5;
-	register_t tf_r6;
-	register_t tf_r7;
-	register_t tf_r8;
-	register_t tf_r9;
-	register_t tf_r10;
-	register_t tf_r11;
-	register_t tf_r12;
-	register_t tf_usr_sp;
-	register_t tf_usr_lr;
-	register_t tf_svc_sp;
-	register_t tf_svc_lr;
-	register_t tf_pc;
-} trapframe_t;
-
-/* Register numbers */
-#define tf_ip tf_r12
-#define tf_r13 tf_usr_sp
-#define tf_r14 tf_usr_lr
-#define tf_r15 tf_pc
-
-#define TRAP_USERMODE(tf)	(((tf)->tf_spsr & PSR_MODE) == PSR_USR32_MODE)
-
-#define FB_R4	0
-#define FB_R5	1
-#define FB_R6	2
-#define FB_R7	3
-#define FB_R8	4
-#define FB_R9	5
-#define FB_R10	6
-#define FB_R11	7
-#define FB_R12	8
-#define FB_R13	9
-#define FB_R14	10
-#define FB_MAX	11
-struct faultbuf {
-	register_t fb_reg[FB_MAX];
-};
-
-/*
- * Signal frame.  Pushed onto user stack before calling sigcode.
- */
-#ifdef COMPAT_16
-struct sigframe_sigcontext {
-	struct	sigcontext sf_sc;
-};
-#endif
-
-/* the pointers are use in the trampoline code to locate the ucontext */
-struct sigframe_siginfo {
-	siginfo_t	sf_si;		/* actual saved siginfo */
-	ucontext_t	sf_uc;		/* actual saved ucontext */
-};
-
-#if defined(_KERNEL) || defined(_KMEMUSER)
-#ifdef _KERNEL
-__BEGIN_DECLS
-void sendsig_sigcontext(const ksiginfo_t *, const sigset_t *);
-void *getframe(struct lwp *, int, int *);
-__END_DECLS
-#define lwp_settrapframe(l, tf)		((l)->l_md.md_tf = (tf))
-#endif
-#define lwp_trapframe(l)		((l)->l_md.md_tf)
-#endif /* _KERNEL || _KMEMUSER */
-
-#endif /* _LOCORE */
-
-#endif /* _ARM_FRAME_H_ */
-
-/* End of frame.h */

package/libc/include/generic-netbsd/powerpc/bswap.h

@@ -1,8 +0,0 @@
-/*	$NetBSD: bswap.h,v 1.6 2006/01/31 07:51:41 dsl Exp $	*/
-
-#ifndef _POWERPC_BSWAP_H_
-#define _POWERPC_BSWAP_H_
-
-#include <sys/bswap.h>
-
-#endif /* _POWERPC_BSWAP_H_ */

package/libc/include/mips-netbsd-eabi/machine/psl.h

@@ -1,3 +0,0 @@
-/*	$NetBSD: psl.h,v 1.1 2002/03/07 14:44:01 simonb Exp $	*/
-
-#include <mips/psl.h>

package/libc/include/mips-netbsd-eabi/machine/reloc.h

@@ -1,3 +0,0 @@
-/*	$NetBSD: reloc.h,v 1.1 2002/03/07 14:44:02 simonb Exp $	*/
-
-#include <mips/reloc.h>

package/libc/include/mips-netbsd-eabi/machine/trap.h

@@ -1,3 +0,0 @@
-/*	$NetBSD: trap.h,v 1.1 2002/03/07 14:44:02 simonb Exp $	*/
-
-#include <mips/trap.h>