From 492fa2ae5ee7ef9c3f3601ac611ebc9a43ff83eb Mon Sep 17 00:00:00 2001
From: Nathan Binkert <binkertn@umich.edu>
Date: Fri, 14 Nov 2003 12:32:52 -0500
Subject: Get the console code to compile correctly Add support for some thigns
 that M5 needs Make this better support Tru64 v5.1

console/Makefile:
    I couldn't figure out the old build system since I was missing
    a bunch of tools at the time, so I kinda rewrote it.
console/console.c:
    Get the includes right, and make things compile
    little bit of cleanup along the way
console/paljtokern.s:
    formatting junk
console/printf.c:
    Formatting
    get const right
h/lib.h:
    fiddle with the includes that we need
console/console.c:
    Get the BOOTDEVICE_NAME right
    Add a bit of support for grabbing console environment variables
---
 system/alpha/console/Makefile | 61 +++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

(limited to 'system/alpha/console/Makefile')

diff --git a/system/alpha/console/Makefile b/system/alpha/console/Makefile
index 9b8748f13..6c2ee111c 100644
--- a/system/alpha/console/Makefile
+++ b/system/alpha/console/Makefile
@@ -2,43 +2,48 @@
 all: console
 
 DBMENTRY	= fffffc0000010000
-INCLUDES        = -I$(PALCODE) -I$(INCLUDEH) -I$(SIMTOOLS)/cpus-alpha/simos
-#-I/udir/bugnion/ebfw/h -I/udir/bugnion/ebfw/palcode/xxm
+INCLUDES        = -I$(PALCODE) -I$(INCLUDEH) -I$(M5)/dev
 
 SOURDIR = ./
-EB_TOOLBOX = /wrl/proj/simos/bin/tools/osf
 PALCODE  = ../palcode
 INCLUDEH = ../h
 
 dbmentry.o: dbmentry.s 
-	$(AS)  $(INCLUDES) -o $*.o $*.s
+	$(AS)  $(INCLUDES) -nointrinsics -o $*.o $*.s
 
 console.o: console.c 
-	$(CC)  -g3 $(INCLUDES) -o $*.o -c $*.c
+	$(CC)  -g3 $(INCLUDES) -nointrinsics -o $*.o -c $*.c
 
 printf.o: printf.c 
-	$(CC)  -g3 $(INCLUDES) -o $*.o -c $*.c
-
-paljtokern.o: $(SOURCEDIR)paljtokern.s
-	rm $(OBJDIR)paljtokern.i
-	cpp -I$(PALCODE) $(SOURCEDIR)paljtokern.s $(OBJDIR)paljtokern.i
-	$(EB_TOOLBOX)/gas -21164 -o $(OBJDIR)paljtokern.aout.o $(OBJDIR)paljtokern.i
-	$(EB_TOOLBOX)/astrip -a $(OBJDIR)paljtokern.aout.o $(OBJDIR)paljtokern.strip
-	$(EB_TOOLBOX)/strip2array $(OBJDIR)paljtokern.strip $(OBJDIR)paljtokern.c
-	$(CC) $(CCFLAGS) -o $(OBJDIR)paljtokern.o -c $(INCLUDES) $(OBJDIR)paljtokern.c
-
-paljtoslave.o: $(SOURCEDIR)paljtoslave.s
-	rm $(OBJDIR)paljtoslave.i
-	cpp -I$(PALCODE) $(SOURCEDIR)paljtoslave.s $(OBJDIR)paljtoslave.i
-	$(EB_TOOLBOX)/gas -21164 -o $(OBJDIR)paljtoslave.aout.o $(OBJDIR)paljtoslave.i
-	$(EB_TOOLBOX)/astrip -a $(OBJDIR)paljtoslave.aout.o $(OBJDIR)paljtoslave.strip
-	$(EB_TOOLBOX)/strip2array $(OBJDIR)paljtoslave.strip $(OBJDIR)paljtoslave.tmp
-	sed -e 's/palJToKern/palJToSlave/' $(OBJDIR)paljtoslave.tmp >$(OBJDIR)paljtoslave.c
-	$(CC) $(CCFLAGS) -o $(OBJDIR)paljtoslave.o -c $(INCLUDES) $(OBJDIR)paljtoslave.c
-
-console: console.o dbmentry.o printf.o paljtokern.o paljtoslave.o 
-	$(LD) -o console  -N -T $(DBMENTRY) -non_shared dbmentry.o console.o \
-	printf.o paljtokern.o paljtoslave.o -lc
+	$(CC)  -g3 $(INCLUDES) -nointrinsics -o $*.o -c $*.c
+
+paljtokern.s.o: paljtokern.s
+	g++ -I ../palcode -E -P -nostdinc -nostdinc++ -x c++ paljtokern.s | \
+	gas -m 21164 -o paljtokern.s.o
+
+paljtoslave.s.o: paljtoslave.s
+	g++ -I ../palcode -E -P -nostdinc -nostdinc++ -x c++ paljtoslave.s | \
+	gas -m 21164 -o paljtoslave.s.o
+
+paljtokern.c: paljtokern.s.o
+	echo 'unsigned int palJToKern[] = {' > paljtokern.c
+	dis paljtokern.s.o | awk '{print "0x"$$2","}' >> paljtokern.c
+	echo "0x0\n};" >> paljtokern.c
+
+paljtoslave.c: paljtoslave.s.o
+	echo "unsigned int palJToSlave[] = {" > paljtoslave.c
+	dis paljtoslave.s.o | awk '{print "0x"$$2","}' >> paljtoslave.c
+	echo "0x0\n};" >> paljtoslave.c
+
+paljtokern.c.o: paljtokern.c
+	$(CC) -g3 -nointrinsics -o paljtokern.c.o -c paljtokern.c
+
+paljtoslave.c.o: paljtoslave.c
+	$(CC) -g3 -nointrinsics -o paljtoslave.c.o -c paljtoslave.c
+
+console: console.o dbmentry.o printf.o paljtokern.c.o paljtoslave.c.o 
+	$(LD) -o console  -N -T $(DBMENTRY) -non_shared \
+	dbmentry.o console.o printf.o paljtokern.c.o paljtoslave.c.o -lc
 
 clean:
-	rm *.o; rm console; rm *.strip; rm paljtokern.c paljtoslave.c; touch paljtokern.i paljtoslave.i
+	rm -f *.o console *.strip paljtokern.c paljtoslave.c
-- 
cgit v1.2.3