2 files changed, 13 insertions, 9 deletions
diff --git a/system/alpha/console/Makefile b/system/alpha/console/Makefile
index 4a5cba216..48a6288a3 100644
--- a/system/alpha/console/Makefile
+++ b/system/alpha/console/Makefile
@@ -7,6 +7,10 @@ INCLUDES        = -I$(PALCODE) -I$(INCLUDEH) -I$(M5)/dev
 SOURDIR = ./
 PALCODE  = ../palcode
 INCLUDEH = ../h
+AS=alpha-elf-as
+CC=alpha-elf-gcc
+CXX=alpha-elf-$(CXX)
+
 
 dbmentry.o: dbmentry.s 
 	$(AS)  $(INCLUDES) -nointrinsics -o $*.o $*.s
@@ -18,12 +22,12 @@ printf.o: printf.c
 	$(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
+	$(CXX) -I ../palcode -E -P -nostdinc -nostdinc++ -x c++ paljtokern.s | \
+	$(AS) -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
+	$(CXX) -I ../palcode -E -P -nostdinc -nostdinc++ -x c++ paljtoslave.s | \
+	$(AS) -m 21164 -o paljtoslave.s.o
 
 paljtokern.c: paljtokern.s.o
 	echo 'unsigned int palJToKern[] = {' > paljtokern.c
diff --git a/system/alpha/palcode/Makefile b/system/alpha/palcode/Makefile
index 416d347dc..071c8bc39 100644
--- a/system/alpha/palcode/Makefile
+++ b/system/alpha/palcode/Makefile
@@ -3,15 +3,15 @@
 
 #19 December 2003 - Ali Saidi
 
-GAS = as
-CC = g++
-LD = ld
+GAS = alpha-elf-as
+CC = alpha-elf-g++
+LD = alpha-elf-ld
 #CFLAGS=-I ../h -E -P -D SIMOS -nostdinc -nostdinc++ -x c++
 CFLAGS=-I . -E -P -D SIMOS -D BUILD_PALCODE -nostdinc -nostdinc++ -x c++
 GASFLAGS=-m21164
 LDFLAGS=-Ttext 0x4000
 
-SOURCES=platform_tlaser.s osfpal.s
+SOURCES=osfpal.s platform_tlaser.s
 PREPROC := $(SOURCES:.s=.i)
 OBJS := $(SOURCES:.s=.o)
     
@@ -23,7 +23,7 @@ OBJS := $(SOURCES:.s=.o)
 
 
 all: $(PREPROC) $(OBJS)
-	ld $(LDFLAGS) -o osfpal $(OBJS) 
+	$(LD) $(LDFLAGS) -o osfpal $(OBJS) 
 
 clean:
 	rm -f *.o *.i osfpal