Fix linking of user programs.

Start fixing awk.

src/cmd/adc-demo/Makefile

@@ -14,7 +14,7 @@ SRCS            = adc-demo.c
 all:            adc-demo
 
 adc-demo:       ${OBJS}
-		${CC} ${LDFLAGS} -o adc-demo.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o adc-demo.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S adc-demo.elf > adc-demo.dis
 		${SIZE} adc-demo.elf
 		${ELF2AOUT} adc-demo.elf $@

src/cmd/aout/Makefile

@@ -13,7 +13,7 @@ AOUTOBJS        = aout.o mips-dis.o
 all:            aout
 
 aout:           $(AOUTOBJS)
-		${CC} ${LDFLAGS} -o aout.elf $(AOUTOBJS) ${LIBS}
+		${LD} ${LDFLAGS} -o aout.elf $(AOUTOBJS) ${LIBS}
 		${OBJDUMP} -S aout.elf > aout.dis
 		${SIZE} aout.elf
 		${ELF2AOUT} aout.elf $@ && rm aout.elf

src/cmd/ar/Makefile

@@ -14,7 +14,7 @@ MANSRC		= ar.1 ar.5
 all:            ar $(MAN)
 
 ar:             ${OBJS}
-		${CC} ${LDFLAGS} -o ar.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o ar.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S ar.elf > ar.dis
 		${SIZE} ar.elf
 		${ELF2AOUT} ar.elf $@ && rm ar.elf

src/cmd/as/Makefile

@@ -11,7 +11,7 @@ LDFLAGS         +=
 all:            as
 
 as:             as.o
-		${CC} ${LDFLAGS} -o as.elf as.o ${LIBS}
+		${LD} ${LDFLAGS} -o as.elf as.o ${LIBS}
 		${OBJDUMP} -S as.elf > as.dis
 		${SIZE} as.elf
 		${ELF2AOUT} as.elf $@ && rm as.elf

src/cmd/awk/Makefile

@@ -11,7 +11,7 @@ SOURCE          = awk.def.h awk.g.y awk.lx.l b.c lib.c main.c parse.c \
                   proc.c freeze.c run.c tran.c
 
 awk:            $(FILES) awk.g.o
-		${CC} ${LDFLAGS} -o awk.elf $(FILES) awk.g.o ${LIBS}
+		${LD} ${LDFLAGS} -o awk.elf $(FILES) awk.g.o ${LIBS}
 		${OBJDUMP} -S awk.elf > awk.dis
 		${SIZE} awk.elf
 		${ELF2AOUT} awk.elf $@ && rm awk.elf

src/cmd/awk/awk.g.y

@@ -37,6 +37,14 @@
 #ifndef	DEBUG
 #   define PUTS(x)
 #endif
+#define YYSTYPE node *
+int yylex(void);
+void yyerror(char *s);
+node *valtonode(cell *a, int b);
+node *stat2(int a, node *b, node *c);
+node *stat3(int a, node *b, node *c, node *d);
+node *op1(int a, node *b);
+node *op2(int a, node *b, node *c);
 %}
 %%
 
@@ -48,13 +56,13 @@ program:
 begin:
 	  XBEGIN '{' stat_list '}'	{ PUTS("XBEGIN list"); $$ = $3; }
 	| begin NL
-	| 	{ PUTS("empty XBEGIN"); $$ = (hack)nullstat; }
+	| 	{ PUTS("empty XBEGIN"); $$ = nullstat; }
 	;
 
 end:
 	  XEND '{' stat_list '}'	{ PUTS("XEND list"); $$ = $3; }
 	| end NL
-	|	{ PUTS("empty END"); $$ = (hack)nullstat; }
+	|	{ PUTS("empty END"); $$ = nullstat; }
 	;
 
 compound_conditional:
@@ -160,7 +168,7 @@ pa_stat:
 
 pa_stats:
 	  pa_stats pa_stat st	{ PUTS("pa_stats pa_stat"); $$ = linkum($1, $2); }
-	|	{ PUTS("null pa_stat"); $$ = (hack)nullstat; }
+	|	{ PUTS("null pa_stat"); $$ = nullstat; }
 	| pa_stats pa_stat	{PUTS("pa_stats pa_stat"); $$ = linkum($1, $2); }
 	;
 
@@ -234,7 +242,7 @@ simple_stat:
 	| PRINTF print_list
 		{ PUTS("printf list"); $$ = stat3($1, $2, nullstat, nullstat); }
 	| expr	{ PUTS("expr"); $$ = exptostat($1); }
-	|		{ PUTS("null simple statement"); $$ = (hack)nullstat; }
+	|		{ PUTS("null simple statement"); $$ = nullstat; }
 	| error		{ yyclearin; yyerror("illegal statement"); }
 	;
 
@@ -255,7 +263,7 @@ statement:
 
 stat_list:
 	  stat_list statement	{ PUTS("stat_list stat"); $$ = linkum($1, $2); }
-	|			{ PUTS("null stat list"); $$ = (hack)nullstat; }
+	|			{ PUTS("null stat list"); $$ = nullstat; }
 	;
 
 while:

src/cmd/awk/lib.c

@@ -215,6 +215,7 @@ cell *fieldadr(n)
 
 int	errorflag	= 0;
 
+void
 yyerror(s)
         char *s;
 {

src/cmd/basic/Makefile

@@ -11,13 +11,13 @@ LIBS		= -lcurses -ltermcap -lm -lc
 all:            basic renumber
 
 basic:          ${OBJS}
-		${CC} ${LDFLAGS} -o basic.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o basic.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S basic.elf > basic.dis
 		${SIZE} basic.elf
 		${ELF2AOUT} basic.elf $@ && rm basic.elf
 
 renumber:       renumber.o
-		${CC} ${LDFLAGS} -o renumber.elf $< ${LIBS}
+		${LD} ${LDFLAGS} -o renumber.elf $< ${LIBS}
 		${OBJDUMP} -S renumber.elf > renumber.dis
 		${SIZE} renumber.elf
 		${ELF2AOUT} renumber.elf $@ && rm renumber.elf

src/cmd/calendar/Makefile

@@ -10,7 +10,7 @@ MANSRC          = calendar.1
 all:            calendar $(MAN)
 
 calendar:          ${OBJS}
-		${CC} ${LDFLAGS} -o calendar.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o calendar.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S calendar.elf > calendar.dis
 		${SIZE} calendar.elf
 		${ELF2AOUT} calendar.elf $@ && rm calendar.elf

src/cmd/cc/Makefile

@@ -15,7 +15,7 @@ CFLAGS          += -DVERSSTR=\"1.0\" \
 all:            cc
 
 cc:             $(OBJS)
-		${CC} ${LDFLAGS} -o cc.elf $(OBJS) ${LIBS}
+		${LD} ${LDFLAGS} -o cc.elf $(OBJS) ${LIBS}
 		${OBJDUMP} -S cc.elf > cc.dis
 		${SIZE} cc.elf
 		${ELF2AOUT} cc.elf $@ && rm cc.elf

src/cmd/ccom/Makefile

@@ -22,7 +22,7 @@ MANSRC		= ccom.1
 all:            ccom $(MAN)
 
 ccom:           ${OBJS}
-		${CC} ${LDFLAGS} -o ccom.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o ccom.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S ccom.elf > ccom.dis
 		${SIZE} ccom.elf
 		${ELF2AOUT} ccom.elf $@ && rm ccom.elf

src/cmd/chflags/Makefile

@@ -14,7 +14,7 @@ MANSRC		= chflags.1
 all:            chflags chflags.0
 
 chflags:        ${OBJS}
-		${CC} ${LDFLAGS} -o chflags.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o chflags.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S chflags.elf > chflags.dis
 		${SIZE} chflags.elf
 		${ELF2AOUT} chflags.elf $@ && rm chflags.elf

src/cmd/chpass/Makefile

@@ -27,7 +27,7 @@ MANSRC		= chpass.1
 all:            chpass chpass.0
 
 chpass:         ${OBJS}
-		${CC} ${LDFLAGS} -o chpass.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o chpass.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S chpass.elf > chpass.dis
 		${SIZE} chpass.elf
 		${ELF2AOUT} chpass.elf $@ && rm chpass.elf

src/cmd/chroot/Makefile

@@ -25,7 +25,7 @@ MANSRC          = chroot.8
 all:            chroot ${MAN}
 
 chroot:         ${OBJS}
-		${CC} ${LDFLAGS} -o chroot.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o chroot.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S chroot.elf > chroot.dis
 		${SIZE} chroot.elf
 		${ELF2AOUT} chroot.elf $@ && rm chroot.elf

src/cmd/compress/Makefile

@@ -11,7 +11,7 @@ OBJS 		= compress.o
 CFLAGS          += -DUSERMEM=1024 -Wall -Werror
 
 compress: $(OBJS)
-	${CC} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
+	${LD} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@

src/cmd/cpp/Makefile

@@ -16,7 +16,7 @@ CFLAGS          += -DGCC_COMPAT -DHAVE_CPP_VARARG_MACRO_GCC
 all:            cpp $(MAN)
 
 cpp:            $(OBJS)
-		${CC} ${LDFLAGS} -o cpp.elf $(OBJS) ${LIBS}
+		${LD} ${LDFLAGS} -o cpp.elf $(OBJS) ${LIBS}
 		${OBJDUMP} -S cpp.elf > cpp.dis
 		${SIZE} cpp.elf
 		${ELF2AOUT} cpp.elf $@ && rm cpp.elf

src/cmd/cron/Makefile

@@ -84,13 +84,13 @@ lint:
 		|grep -v "constant argument to NOT" 2>&1
 
 cron:	$(CRON_OBJ)
-		${CC} ${LDFLAGS} -o $@.elf ${CRON_OBJ} ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf ${CRON_OBJ} ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@
 
 crontab:	$(CRONTAB_OBJ)
-		${CC} ${LDFLAGS} -o $@.elf ${CRONTAB_OBJ} ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf ${CRONTAB_OBJ} ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@

src/cmd/csh/Makefile

@@ -22,7 +22,7 @@ OBJS            = alloc.o printf.o sh.char.o sh.dir.o sh.dol.o \
 all:		csh
 
 csh:		${OBJS}
-		${CC} ${LDFLAGS} -o csh.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o csh.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S csh.elf > csh.dis
 		${SIZE} csh.elf
 		${ELF2AOUT} csh.elf $@ && rm csh.elf

src/cmd/date2/Makefile

@@ -13,7 +13,7 @@ OBJS            = $(BIN).o
 all:            $(BIN)
 
 $(BIN):    ${OBJS}
-		${CC} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@

src/cmd/dc/Makefile

@@ -7,7 +7,7 @@ OBJS            = dc.o
 all:            dc
 
 dc:             ${OBJS}
-		${CC} ${LDFLAGS} -o dc.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o dc.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S dc.elf > dc.dis
 		${SIZE} dc.elf
 		${ELF2AOUT} dc.elf $@ && rm dc.elf

src/cmd/devupdate/Makefile

@@ -13,7 +13,7 @@ OBJS            = $(BIN).o
 all:            $(BIN)
 
 $(BIN):    ${OBJS}
-		${CC} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@

src/cmd/diff/Makefile

@@ -14,13 +14,13 @@ CFLAGS          += -DDIFF='"${DIFF}"' -DDIFFH='"${DIFFH}"' -DPR='"${PR}"'
 all:            diff diffh
 
 diff:           ${OBJS}
-		${CC} ${LDFLAGS} -o diff.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o diff.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S diff.elf > diff.dis
 		${SIZE} diff.elf
 		${ELF2AOUT} diff.elf $@ && rm diff.elf
 
 diffh:          diffh.o
-		${CC} ${LDFLAGS} -o diffh.elf $< ${LIBS}
+		${LD} ${LDFLAGS} -o diffh.elf $< ${LIBS}
 		${OBJDUMP} -S diffh.elf > diffh.dis
 		${SIZE} diffh.elf
 		${ELF2AOUT} diffh.elf $@ && rm diffh.elf

src/cmd/disktool/Makefile

@@ -9,7 +9,7 @@ OBJS		= disktool.o
 all:            disktool
 
 disktool:       ${OBJS}
-		${CC} ${LDFLAGS} -o disktool.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o disktool.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S disktool.elf > disktool.dis
 		${SIZE} disktool.elf
 		${ELF2AOUT} disktool.elf $@ && rm disktool.elf

src/cmd/emg/Makefile

@@ -27,7 +27,7 @@ OBJS =	basic.o buffer.o display.o file.o fileio.o line.o main.o \
 all:	emg ${MAN}
 
 emg:	${OBJS}
-	${CC} ${LDFLAGS} -o emg.elf ${OBJS} ${LIBS}
+	${LD} ${LDFLAGS} -o emg.elf ${OBJS} ${LIBS}
 	${OBJDUMP} -S emg.elf > emg.dis
 	${SIZE} emg.elf
 	${ELF2AOUT} emg.elf $@ && rm emg.elf

src/cmd/env/Makefile

@@ -15,7 +15,7 @@ CFLAGS          += -DVERSSTR=\"1.0\" \
 all:            env
 
 env:            $(OBJS)
-		${CC} ${LDFLAGS} -o env.elf $(OBJS) ${LIBS}
+		${LD} ${LDFLAGS} -o env.elf $(OBJS) ${LIBS}
 		${OBJDUMP} -S env.elf > env.dis
 		${SIZE} env.elf
 		${ELF2AOUT} env.elf $@ && rm env.elf

src/cmd/fdisk/Makefile

@@ -14,7 +14,7 @@ MAN             = $(BIN).0
 all:            $(BIN) ${MAN}
 
 $(BIN):    ${OBJS}
-		${CC} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@

src/cmd/find/Makefile

@@ -8,19 +8,19 @@ SRCS            = find.c bigram.c code.c
 all:            find bigram code
 
 find:           find.o
-		${CC} ${LDFLAGS} -o find.elf $< ${LIBS}
+		${LD} ${LDFLAGS} -o find.elf $< ${LIBS}
 		${OBJDUMP} -S find.elf > find.dis
 		${SIZE} find.elf
 		${ELF2AOUT} find.elf $@ && rm find.elf
 
 bigram:         bigram.o
-		${CC} ${LDFLAGS} -o bigram.elf $< ${LIBS}
+		${LD} ${LDFLAGS} -o bigram.elf $< ${LIBS}
 		${OBJDUMP} -S bigram.elf > bigram.dis
 		${SIZE} bigram.elf
 		${ELF2AOUT} bigram.elf $@ && rm bigram.elf
 
 code:           code.o
-		${CC} ${LDFLAGS} -o code.elf $< ${LIBS}
+		${LD} ${LDFLAGS} -o code.elf $< ${LIBS}
 		${OBJDUMP} -S code.elf > code.dis
 		${SIZE} code.elf
 		${ELF2AOUT} code.elf $@ && rm code.elf

src/cmd/fold/Makefile

@@ -10,7 +10,7 @@ MANSRC          = fold.1
 all:            fold $(MAN)
 
 fold:          ${OBJS}
-		${CC} ${LDFLAGS} -o fold.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o fold.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S fold.elf > fold.dis
 		${SIZE} fold.elf
 		${ELF2AOUT} fold.elf $@ && rm fold.elf

src/cmd/forth/Makefile

@@ -10,7 +10,7 @@ OBJS            = forth.o func.o
 all:            forth
 
 forth:          ${OBJS}
-		${CC} ${LDFLAGS} -o forth.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o forth.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S forth.elf > forth.dis
 		${SIZE} forth.elf
 		${ELF2AOUT} forth.elf $@ && rm forth.elf

src/cmd/fsck/Makefile

@@ -35,7 +35,7 @@ HDRS		= fsck.h
 all:		${PROG}
 
 ${PROG}:	${OBJS} ${HDRS}
-		${CC} ${LDFLAGS} -o fsck.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o fsck.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S fsck.elf > fsck.dis
 		${SIZE} fsck.elf
 		${ELF2AOUT} fsck.elf $@ && rm fsck.elf

src/cmd/fstat/Makefile

@@ -14,7 +14,7 @@ MANSRC		= fstat.8
 all:            fstat fstat.0
 
 fstat:          ${OBJS}
-		${CC} ${LDFLAGS} -o fstat.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o fstat.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S fstat.elf > fstat.dis
 		${SIZE} fstat.elf
 		${ELF2AOUT} fstat.elf $@ && rm fstat.elf

src/cmd/getty/Makefile

@@ -13,7 +13,7 @@ OBJS		= main.o init.o subr.o gettytab.o get_date.o
 all:            getty
 
 getty:          ${OBJS}
-		${CC} ${LDFLAGS} -o getty.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o getty.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S getty.elf > getty.dis
 		${SIZE} getty.elf
 		${ELF2AOUT} getty.elf $@ && rm getty.elf

src/cmd/glcdtest/Makefile

@@ -12,7 +12,7 @@ OBJS            = glcdtest.o
 all:            glcdtest
 
 glcdtest:    ${OBJS}
-		${CC} ${LDFLAGS} -o glcdtest.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o glcdtest.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S glcdtest.elf > glcdtest.dis
 		${SIZE} glcdtest.elf
 		${ELF2AOUT} glcdtest.elf $@

src/cmd/gtest/Makefile

@@ -12,19 +12,19 @@ OBJS            = globread.o globwrite.o
 all:            globread globwrite globdump
 
 globread:	globread.o
-		${CC} ${LDFLAGS} -o $@.elf $< ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf $< ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@
 
 globdump:	globdump.o
-		${CC} ${LDFLAGS} -o $@.elf $< ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf $< ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@
 
 globwrite:	globwrite.o
-		${CC} ${LDFLAGS} -o $@.elf $< ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf $< ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@

src/cmd/hostname/Makefile

@@ -13,7 +13,7 @@ MAN             = hostname.0
 all:            hostname ${MAN}
 
 hostname:       ${OBJS}
-		${CC} ${LDFLAGS} -o hostname.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o hostname.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S hostname.elf > hostname.dis
 		${SIZE} hostname.elf
 		${ELF2AOUT} hostname.elf $@ && rm hostname.elf

src/cmd/id/Makefile

@@ -15,7 +15,7 @@ all:            id ${MAN}
 		install -c whoami.sh whoami
 
 id:             ${OBJS}
-		${CC} ${LDFLAGS} -o id.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o id.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S id.elf > id.dis
 		${SIZE} id.elf
 		${ELF2AOUT} id.elf $@ && rm id.elf

src/cmd/init/Makefile

@@ -11,7 +11,7 @@ MANSRC		= init.8
 all:		init init.0
 
 init:		${OBJS}
-		${CC} ${LDFLAGS} -o init.elf ${OBJS} -lc
+		${LD} ${LDFLAGS} -o init.elf ${OBJS} -lc
 		${OBJDUMP} -S init.elf > init.dis
 		${SIZE} init.elf
 		${ELF2AOUT} init.elf $@ && rm init.elf

src/cmd/la/Makefile

@@ -14,7 +14,7 @@ MANSRC		= la.1
 all:            la $(MAN)
 
 la:          	${OBJS}
-		${CC} ${LDFLAGS} -o la.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o la.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S la.elf > la.dis
 		${SIZE} la.elf
 		${ELF2AOUT} la.elf $@ && rm la.elf

src/cmd/lcc/Makefile

@@ -12,19 +12,19 @@ CFLAGS		+= -Werror -Wall -Os
 all:            lcc $(MAN)
 
 lcc:            $(OBJS)
-		${CC} ${LDFLAGS} -o lcc.elf $(OBJS) ${LIBS}
+		${LD} ${LDFLAGS} -o lcc.elf $(OBJS) ${LIBS}
 		${OBJDUMP} -S lcc.elf > lcc.dis
 		${SIZE} lcc.elf
 		${ELF2AOUT} lcc.elf $@ && rm lcc.elf
 
 bprint:         bprint.o ../lccom/profio.c
-		${CC} ${LDFLAGS} -o bprint.elf bprint.o ${LIBS}
+		${LD} ${LDFLAGS} -o bprint.elf bprint.o ${LIBS}
 		${OBJDUMP} -S bprint.elf > bprint.dis
 		${SIZE} bprint.elf
 		${ELF2AOUT} bprint.elf $@ && rm bprint.elf
 
 ops:            ops.o ../lccom/c.h ../lccom/ops.h
-		${CC} ${LDFLAGS} -o ops.elf ops.o ${LIBS}
+		${LD} ${LDFLAGS} -o ops.elf ops.o ${LIBS}
 		${OBJDUMP} -S ops.elf > ops.dis
 		${SIZE} ops.elf
 		${ELF2AOUT} ops.elf $@ && rm ops.elf

src/cmd/lccom/Makefile

@@ -40,7 +40,7 @@ build:
 # lccom: the C compiler
 #
 lccom:          ${OBJS}
-		${CC} ${LDFLAGS} -o lccom.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o lccom.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S lccom.elf > lccom.dis
 		${SIZE} lccom.elf
 		${ELF2AOUT} lccom.elf $@ && rm lccom.elf

src/cmd/lcpp/Makefile

@@ -12,7 +12,7 @@ CFLAGS		+= -Werror -Wall -Os
 all:            lcpp
 
 lcpp:           $(OBJS)
-		${CC} ${LDFLAGS} -o lcpp.elf $(OBJS) ${LIBS}
+		${LD} ${LDFLAGS} -o lcpp.elf $(OBJS) ${LIBS}
 		${OBJDUMP} -S lcpp.elf > lcpp.dis
 		${SIZE} lcpp.elf
 		${ELF2AOUT} lcpp.elf $@ && rm lcpp.elf

src/cmd/ld/Makefile

@@ -16,7 +16,7 @@ MANSRC		= ld.1
 all:            ld $(MAN)
 
 ld:             ${OBJS}
-		${CC} ${LDFLAGS} -o ld.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o ld.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S ld.elf > ld.dis
 		${SIZE} ld.elf
 		${ELF2AOUT} ld.elf $@ && rm ld.elf

src/cmd/login/Makefile

@@ -26,7 +26,7 @@ OBJS		= login.o
 all:            login
 
 login:       	${OBJS}
-		${CC} ${LDFLAGS} -o login.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o login.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S login.elf > login.dis
 		${SIZE} login.elf
 		${ELF2AOUT} login.elf $@ && rm login.elf

src/cmd/ls/Makefile

@@ -11,7 +11,7 @@ OBJS		= ls.o stat_flags.o
 all:		ls
 
 ls:		${OBJS}
-		${CC} ${LDFLAGS} -o ls.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o ls.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S ls.elf > ls.dis
 		${SIZE} ls.elf
 		${ELF2AOUT} ls.elf $@ && rm ls.elf

src/cmd/make/Makefile

@@ -12,7 +12,7 @@ OBJS            = main.o doname.o misc.o files.o dosys.o gram.o
 all:            xmake
 
 xmake:          ${OBJS}
-		${CC} ${LDFLAGS} -o make.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o make.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S make.elf > make.dis
 		${SIZE} make.elf
 		${ELF2AOUT} make.elf $@ && rm make.elf

src/cmd/man/Makefile

@@ -25,13 +25,13 @@ OBJS		= man.o
 all:            man apropos
 
 man:            ${OBJS}
-		${CC} ${LDFLAGS} -o man.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o man.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S man.elf > man.dis
 		${SIZE} man.elf
 		${ELF2AOUT} man.elf $@ && rm man.elf
 
 apropos:        ${OBJS}
-		${CC} ${LDFLAGS} -o apropos.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o apropos.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S apropos.elf > apropos.dis
 		${SIZE} apropos.elf
 		${ELF2AOUT} apropos.elf $@ && rm apropos.elf

src/cmd/md5/Makefile

@@ -16,7 +16,7 @@ MANSRC		= md5.1
 all:            md5 $(MAN)
 
 md5:             ${OBJS}
-		${CC} ${LDFLAGS} -o md5.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o md5.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S md5.elf > md5.dis
 		${SIZE} md5.elf
 		${ELF2AOUT} md5.elf $@ && rm md5.elf

src/cmd/med/Makefile

@@ -15,7 +15,7 @@ LIBS            += -lcurses -ltermcap -lvmf -lc
 all:            med
 
 med: 		${OBJS}
-		${CC} ${LDFLAGS} -o med.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o med.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S med.elf > med.dis
 		${SIZE} med.elf
 		${ELF2AOUT} med.elf $@ && rm med.elf

src/cmd/mkfs/Makefile

@@ -15,7 +15,7 @@ MANSRC		= mkfs.8
 all:		mkfs mkfs.0
 
 mkfs:		${OBJS}
-		${CC} ${LDFLAGS} -o mkfs.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o mkfs.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S mkfs.elf > mkfs.dis
 		${SIZE} mkfs.elf
 		${ELF2AOUT} mkfs.elf $@ && rm mkfs.elf

src/cmd/mknod/Makefile

@@ -14,7 +14,7 @@ MANSRC		= mknod.8
 all:            mknod mknod.0
 
 mknod:       	${OBJS}
-		${CC} ${LDFLAGS} -o mknod.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o mknod.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S mknod.elf > mknod.dis
 		${SIZE} mknod.elf
 		${ELF2AOUT} mknod.elf $@ && rm mknod.elf

src/cmd/mkpasswd/Makefile

@@ -27,7 +27,7 @@ MANSRC		= mkpasswd.8
 all:            mkpasswd ${MAN}
 
 mkpasswd:    	${OBJS}
-		${CC} ${LDFLAGS} -o mkpasswd.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o mkpasswd.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S mkpasswd.elf > mkpasswd.dis
 		${SIZE} mkpasswd.elf
 		${ELF2AOUT} mkpasswd.elf $@ && rm mkpasswd.elf

src/cmd/more/Makefile

@@ -14,7 +14,7 @@ OBJS		= more.o
 all:            more
 
 more:        	${OBJS}
-		${CC} ${LDFLAGS} -o more.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o more.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S more.elf > more.dis
 		${SIZE} more.elf
 		${ELF2AOUT} more.elf $@ && rm more.elf

src/cmd/mount/Makefile

@@ -14,7 +14,7 @@ MANSRC		= mount.8
 all:            mount ${MAN}
 
 mount:       	${OBJS}
-		${CC} ${LDFLAGS} -o mount.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o mount.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S mount.elf > mount.dis
 		${SIZE} mount.elf
 		${ELF2AOUT} mount.elf $@ && rm mount.elf

src/cmd/msec/Makefile

@@ -14,7 +14,7 @@ MAN             = $(BIN).0
 all:            $(BIN) ${MAN}
 
 $(BIN):    ${OBJS}
-		${CC} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@

src/cmd/nm/Makefile

@@ -10,7 +10,7 @@ OBJS		= nm.o
 all:            nm
 
 nm:          	${OBJS}
-		${CC} ${LDFLAGS} -o nm.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o nm.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S nm.elf > nm.dis
 		${SIZE} nm.elf
 		${ELF2AOUT} nm.elf $@ && rm nm.elf

src/cmd/passwd/Makefile

@@ -27,7 +27,7 @@ MANSRC		= passwd.1
 all:            passwd ${MAN}
 
 passwd:     	${OBJS}
-		${CC} ${LDFLAGS} -o passwd.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o passwd.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S passwd.elf > passwd.dis
 		${SIZE} passwd.elf
 		${ELF2AOUT} passwd.elf $@ && rm passwd.elf

src/cmd/pdc/Makefile

@@ -14,7 +14,7 @@ LIBS            = -lreadline -lc
 all:            pdc
 
 pdc:            $(OBJS)
-		${CC} ${LDFLAGS} -o pdc.elf $(OBJS) ${LIBS}
+		${LD} ${LDFLAGS} -o pdc.elf $(OBJS) ${LIBS}
 		${OBJDUMP} -S pdc.elf > pdc.dis
 		${SIZE} pdc.elf
 		${ELF2AOUT} pdc.elf $@ && rm pdc.elf

src/cmd/pforth/Makefile

@@ -33,7 +33,7 @@ OBJS            += pf_io_stdio.o
 all:            ../pforth ../../lib/pforth.dic
 
 ../pforth:      ${OBJS}
-		${CC} ${LDFLAGS} -o pforth.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o pforth.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S pforth.elf > pforth.dis
 		${SIZE} pforth.elf
 		${ELF2AOUT} pforth.elf $@

src/cmd/picoc/Makefile

@@ -19,7 +19,7 @@ OBJS            := $(SRCS:%.c=%.o)
 all:            $(TARGET)
 
 $(TARGET):      $(OBJS)
-		${CC} ${LDFLAGS} -o ${TARGET}.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o ${TARGET}.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S ${TARGET}.elf > ${TARGET}.dis
 		${SIZE} ${TARGET}.elf
 		${ELF2AOUT} ${TARGET}.elf $@

src/cmd/portio/Makefile

@@ -9,13 +9,13 @@ OBJS		= portio.o
 all:            portio lol
 
 portio:         ${OBJS}
-		${CC} ${LDFLAGS} -o portio.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o portio.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S portio.elf > portio.dis
 		${SIZE} portio.elf
 		${ELF2AOUT} portio.elf $@ && rm portio.elf
 
 lol:            lol.o
-		${CC} ${LDFLAGS} -o lol.elf lol.o ${LIBS}
+		${LD} ${LDFLAGS} -o lol.elf lol.o ${LIBS}
 		${OBJDUMP} -S lol.elf > lol.dis
 		${SIZE} lol.elf
 		${ELF2AOUT} lol.elf $@ && rm lol.elf

src/cmd/printf/Makefile

@@ -14,7 +14,7 @@ MANSRC		= printf.1
 all:            printf ${MAN}
 
 printf:         ${OBJS}
-		${CC} ${LDFLAGS} -o printf.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o printf.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S printf.elf > printf.dis
 		${SIZE} printf.elf
 		${ELF2AOUT} printf.elf $@ && rm printf.elf

src/cmd/pstat/Makefile

@@ -14,7 +14,7 @@ MANSRC          = pstat.8
 all:            pstat ${MAN}
 
 pstat:          ${OBJS}
-		${CC} ${LDFLAGS} -o pstat.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o pstat.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S pstat.elf > pstat.dis
 		${SIZE} pstat.elf
 		${ELF2AOUT} pstat.elf $@ && rm pstat.elf

src/cmd/pwm/Makefile

@@ -12,7 +12,7 @@ OBJS            = pwm.o
 all:            pwm
 
 pwm:    ${OBJS}
-		${CC} ${LDFLAGS} -o pwm.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o pwm.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S pwm.elf > pwm.dis
 		${SIZE} pwm.elf
 		${ELF2AOUT} pwm.elf $@

src/cmd/ranlib/Makefile

@@ -13,7 +13,7 @@ MANSRC		= ranlib.1
 all:            ranlib $(MAN)
 
 ranlib:         ${OBJS}
-		${CC} ${LDFLAGS} -o ranlib.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o ranlib.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S ranlib.elf > ranlib.dis
 		${SIZE} ranlib.elf
 		${ELF2AOUT} ranlib.elf $@

src/cmd/re/Makefile

@@ -17,7 +17,7 @@ OBJS            = r.cmd.o r.edit.o r.file.o r.gettc.o r.misc.o \
 all:            re
 
 re:          	${OBJS}
-		${CC} ${LDFLAGS} -o re.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o re.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S re.elf > re.dis
 		${SIZE} re.elf
 		${ELF2AOUT} re.elf $@

src/cmd/reboot/Makefile

@@ -9,7 +9,7 @@ MANSRC          = reboot.8
 all:            reboot ${MAN}
 
 reboot:         ${OBJS}
-		${CC} ${LDFLAGS} -o reboot.elf ${OBJS} -lc
+		${LD} ${LDFLAGS} -o reboot.elf ${OBJS} -lc
 		${OBJDUMP} -S reboot.elf > reboot.dis
 		${SIZE} reboot.elf
 		${ELF2AOUT} reboot.elf $@

src/cmd/renice/Makefile

@@ -14,7 +14,7 @@ MANSRC		= renice.8
 all:            renice ${MAN}
 
 renice:         ${OBJS}
-		${CC} ${LDFLAGS} -o renice.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o renice.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S renice.elf > renice.dis
 		${SIZE} renice.elf
 		${ELF2AOUT} renice.elf $@ && rm renice.elf

src/cmd/retroforth/Makefile

@@ -11,7 +11,7 @@ LIBS            += -ltermcap
 all:            $(BIN)
 
 $(BIN):         ${SRCS}
-		${CC} ${LDFLAGS} -o $(BIN).elf $(SRCS) ${LIBS}
+		${LD} ${LDFLAGS} -o $(BIN).elf $(SRCS) ${LIBS}
 		${SIZE} $(BIN).elf
 		${OBJDUMP} -S $(BIN).elf > $(BIN).dis
 		${ELF2AOUT} $(BIN).elf $@ && rm $(BIN).elf

src/cmd/scm/Makefile

@@ -10,7 +10,7 @@ TESTS           = tests/*.scm
 all:            scm ${MAN}
 
 scm:            ${OBJS}
-		${CC} ${LDFLAGS} -o scm.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o scm.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S scm.elf > scm.dis
 		${SIZE} scm.elf
 		${ELF2AOUT} scm.elf $@ && rm scm.elf

src/cmd/sed/Makefile

@@ -9,7 +9,7 @@ OBJS		= sed0.o sed1.o
 all:            sed
 
 sed:            ${OBJS}
-		${CC} ${LDFLAGS} -o sed.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o sed.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S sed.elf > sed.dis
 		${SIZE} sed.elf
 		${ELF2AOUT} sed.elf $@ && rm sed.elf

src/cmd/setty/Makefile

@@ -15,7 +15,7 @@ LIBS            += -lcurses -ltermcap
 all:            setty
 
 setty:          ${OBJS}
-		${CC} ${LDFLAGS} -o setty.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o setty.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S setty.elf > setty.dis
 		${SIZE} setty.elf
 		${ELF2AOUT} setty.elf $@ && rm setty.elf

src/cmd/sh/Makefile

@@ -9,7 +9,7 @@ OBJS            = setbrk.o blok.o stak.o cmd.o fault.o main.o word.o \
 all:		sh
 
 sh:		${OBJS}
-		${CC} ${LDFLAGS} -o sh.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o sh.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S sh.elf > sh.dis
 		${SIZE} sh.elf
 		${ELF2AOUT} sh.elf $@ && rm sh.elf

src/cmd/shutdown/Makefile

@@ -15,7 +15,7 @@ MANSRC		= shutdown.8
 all:            shutdown ${MAN}
 
 shutdown:       ${OBJS}
-		${CC} ${LDFLAGS} -o shutdown.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o shutdown.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S shutdown.elf > shutdown.dis
 		${SIZE} shutdown.elf
 		${ELF2AOUT} shutdown.elf $@ && rm shutdown.elf

src/cmd/sl/Makefile

@@ -15,7 +15,7 @@ LIBS            += -lcurses -ltermcap -lc
 all:            sl
 
 sl:             ${OBJS}
-		${CC} ${LDFLAGS} -o sl.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o sl.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S sl.elf > sl.dis
 		${SIZE} sl.elf
 		${ELF2AOUT} sl.elf $@ && rm sl.elf

src/cmd/smallc/Makefile

@@ -13,7 +13,7 @@ OBJS            = data.o error.o expr.o function.o gen.o initialise.o io.o lex.o
 all:		smallc
 
 smallc: 	$(OBJS)
-		${CC} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@

src/cmd/smlrc/Makefile

@@ -20,7 +20,7 @@ OBJS            = smlrc.o lb.o
 all:		smlrc
 
 smlrc:          $(OBJS)
-		${CC} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@

src/cmd/smux/retro/Makefile

@@ -13,10 +13,10 @@ OBJS            = smux.o
 all: smux
 
 smux: $(OBJS)
-			${CC} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
-			${OBJDUMP} -S $@.elf > $@.dis
+		${OBJDUMP} -S $@.elf > $@.dis
-			${SIZE} $@.elf
+		${SIZE} $@.elf
-			${ELF2AOUT} $@.elf $@
+		${ELF2AOUT} $@.elf $@
 
 clean:
 		rm -f *.o *.elf *.elf *.dis tags *~ $(BIN)

src/cmd/stty/Makefile

@@ -14,7 +14,7 @@ MANSRC		= stty.1
 all:		stty ${MAN}
 
 stty:		${OBJS}
-		${CC} ${LDFLAGS} -o stty.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o stty.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S stty.elf > stty.dis
 		${SIZE} stty.elf
 		${ELF2AOUT} stty.elf $@ && rm stty.elf

src/cmd/sysctl/Makefile

@@ -14,7 +14,7 @@ MANSRC          = sysctl.8
 all:            sysctl $(MAN)
 
 sysctl:      	${OBJS}
-		${CC} ${LDFLAGS} -o sysctl.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o sysctl.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S sysctl.elf > sysctl.dis
 		${SIZE} sysctl.elf
 		${ELF2AOUT} sysctl.elf $@ && rm sysctl.elf

src/cmd/talloc/Makefile

@@ -14,7 +14,7 @@ MAN         = $(BIN).0
 all:            $(BIN) ${MAN}
 
 $(BIN):    ${OBJS}
-		${CC} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@

src/cmd/tcl/Makefile

@@ -12,7 +12,7 @@ LIBS		= -ltcl
 all:            tcl
 
 tcl:         	${OBJS}
-		${CC} ${LDFLAGS} -o tcl.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o tcl.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S tcl.elf > tcl.dis
 		${SIZE} tcl.elf
 		${ELF2AOUT} tcl.elf $@ && rm tcl.elf

src/cmd/test/Makefile

@@ -18,7 +18,7 @@ MANSRC          = test.1
 all:            test $(MAN)
 
 test:        	${OBJS}
-		${CC} ${LDFLAGS} -o test.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o test.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S test.elf > test.dis
 		${SIZE} test.elf
 		${ELF2AOUT} test.elf $@ && rm test.elf

src/cmd/tip/Makefile

@@ -53,7 +53,7 @@ OBJS    = acu.o acutab.o cmds.o cmdtab.o cu.o hunt.o log.o partab.o remcap.o \
 all: aculib tip
 
 tip:    ${OBJS}
-	${CC} ${LDFLAGS} -o tip.elf ${OBJS} ${LIBS}
+	${LD} ${LDFLAGS} -o tip.elf ${OBJS} ${LIBS}
 	${OBJDUMP} -S tip.elf > tip.dis
 	${SIZE} tip.elf
 	${ELF2AOUT} tip.elf $@

src/cmd/umount/Makefile

@@ -14,7 +14,7 @@ MANSRC		= umount.8
 all:            umount umount.0
 
 umount:         ${OBJS}
-		${CC} ${LDFLAGS} -o umount.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o umount.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S umount.elf > umount.dis
 		${SIZE} umount.elf
 		${ELF2AOUT} umount.elf $@ && rm umount.elf

src/cmd/uname/Makefile

@@ -14,7 +14,7 @@ MANSRC		= uname.1
 all:            uname uname.0
 
 uname:          ${OBJS}
-		${CC} ${LDFLAGS} -o uname.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o uname.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S uname.elf > uname.dis
 		${SIZE} uname.elf
 		${ELF2AOUT} uname.elf $@ && rm uname.elf

src/cmd/unixbench/Makefile

@@ -153,43 +153,43 @@ programs: $(BINS)
 
 # Individual programs
 $(PROGDIR)/arithoh:	$(SRCDIR)/arith.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Darithoh
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Darithoh
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/register: $(SRCDIR)/arith.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Ddatum='register int'
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Ddatum='register int'
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/short: $(SRCDIR)/arith.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Ddatum=short
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Ddatum=short
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/int: $(SRCDIR)/arith.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Ddatum=int
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Ddatum=int
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/long: $(SRCDIR)/arith.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Ddatum=long
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Ddatum=long
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/float: $(SRCDIR)/arith.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Ddatum=float
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Ddatum=float
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/double: $(SRCDIR)/arith.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Ddatum=double
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Ddatum=double
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
@@ -197,82 +197,82 @@ $(PROGDIR)/double: $(SRCDIR)/arith.c
 
 
 $(PROGDIR)/whetstone-double: $(SRCDIR)/whets.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -DDP -DUNIX -DUNIXBENCH -lm -lc
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -DDP -DUNIX -DUNIXBENCH -lm -lc
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/hanoi: $(SRCDIR)/hanoi.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 
 $(PROGDIR)/poll: $(SRCDIR)/time-polling.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/poll2: $(SRCDIR)/time-polling.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 	$(CC) -DHAS_POLL2 -DUNIXBENCH -o $(PROGDIR)/poll2 ${CFLAGS} ${OPTON} $(SRCDIR)/time-polling.c
 
 $(PROGDIR)/select: $(SRCDIR)/time-polling.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 	$(CC) -DHAS_SELECT -DUNIXBENCH -o $(PROGDIR)/select ${CFLAGS} ${OPTON} $(SRCDIR)/time-polling.c
 
 $(PROGDIR)/fstime: $(SRCDIR)/fstime.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Dawk=1
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Dawk=1
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/fsbuffer: $(SRCDIR)/fstime.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Dawk=1 -DFSBUFFER
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Dawk=1 -DFSBUFFER
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/fsdisk: $(SRCDIR)/fstime.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Dawk=1 -DFSDISK
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON} -Dawk=1 -DFSDISK
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/syscall: $(SRCDIR)/syscall.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/context1: $(SRCDIR)/context1.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/pipe: $(SRCDIR)/pipe.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/spawn: $(SRCDIR)/spawn.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 
 $(PROGDIR)/execl: $(SRCDIR)/execl.c $(SRCDIR)/big.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
@@ -280,7 +280,7 @@ $(PROGDIR)/execl: $(SRCDIR)/execl.c $(SRCDIR)/big.c
 $(PROGDIR)/dhry2: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
 	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_1.c
 	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_2.c
-	${CC} ${LDFLAGS} -o $@.elf $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o ${LIBS} ${OPTON}
+	${LD} ${LDFLAGS} -o $@.elf $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o ${LIBS} ${OPTON}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
@@ -289,7 +289,7 @@ $(PROGDIR)/dhry2: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
 $(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
 	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_1.c -DREG=register
 	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_2.c -DREG=register
-	${CC} ${LDFLAGS} -o $@.elf $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o ${LIBS} ${OPTON}
+	${LD} ${LDFLAGS} -o $@.elf $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o ${LIBS} ${OPTON}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
@@ -299,14 +299,14 @@ $(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
 dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
 	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} $(OPT3) dhry_1.c -DREG=register
 	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} $(OPT3) dhry_2.c -DREG=register
-	${CC} ${LDFLAGS} -o $@.elf $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o ${LIBS} ${OPTON}
+	${LD} ${LDFLAGS} -o $@.elf $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o ${LIBS} ${OPTON}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@
 	cd $(SRCDIR); rm -f dhry_1.o dhry_2.o
 
 $(PROGDIR)/looper: $(SRCDIR)/looper.c
-	${CC} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
+	${LD} ${LDFLAGS} -o $@.elf $< ${LIBS} ${OPTON}
 	${OBJDUMP} -S $@.elf > $@.dis
 	${SIZE} $@.elf
 	${ELF2AOUT} $@.elf $@

src/cmd/update/Makefile

@@ -13,7 +13,7 @@ MANSRC		= update.8
 all:		update ${MAN}
 
 update:		${OBJS}
-		${CC} ${LDFLAGS} -o update.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o update.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S update.elf > update.dis
 		${SIZE} update.elf
 		${ELF2AOUT} update.elf $@ && rm update.elf

src/cmd/uucp/Makefile

@@ -48,79 +48,79 @@ libacu:
 
 
 uuencode: uuencode.o
-	${CC} ${LDFLAGS} -o uuencode.elf uuencode.o ${LIBS}
+	${LD} ${LDFLAGS} -o uuencode.elf uuencode.o ${LIBS}
 	${OBJDUMP} -S uuencode.elf > uuencode.dis
 	${SIZE} uuencode.elf
 	${ELF2AOUT} uuencode.elf $@
 
 uudecode: uudecode.o
-	${CC} ${LDFLAGS} -o uudecode.elf uudecode.o ${LIBS}
+	${LD} ${LDFLAGS} -o uudecode.elf uudecode.o ${LIBS}
 	${OBJDUMP} -S uudecode.elf > uudecode.dis
 	${SIZE} uudecode.elf
 	${ELF2AOUT} uudecode.elf $@
 
 uucp: uucp.o libuucp.a
-	${CC} ${LDFLAGS} -o uucp.elf uucp.o -L. -luucp ${LIBS}
+	${LD} ${LDFLAGS} -o uucp.elf uucp.o -L. -luucp ${LIBS}
 	${OBJDUMP} -S uucp.elf > uucp.dis
 	${SIZE} uucp.elf
 	${ELF2AOUT} uucp.elf $@
 
 uux: uux.o libuucp.a
-	${CC} ${LDFLAGS} -o uux.elf uux.o -L. -luucp ${LIBS}
+	${LD} ${LDFLAGS} -o uux.elf uux.o -L. -luucp ${LIBS}
 	${OBJDUMP} -S uux.elf > uux.dis
 	${SIZE} uux.elf
 	${ELF2AOUT} uux.elf $@
 
 uuxqt: uuxqt.o libuucp.a
-	${CC} ${LDFLAGS} -o uuxqt.elf uuxqt.o -L. -luucp ${LIBS}
+	${LD} ${LDFLAGS} -o uuxqt.elf uuxqt.o -L. -luucp ${LIBS}
 	${OBJDUMP} -S uuxqt.elf > uuxqt.dis
 	${SIZE} uuxqt.elf
 	${ELF2AOUT} uuxqt.elf $@
 
 uulog: uulog.o libuucp.a
-	${CC} ${LDFLAGS} -o uulog.elf uulog.o -L. -luucp ${LIBS}
+	${LD} ${LDFLAGS} -o uulog.elf uulog.o -L. -luucp ${LIBS}
 	${OBJDUMP} -S uulog.elf > uulog.dis
 	${SIZE} uulog.elf
 	${ELF2AOUT} uulog.elf $@
 
 uuclean: uuclean.o libuucp.a
-	${CC} ${LDFLAGS} -o uuclean.elf uuclean.o -L. -luucp ${LIBS}
+	${LD} ${LDFLAGS} -o uuclean.elf uuclean.o -L. -luucp ${LIBS}
 	${OBJDUMP} -S uuclean.elf > uuclean.dis
 	${SIZE} uuclean.elf
 	${ELF2AOUT} uuclean.elf $@
 
 uuname: uuname.o libuucp.a
-	${CC} ${LDFLAGS} -o uuname.elf uuname.o -L. -luucp ${LIBS}
+	${LD} ${LDFLAGS} -o uuname.elf uuname.o -L. -luucp ${LIBS}
 	${OBJDUMP} -S uuname.elf > uuname.dis
 	${SIZE} uuname.elf
 	${ELF2AOUT} uuname.elf $@
 
 uupoll: uupoll.o libuucp.a
-	${CC} ${LDFLAGS} -o uupoll.elf uupoll.o -L. -luucp ${LIBS}
+	${LD} ${LDFLAGS} -o uupoll.elf uupoll.o -L. -luucp ${LIBS}
 	${OBJDUMP} -S uupoll.elf > uupoll.dis
 	${SIZE} uupoll.elf
 	${ELF2AOUT} uupoll.elf $@
 
 uusnap: uusnap.o libuucp.a
-	${CC} ${LDFLAGS} -o uusnap.elf uusnap.o -L. -luucp ${LIBS}
+	${LD} ${LDFLAGS} -o uusnap.elf uusnap.o -L. -luucp ${LIBS}
 	${OBJDUMP} -S uusnap.elf > uusnap.dis
 	${SIZE} uusnap.elf
 	${ELF2AOUT} uusnap.elf $@
 
 uusend: uusend.o libuucp.a
-	${CC} ${LDFLAGS} -o uusend.elf uusend.o -L. -luucp ${LIBS}
+	${LD} ${LDFLAGS} -o uusend.elf uusend.o -L. -luucp ${LIBS}
 	${OBJDUMP} -S uusend.elf > uusend.dis
 	${SIZE} uusend.elf
 	${ELF2AOUT} uusend.elf $@
 
 uuq: uuq.o libuucp.a
-	${CC} ${LDFLAGS} -o uuq.elf uuq.o -L. -luucp ${LIBS}
+	${LD} ${LDFLAGS} -o uuq.elf uuq.o -L. -luucp ${LIBS}
 	${OBJDUMP} -S uuq.elf > uuq.dis
 	${SIZE} uuq.elf
 	${ELF2AOUT} uuq.elf $@
 
 uucico: cico.o libuucp.a
-	${CC} ${LDFLAGS} -o uucico.elf cico.o -L. -Laculib -luucp -lacu ${LIBS}
+	${LD} ${LDFLAGS} -o uucico.elf cico.o -L. -Laculib -luucp -lacu ${LIBS}
 	${OBJDUMP} -S uucico.elf > uucico.dis
 	${SIZE} uucico.elf
 	${ELF2AOUT} uucico.elf $@

src/cmd/vipw/Makefile

@@ -27,7 +27,7 @@ MANSRC		= vipw.8
 all:            vipw ${MAN}
 
 vipw:        	${OBJS}
-		${CC} ${LDFLAGS} -o vipw.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o vipw.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S vipw.elf > vipw.dis
 		${SIZE} vipw.elf
 		${ELF2AOUT} vipw.elf $@ && rm vipw.elf

src/cmd/wiznet/Makefile

@@ -13,31 +13,31 @@ EXAMPLES        = telnet \
 all:            $(EXAMPLES)
 
 web-client:     web-client.o
-		${CC} ${LDFLAGS} -o $@.elf $< ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf $< ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@
 
 web-server:     web-server.o
-		${CC} ${LDFLAGS} -o $@.elf $< ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf $< ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@
 
 telnet:         telnet.o
-		${CC} ${LDFLAGS} -o $@.elf $< ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf $< ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@
 
 ntpdate:        ntpdate.o
-		${CC} ${LDFLAGS} -o $@.elf $< ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf $< ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@
 
 chat-server:    chat-server.o
-		${CC} ${LDFLAGS} -o $@.elf $< ${LIBS}
+		${LD} ${LDFLAGS} -o $@.elf $< ${LIBS}
 		${OBJDUMP} -S $@.elf > $@.dis
 		${SIZE} $@.elf
 		${ELF2AOUT} $@.elf $@

src/cmd/xargs/Makefile

@@ -14,7 +14,7 @@ MANSRC		= xargs.1
 all:            xargs ${MAN}
 
 xargs:          ${OBJS}
-		${CC} ${LDFLAGS} -o xargs.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o xargs.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S xargs.elf > xargs.dis
 		${SIZE} xargs.elf
 		${ELF2AOUT} xargs.elf $@ && rm xargs.elf

src/cmd/yacc/Makefile

@@ -14,7 +14,7 @@ SRCS            = y1.c y2.c y3.c y4.c
 all:            yacc
 
 yacc:       ${OBJS}
-		${CC} ${LDFLAGS} -o yacc.elf ${OBJS} ${LIBS}
+		${LD} ${LDFLAGS} -o yacc.elf ${OBJS} ${LIBS}
 		${OBJDUMP} -S yacc.elf > yacc.dis
 		${SIZE} yacc.elf
 		${ELF2AOUT} yacc.elf $@