From 52f1a3c7fd4ab7e7c43fd23a9d68f1155caca27a Mon Sep 17 00:00:00 2001 From: kn Date: Wed, 12 Oct 2022 10:48:33 +0000 Subject: [PATCH] Remove powerpc left-overs There since the powerpc -> macppc move/rename. KERN_AS usage disappeared in commit 5b7db11d478192c5908038bb1345e7d51cc35c8e Author: rahnds Date: Mon May 5 16:47:15 1997 +0000 only build one version of the libraries. REAL_VIRT usage disappeared in commit 08e027d6bb9ca863bfc44a1aa6957ff3a242e2f4 Author: rahnds Date: Thu Apr 27 12:36:29 2000 +0000 Fixes to xcoff bootloader to allow it to execute and load kernels for OpenBSD. Make agrees that these are defined but not used: $ make -p | grep -e KERN_AS -e REAL_VIRT KERN_AS = library REAL_VIRT = -v $ make -C ofwboot -p | grep -e KERN_AS -e REAL_VIRT KERN_AS = library REAL_VIRT = -v No object change. Feedback OK miod --- sys/arch/macppc/stand/Makefile | 3 +-- sys/arch/macppc/stand/Makefile.inc | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/arch/macppc/stand/Makefile b/sys/arch/macppc/stand/Makefile index ab429b650ac..d0d887615d2 100644 --- a/sys/arch/macppc/stand/Makefile +++ b/sys/arch/macppc/stand/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2022/05/23 16:58:11 krw Exp $ +# $OpenBSD: Makefile,v 1.12 2022/10/12 10:48:33 kn Exp $ # $NetBSD: Makefile,v 1.1 1996/09/30 16:34:59 ws Exp $ MANSUBDIR=macppc @@ -9,7 +9,6 @@ SUBDIR= ofwboot tbxidata SAREL= KERNREL= -KERN_AS=library Z_AS=library SA_ZLIB=smth USE_LOADFILE=yes diff --git a/sys/arch/macppc/stand/Makefile.inc b/sys/arch/macppc/stand/Makefile.inc index 0a986e80894..4cc55f227e7 100644 --- a/sys/arch/macppc/stand/Makefile.inc +++ b/sys/arch/macppc/stand/Makefile.inc @@ -1,11 +1,9 @@ -# $OpenBSD: Makefile.inc,v 1.13 2016/11/06 16:04:20 tb Exp $ +# $OpenBSD: Makefile.inc,v 1.14 2022/10/12 10:48:33 kn Exp $ # $NetBSD: Makefile.inc,v 1.1 1996/09/30 16:34:59 ws Exp $ .if !defined(__stand_makefile_inc) __stand_makefile_inc=1 -KERN_AS= library - S=$(.CURDIR)/../../../$(R) .if !make(clean) && !make(cleandir) && !make(includes) && !make(libdep) && \ @@ -16,7 +14,6 @@ S=$(.CURDIR)/../../../$(R) # EXTRACFLAGS= -msoft-float -REAL_VIRT?= -v ENTRY?= _start INCLUDES+= -I. -I$(.OBJDIR) -I$(.CURDIR)/.. -I$(S)/arch -I$(S) -- 2.20.1