Skip to content

Commit

Permalink
Remove pc98 support completely.
Browse files Browse the repository at this point in the history
I thank all developers and contributors for pc98.

Relnotes:	yes
  • Loading branch information
nyan- committed Jan 28, 2017
1 parent 8c2c935 commit 259480b
Show file tree
Hide file tree
Showing 418 changed files with 215 additions and 46,737 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ _MAKE+= MK_META_MODE=no

# Guess machine architecture from machine type, and vice versa.
.if !defined(TARGET_ARCH) && defined(TARGET)
_TARGET_ARCH= ${TARGET:S/pc98/i386/:S/arm64/aarch64/}
_TARGET_ARCH= ${TARGET:S/arm64/aarch64/}
.elif !defined(TARGET) && defined(TARGET_ARCH) && \
${TARGET_ARCH} != ${MACHINE_ARCH}
_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?(hf)?/mips/:C/arm(v6)?(eb)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/powerpcspe/powerpc/:C/riscv64(sf)?/riscv/}
Expand Down Expand Up @@ -417,13 +417,12 @@ worlds: .PHONY
# existing system is.
#
.if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
TARGETS?=amd64 arm arm64 i386 mips pc98 powerpc sparc64
TARGETS?=amd64 arm arm64 i386 mips powerpc sparc64
_UNIVERSE_TARGETS= ${TARGETS}
TARGET_ARCHES_arm?= arm armeb armv6
TARGET_ARCHES_arm64?= aarch64
TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 mipselhf mipshf mips64elhf mips64hf
TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpcspe
TARGET_ARCHES_pc98?= i386
.for target in ${TARGETS}
TARGET_ARCHES_${target}?= ${target}
.endfor
Expand Down
1 change: 0 additions & 1 deletion Makefile.inc1
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ KNOWN_ARCHES?= aarch64/arm64 \
armeb/arm \
armv6/arm \
i386 \
i386/pc98 \
mips \
mipsel/mips \
mips64el/mips \
Expand Down
11 changes: 11 additions & 0 deletions ObsoleteFiles.inc
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,17 @@
# xargs -n1 | sort | uniq -d;
# done

# 20170128: remove pc98 support
OLD_FILES+=usr/include/dev/ic/i8251.h
OLD_FILES+=usr/include/dev/ic/wd33c93reg.h
OLD_FILES+=usr/include/sys/disk/pc98.h
OLD_FILES+=usr/include/sys/diskpc98.h
OLD_FILES+=usr/share/man/man4/i386/ct.4.gz
OLD_FILES+=usr/share/man/man4/i386/snc.4.gz
OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.iso.kbd
OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.kbd
OLD_FILES+=usr/share/vt/keymaps/jp.pc98.iso.kbd
OLD_FILES+=usr/share/vt/keymaps/jp.pc98.kbd
# 20170110: Four files from ggate tests consolidated into one
OLD_FILES+=usr/tests/sys/geom/class/gate/1_test
OLD_FILES+=usr/tests/sys/geom/class/gate/2_test
Expand Down
49 changes: 0 additions & 49 deletions etc/etc.pc98/ttys

This file was deleted.

1 change: 0 additions & 1 deletion etc/rc.d/syscons
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ icelandic.iso) echo is;;
it.iso) echo it;;
jp.106x) echo jp.capsctrl;;
jp.106) echo jp;;
#?? jp.pc98.iso) echo jp.pc98;;
kk.pt154.io) echo kz.io;;
kk.pt154.kst) echo kz.kst;;
latinamerican.iso.acc) echo latinamerican.acc;;
Expand Down
2 changes: 1 addition & 1 deletion lib/libsysdecode/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ tables.h: mktables
ioctl.c: .PHONY
.endif
ioctl.c: mkioctls .META
env MACHINE=${MACHINE} CPP="${CPP}" \
env CPP="${CPP}" \
/bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET}

beforedepend: ioctl.c tables.h
Expand Down
10 changes: 1 addition & 9 deletions lib/libsysdecode/mkioctls
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,7 @@ ioctl_includes=$(
awk '{printf("#include <%s>\\n", $1)}'
)

: ${MACHINE=$(uname -m)}
case "${MACHINE}" in
*pc98*)
ioctl_includes="$ioctl_includes#include <sys/diskpc98.h>\\n"
;;
*)
ioctl_includes="$ioctl_includes#include <sys/diskmbr.h>\\n"
;;
esac
ioctl_includes="$ioctl_includes#include <sys/diskmbr.h>\\n"

awk -v x="$ioctl_includes" 'BEGIN {print x}' |
$CPP -nostdinc -I$includedir -dM -DCOMPAT_43TTY - |
Expand Down
4 changes: 0 additions & 4 deletions libexec/Makefile.pc98

This file was deleted.

2 changes: 1 addition & 1 deletion release/doc/README
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ element will be included. For example:

<para arch="sparc64">SPARC64-specific text</para>

The currently-supported architectures are amd64, arm, i386, pc98,
The currently-supported architectures are amd64, arm, i386,
powerpc and sparc64. An element may appear for multiple architectures
by specifying a comma-separated list of architectures
(i.e. arch="sparc64,amd64").
Expand Down
Loading

0 comments on commit 259480b

Please sign in to comment.