From 14ca7bbf803d0b6f9defc28db9021dcb2e65384a Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@gnupg.org>
Date: Mon, 24 Oct 2016 23:07:55 +0200
Subject: boot: Remove hacks for running boot on UX.

* boot/Makefile (COMMON-OBJS): Do not build server stubs for the
bootstrap protocol.
Remove all UX-related variables and targets.
* boot/boot.c: Remove all UX-related definitions and includes.
* boot/frank1.ld: Delete file.
* boot/frankemul.ld: Likewise.
* boot/mach-crt0.c: Likewise.
* boot/sigvec.S: Likewise.
* boot/syscall.S: Likewise.
* boot/ux.c: Likewise.
* boot/ux.h: Likewise.
---
 boot/Makefile | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'boot/Makefile')

diff --git a/boot/Makefile b/boot/Makefile
index c8772950..38a8c695 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -22,9 +22,8 @@ SRCS = mach-crt0.c boot.c ux.c sigvec.S syscall.S \
        boot_script.c userland-boot.c
 COMMON-OBJS = notifyServer.o deviceServer.o \
        ioServer.o io_replyUser.o device_replyUser.o \
-       termServer.o bootstrapServer.o boot_script.o userland-boot.o
+       termServer.o boot_script.o userland-boot.o
 OBJS = boot.o $(COMMON-OBJS)
-UX-OBJS = mach-crt0.o uxboot.o sigvec.o syscall.o ux.o $(COMMON-OBJS)
 target = boot
 io-MIGSFLAGS=-DREPLY_PORTS
 HURDLIBS = store shouldbeinlibc
@@ -32,21 +31,4 @@ LDLIBS += -lpthread
 
 include ../Makeconf
 
-#install: /usr/local/bin/uxboot
-#
-#/usr/local/bin/uxboot: uxboot
-#	cp $< $@
-
 MIGSFLAGS = -DHURD_DEFAULT_PAYLOAD_TO_PORT=1
-
-all: boot # uxboot
-
-uxboot.o: boot.c
-	$(COMPILE.c) -DUX $< -o $@
-
-uxboot.0: $(UX-OBJS)
-	$(LINK.o) -o $@ -static -nostartfiles -Wl,-T -Wl,$(srcdir)/frank1.ld $^
-uxboot.1: frankemul.ld uxboot.0
-	$(LD) -o $@ -T $^
-uxboot: uxboot.1
-	-$(OBJCOPY) -S --remove-section=.comment -O a.out-mach3 $< $@
-- 
cgit v1.2.3