Module Name: src
Committed By: rin
Date: Mon May 30 14:18:10 UTC 2022
Modified Files:
src/sys/arch/evbppc/conf: std.explora
src/sys/lib/libkern/arch/powerpc: Makefile.inc
Log Message:
Restrict strictly-aligned versions of memcmp(9), memcpy(9), and
memmove(9) to 403, instead of all evbppc machines.
Introduce strict-align LIBKERN_MD_FLAGS for this purpose.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/conf/std.explora
cvs rdiff -u -r1.33 -r1.34 src/sys/lib/libkern/arch/powerpc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/std.explora
diff -u src/sys/arch/evbppc/conf/std.explora:1.10 src/sys/arch/evbppc/conf/std.explora:1.11
--- src/sys/arch/evbppc/conf/std.explora:1.10 Mon May 30 14:09:01 2022
+++ src/sys/arch/evbppc/conf/std.explora Mon May 30 14:18:10 2022
@@ -1,4 +1,4 @@
-# $NetBSD: std.explora,v 1.10 2022/05/30 14:09:01 rin Exp $
+# $NetBSD: std.explora,v 1.11 2022/05/30 14:18:10 rin Exp $
#
# Standard/required options for NetBSD/explora.
@@ -11,6 +11,7 @@ options PPC_IBM403 # IBM 403GCX
# 403 does not support unaligned memory access.
options PPC_NO_UNALIGNED
+makeoptions LIBKERN_MD_FLAGS+="strict-align"
options VMSWAP_DEFAULT_PLAINTEXT # do not encrypt swap by
# default (slow cpu)
Index: src/sys/lib/libkern/arch/powerpc/Makefile.inc
diff -u src/sys/lib/libkern/arch/powerpc/Makefile.inc:1.33 src/sys/lib/libkern/arch/powerpc/Makefile.inc:1.34
--- src/sys/lib/libkern/arch/powerpc/Makefile.inc:1.33 Mon Jul 26 12:49:13 2021
+++ src/sys/lib/libkern/arch/powerpc/Makefile.inc Mon May 30 14:18:10 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.33 2021/07/26 12:49:13 rin Exp $
+# $NetBSD: Makefile.inc,v 1.34 2022/05/30 14:18:10 rin Exp $
SRCS+= bswap16.c bswap32.c
SRCS+= htonl.c htons.c ntohl.c ntohs.c
@@ -7,9 +7,8 @@ SRCS+= syncicache.c
SRCS+= ffs.S memset.S strlen.S
SRCS+= gprsavrest.S
-# XXX
+.if !empty(LIBKERN_MD_FLAGS:M*strict-align*)
# Disable asm versions that use unaligned memory access and thus break 403.
-.if ${MACHINE} == "evbppc"
. for name in memcmp memcpy memmove
. for suffix in o po pico go d
${name}.${suffix}: ${name}.c
