On Sat, Aug 20, 2022 at 7:24 PM Jonathan Gray <j...@jsg.id.au> wrote: > > On Sat, Aug 20, 2022 at 01:26:00PM -0600, Daniel Dickman wrote: > > CVSROOT: /cvs > > Module name: src > > Changes by: dan...@cvs.openbsd.org 2022/08/20 13:26:00 > > > > Modified files: > > sys/arch/amd64/include: specialreg.h > > > > Log message: > > remove Cyrix 486DLC register defines from amd64 > > > > Cyrix CPUs don't support amd64. These defines were probably carried > > over from i386 accidentally when the amd64 code was first imported. > > This file was purposefully kept in sync between archs. > That hasn't been the case with vmm and some other parts though.
As you say, the files are quite different currently. Although a lot of the differences should be easily mergable (i.e. whitespace and variable name difference only) but there are many other differences. I just committed the i386 bits to remove 486DLC registers so that will get the files slightly closer to alignment. diff -ub i386/include/specialreg.h amd64/include/specialreg.h | diffstat specialreg.h | 703 +++--- 1 file changed, 675 insertions(+), 28 deletions(-)