>bswap problems only started happening when I used the bswap() calls. The
>htonl/ntohl duplication problem existed months ago, and still does.

It's a bug.  Please add appropriate ifdefs to the bute_swap_*.S files,
in both userland and libsa (i.e., keep them in synch), then remove the
versions from locore.S, then commit it all and request a pullup.

(I'm busy doing Other Things today/tonight).