summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2003-07-02 12:45:45 +0000
committerru <ru@FreeBSD.org>2003-07-02 12:45:45 +0000
commit8b64e296947aac2dc767e5e4fb02e0dcde490010 (patch)
tree7c341873fe32452f2196b2a1ac70bf2c87611831
parentdc7e39e87b0ff3e9db912e1c4ed2418c33301c49 (diff)
downloadFreeBSD-src-8b64e296947aac2dc767e5e4fb02e0dcde490010.zip
FreeBSD-src-8b64e296947aac2dc767e5e4fb02e0dcde490010.tar.gz
Revert non-style part of the recent two deltas that dealt with
using as(1) to compile plain assembler source files; bsd.lib.mk has been fixed (in revision 1.147).
-rw-r--r--sys/boot/i386/libi386/Makefile6
-rw-r--r--sys/boot/pc98/libpc98/Makefile6
2 files changed, 2 insertions, 10 deletions
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index aba477a..3bdb791 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -7,7 +7,7 @@ SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \
comconsole.c devicename.c elf32_freebsd.c \
elf64_freebsd.c gatea20.c \
- i386_copy.c i386_module.c nullconsole.c pxe.c \
+ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
time.c vidconsole.c amd64_tramp.S
CFLAGS+= -ffreestanding
@@ -45,8 +45,4 @@ machine:
.endif
-OBJS+= pxetramp.o
-pxetramp.o: pxetramp.s
- ${AS} ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*pxetramp*}
-
.include <bsd.lib.mk>
diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile
index 57f888d..fb783fd 100644
--- a/sys/boot/pc98/libpc98/Makefile
+++ b/sys/boot/pc98/libpc98/Makefile
@@ -7,7 +7,7 @@ INTERNALLIB= true
SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c biossmap.c \
bootinfo.c bootinfo32.c comconsole.c devicename.c elf32_freebsd.c \
- gatea20.c i386_copy.c i386_module.c nullconsole.c pxe.c \
+ gatea20.c i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
time.c vidconsole.c
CFLAGS+= -ffreestanding
@@ -46,8 +46,4 @@ machine:
.endif
-OBJS+= pxetramp.o
-pxetramp.o: pxetramp.s
- ${AS} ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*pxetramp*}
-
.include <bsd.lib.mk>
OpenPOWER on IntegriCloud