From 55e3b9f74391282bda18d90e05df78c331b59392 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Mon, 27 Jun 2005 17:25:54 -0400 Subject: Major system code cleanup and formatting remove unused code console/Makefile: cleanup Makefile. Remove unneeded -D options console/console.c: Major cleanup and formatting remove unused #ifdef code remove unused #includes rename xxm -> m5 rename simos -> m5 console/dbmentry.S: console/paljtokern.S: console/paljtoslave.S: console/printf.c: Major cleanup and formatting remove unused #ifdef code remove unused #includes rename __start -> _start to get rid of warning. h/cserve.h: h/dc21164FromGasSources.h: h/ev5_alpha_defs.h: h/ev5_defs.h: h/ev5_osfalpha_defs.h: h/ev5_paldef.h: h/fromHudsonMacros.h: h/fromHudsonOsf.h: h/rpb.h: Major cleanup and formatting h/ev5_impure.h: Major cleanup and formatting remove unused #ifdef code palcode/Makefile: cleanup Makefile remove unused -D options unify platform_tlaser.S and platform_tsunami.S into platform.S and generate multiple .o files using various #defines unify osfpal.S osfpal_cache_copy.S and osfpal_cache_copy_unaligned.S into osfpal.S and generate multiple .o files using various #defines palcode/osfpal.S: Major cleanup and formatting remove unused #defines remove unused #if code merge copy code into this file. palcode/platform.S: Major cleanup and formatting remove unused #defines remove unused #if code merge platform code into this file. --- system/alpha/console/Makefile | 65 +++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 34 deletions(-) (limited to 'system/alpha/console/Makefile') diff --git a/system/alpha/console/Makefile b/system/alpha/console/Makefile index ca61a0fe3..728ab7a8d 100644 --- a/system/alpha/console/Makefile +++ b/system/alpha/console/Makefile @@ -1,44 +1,41 @@ -#Copyright (c) 2005 -#The Regents of The University of Michigan -#All Rights Reserved +# Copyright (c) 2005 +# The Regents of The University of Michigan +# All Rights Reserved # -#This code is part of the M5 simulator, developed by Nathan Binkert, -#Erik Hallnor, Steve Raasch, and Steve Reinhardt, with contributions -#from Ron Dreslinski, Dave Greene, Lisa Hsu, Ali Saidi, and Andrew -#Schultz. +# This code is part of the M5 simulator, developed by Nathan Binkert, +# Erik Hallnor, Steve Raasch, and Steve Reinhardt, with contributions +# from Ron Dreslinski, Dave Greene, Lisa Hsu, Ali Saidi, and Andrew +# Schultz. # -#Permission is granted to use, copy, create derivative works and -#redistribute this software and such derivative works for any purpose, -#so long as the copyright notice above, this grant of permission, and -#the disclaimer below appear in all copies made; and so long as the -#name of The University of Michigan is not used in any advertising or -#publicity pertaining to the use or distribution of this software -#without specific, written prior authorization. +# Permission is granted to use, copy, create derivative works and +# redistribute this software and such derivative works for any purpose, +# so long as the copyright notice above, this grant of permission, and +# the disclaimer below appear in all copies made; and so long as the +# name of The University of Michigan is not used in any advertising or +# publicity pertaining to the use or distribution of this software +# without specific, written prior authorization. # -#THIS SOFTWARE IS PROVIDED AS IS, WITHOUT REPRESENTATION FROM THE -#UNIVERSITY OF MICHIGAN AS TO ITS FITNESS FOR ANY PURPOSE, AND WITHOUT -#WARRANTY BY THE UNIVERSITY OF MICHIGAN OF ANY KIND, EITHER EXPRESS OR -#IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF -#MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE REGENTS OF -#THE UNIVERSITY OF MICHIGAN SHALL NOT BE LIABLE FOR ANY DAMAGES, -#INCLUDING DIRECT, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -#DAMAGES, WITH RESPECT TO ANY CLAIM ARISING OUT OF OR IN CONNECTION -#WITH THE USE OF THE SOFTWARE, EVEN IF IT HAS BEEN OR IS HEREAFTER -#ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -DBMENTRY = fffffc0000010000 -CFLAGS=-I . -I ../h -I$(M5)/dev -nostdinc++ -Wa,-m21164 - -ARCHNAME=$(shell uname -m) +# THIS SOFTWARE IS PROVIDED AS IS, WITHOUT REPRESENTATION FROM THE +# UNIVERSITY OF MICHIGAN AS TO ITS FITNESS FOR ANY PURPOSE, AND WITHOUT +# WARRANTY BY THE UNIVERSITY OF MICHIGAN OF ANY KIND, EITHER EXPRESS OR +# IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE REGENTS OF +# THE UNIVERSITY OF MICHIGAN SHALL NOT BE LIABLE FOR ANY DAMAGES, +# INCLUDING DIRECT, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +# DAMAGES, WITH RESPECT TO ANY CLAIM ARISING OUT OF OR IN CONNECTION +# WITH THE USE OF THE SOFTWARE, EVEN IF IT HAS BEEN OR IS HEREAFTER +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. ### If we are not compiling on an alpha, we must use cross tools ### -ifneq ($(ARCHNAME), alpha) +ifneq ($(shell uname -m), alpha) CROSS_COMPILE?=alpha-unknown-linux-gnu- endif CC=$(CROSS_COMPILE)gcc AS=$(CROSS_COMPILE)as LD=$(CROSS_COMPILE)ld +DBMENTRY= fffffc0000010000 +CFLAGS=-I . -I ../h -I$(M5)/dev -fno-builtin -Wa,-m21164 OBJS=dbmentry.o printf.o paljtokern.o paljtoslave.o TLOBJS+=$(OBJS) console_tl.o TSOBJS+=$(OBJS) console_ts.o @@ -54,19 +51,19 @@ all: console_tl console_ts $(CC) $(CFLAGS) -nostdinc -o $@ -c $< console_ts.o: console.c - $(CC) -g3 $(CFLAGS) -D _TIME_T -D TSUNAMI -o $@ -c $< + $(CC) -g3 $(CFLAGS) -D TSUNAMI -o $@ -c $< console_tl.o: console.c - $(CC) -g3 $(CFLAGS) -D _TIME_T -D TLASER -o $@ -c $< + $(CC) -g3 $(CFLAGS) -D TLASER -o $@ -c $< printf.o: printf.c $(CC) -g3 $(CFLAGS) -o $@ -c $< console_ts: $(TSOBJS) - $(LD) -o console_ts -N -Ttext $(DBMENTRY) -non_shared $(TSOBJS) -lc + $(LD) -o console_ts -N -Ttext $(DBMENTRY) -non_shared $(TSOBJS) -lc console_tl: $(TLOBJS) - $(LD) -o console_tl -N -Ttext $(DBMENTRY) -non_shared $(TLOBJS) -lc + $(LD) -o console_tl -N -Ttext $(DBMENTRY) -non_shared $(TLOBJS) -lc clean: rm -f *.o console_t? -- cgit v1.2.3