Subject: Assembler can be piped into, Makefile improvements. (#184)
Index:	lib/libc/pdp/{sys,gen,stdio,crt,csu,net,compat-2.9} 2.11BSD

Description:
	A number of the system Makefiles use the C preprocessor (cpp)
	to process assembly language files.  The output of cpp is
	redirected into a temporary file, the temporary file is assembled
	and then the temporary file is removed.

	The use of temporary files is slower than piping the output of cpp
	directly into the assembler.

	The assembler can now (since update #183) take his input from
	a pipe.  This change (#184) modifies the Makefiles in the system
	which deal with assembly language files.

	Also the 4.1BSD compatibility routine 'reset' has been obsolete
	long enough, it is time to remove it from libc.a.  No programs in
	the system have used it for many years.

	There is an extraneous file in the compat-2.9 directory.  It is
	removed now.

Repeat-By:
	Look in any of these files:

/usr/src/sys/conf/boot/Makefile
/usr/src/sys/mdec/Makefile
/usr/src/sys/pdpstand/Makefile
/usr/src/bin/csh/Makefile
/usr/src/games/pdp/zork/Makefile
/usr/src/lib/libc/pdp/gen/Makefile
/usr/src/lib/libc/pdp/crt/Makefile
/usr/src/lib/libc/pdp/csu/Makefile
/usr/src/lib/libc/pdp/net/Makefile
/usr/src/lib/libc/pdp/stdio/Makefile
/usr/src/lib/libc/pdp/sys/Makefile
/usr/src/ucb/tn3270/Makefile

	and you will see a sequence similar to this:

	/lib/cpp -E ${DEFS} $*.s | sed -e 's;^#;/;' > x.s
	as -V -o $*.o x.s
	rm -f x.s

	This can be replaced by the shorter and faster sequence:

	/lib/cpp -E ${DEFS} $< | sed -e 's;^#;/;' | as -V -o $@

Fix:

	Apply the patch below.  You must have a current assembler (patch #183
	applied) before proceeding further.

	1) Save the file below to /tmp/p
	2) patch -p0 < /tmp/p
	3) rm /usr/src/lib/libc/pdp/compat-2.9/HEADER
	4) rm -r /usr/src/lib/libc/pdp/compat-4.1

====snip
*** /usr/src/sys/conf/boot/Makefile.old	Fri Apr 19 21:02:17 1991
--- /usr/src/sys/conf/boot/Makefile	Fri Apr  8 23:55:12 1994
***************
*** 1,75 ****
! H=	../../h
! I=	/usr/include
! M=	../../machine
! N1=	../../net
! N2=	../../netimp
! N3=	../../netinet
! N4=	../../netns
! N6=	../../pdpif
! S=	../../sys
! U=	../../pdpuba
! MB=	../../pdpmba
  
! DEFS=	-DKERNEL -Dpdp11 -I. -I${H}
! CFLAGS=	-O ${DEFS}
  
  CPP=	/lib/cpp -P ${DEFS}
  AS=	/bin/as -V
- ED=	/bin/ed
  
  all: NONEboot.o brboot.o dvhpboot.o hk6boot.o hk7boot.o raboot.o rlboot.o rmboot.o sc11boot.o sc21boot.o siboot.o
  
! NONEboot.o: NONEboot.s
! 	${CPP} NONEboot.s > NONEboot.i
! 	${AS} -o NONEboot.o NONEboot.i
! 	rm -f NONEboot.i
  
- brboot.o: brboot.s
- 	${CPP} brboot.s > brboot.i
- 	${AS} -o brboot.o brboot.i
- 	rm -f brboot.i
- 
- dvhpboot.o: dvhpboot.s
- 	${CPP} dvhpboot.s > dvhpboot.i
- 	${AS} -o dvhpboot.o dvhpboot.i
- 	rm -f dvhpboot.i
- 
- hk6boot.o: hk6boot.s
- 	${CPP} hk6boot.s > hk6boot.i
- 	${AS} -o hk6boot.o hk6boot.i
- 	rm -f hk6boot.i
- 
- hk7boot.o: hk7boot.s
- 	${CPP} hk7boot.s > hk7boot.i
- 	${AS} -o hk7boot.o hk7boot.i
- 	rm -f hk7boot.i
- 
- raboot.o: raboot.s
- 	${CPP} raboot.s > raboot.i
- 	${AS} -o raboot.o raboot.i
- 	rm -f raboot.i
- 
- rlboot.o: rlboot.s
- 	${CPP} rlboot.s > rlboot.i
- 	${AS} -o rlboot.o rlboot.i
- 	rm -f rlboot.i
- 
- rmboot.o: rmboot.s
- 	${CPP} rmboot.s > rmboot.i
- 	${AS} -o rmboot.o rmboot.i
- 	rm -f rmboot.i
- 
- sc11boot.o: sc11boot.s
- 	${CPP} sc11boot.s > sc11boot.i
- 	${AS} -o sc11boot.o sc11boot.i
- 	rm -f sc11boot.i
- 
- sc21boot.o: sc21boot.s
- 	${CPP} sc21boot.s > sc21boot.i
- 	${AS} -o sc21boot.o sc21boot.i
- 	rm -f sc21boot.i
- 
- siboot.o: siboot.s
- 	${CPP} siboot.s > siboot.i
- 	${AS} -o siboot.o siboot.i
- 	rm -f siboot.i
--- 1,14 ----
! # 2.11BSD 1.0 April 8, 1994
  
! H=	/sys/h
  
+ DEFS=	-DKERNEL -I. -I${H}
+ 
  CPP=	/lib/cpp -P ${DEFS}
  AS=	/bin/as -V
  
  all: NONEboot.o brboot.o dvhpboot.o hk6boot.o hk7boot.o raboot.o rlboot.o rmboot.o sc11boot.o sc21boot.o siboot.o
  
! .s.o:
! 	${CPP} $< | ${AS} -o $@
  
*** /usr/src/sys/mdec/Makefile.old	Sat May  5 01:22:59 1990
--- /usr/src/sys/mdec/Makefile	Fri Apr  8 23:57:18 1994
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	7.1 (Berkeley) 6/5/86
  #
  ALL=	bruboot dvhpuboot hkuboot hpuboot rauboot rkuboot rluboot \
  	rm03uboot rm05uboot si51uboot si94uboot si95uboot
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	1.1 (2.11BSD GTE) 4/8/94
  #
  ALL=	bruboot dvhpuboot hkuboot hpuboot rauboot rkuboot rluboot \
  	rm03uboot rm05uboot si51uboot si94uboot si95uboot
***************
*** 11,19 ****
  all: ${ALL}
  
  ${ALL}:
! 	/lib/cpp -E $*.s | sed -e 's;^#;/;' > x.s
! 	as x.s
! 	rm x.s
  	nm -u a.out
  	size a.out
  	strip a.out
--- 11,17 ----
  all: ${ALL}
  
  ${ALL}:
! 	/lib/cpp -E $*.s | sed -e 's;^#;/;' | as -o a.out
  	nm -u a.out
  	size a.out
  	strip a.out
*** /usr/src/sys/pdpstand/Makefile.old	Sat Aug 21 20:58:02 1993
--- /usr/src/sys/pdpstand/Makefile	Sat Apr  9 00:10:52 1994
***************
*** 37,45 ****
  	cc ${CFLAGS} -c $*.c
  
  .s.o:
! 	/lib/cpp -P ${DEFS} $*.s >_xx.s;
! 	as - -V -o $*.o _xx.s;
! 	rm -f _xx.s
  
  all: ${ALL}
  
--- 37,43 ----
  	cc ${CFLAGS} -c $*.c
  
  .s.o:
! 	/lib/cpp -P ${DEFS} $< | as -u -V -o $@
  
  all: ${ALL}
  
*** /usr/src/bin/csh/Makefile.old	Tue May 16 13:54:33 1989
--- /usr/src/bin/csh/Makefile	Sat Apr  9 00:19:41 1994
***************
*** 3,20 ****
  # All rights reserved.  The Berkeley Software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.3 (Berkeley) 3/29/86
  #
  # C Shell with process control; VM/UNIX VAX Makefile
  # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
  #
  # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
- #
- # 2.10BSD does have limits, but including them in the csh doesn't really give
- # you that much (at least I've never used them) and forces us to set up
- # overlays for the separate I&D processor which makes the csh slower.  If you
- # really want to have limits in the csh, feel free to take NOLIMITS out of the
- # defines - but you'll have to set up an overlay scheme.
  
  DEFS=	-DTELL -DVFORK -DFILEC
  CFLAGS=	$(DEFS) -O
--- 3,14 ----
  # All rights reserved.  The Berkeley Software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.3.1 (2.11BSD GTE) 4/9/94
  #
  # C Shell with process control; VM/UNIX VAX Makefile
  # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
  #
  # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
  
  DEFS=	-DTELL -DVFORK -DFILEC
  CFLAGS=	$(DEFS) -O
***************
*** 61,69 ****
  
  # need an old doprnt, whose output we can trap
  doprnt11.o: doprnt11.s
! 	${CPP} doprnt11.s | ${SED} '/^#/d' >x.i
! 	${AS} -o doprnt11.o x.i
! 	rm -f x.i
  
  strings.o: strings
  	${XSTR}
--- 55,61 ----
  
  # need an old doprnt, whose output we can trap
  doprnt11.o: doprnt11.s
! 	${CPP} doprnt11.s | ${SED} '/^#/d' | ${AS} -o doprnt11.o
  
  strings.o: strings
  	${XSTR}
*** /usr/src/games/pdp/zork/Makefile.old	Tue Jun  5 13:46:23 1990
--- /usr/src/games/pdp/zork/Makefile	Sat Apr  9 00:35:48 1994
***************
*** 35,40 ****
  o.o:	o.s
  
  .s.o:
! 	/lib/cpp -E $*.s | sed -e 's;^#;/;' > x.s
! 	as -o $*.o x.s
! 	rm -f x.s
--- 35,38 ----
  o.o:	o.s
  
  .s.o:
! 	/lib/cpp -E $< | sed -e 's;^#;/;' | as -o $@
*** /usr/src/lib/libc/pdp/gen/Makefile.old	Mon Jan 10 21:59:57 1994
--- /usr/src/lib/libc/pdp/gen/Makefile	Sat Apr  9 00:56:31 1994
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.6.1 (2.11BSD GTE) 10/31/93
  #
  SRCS=	_setjmp.s abs.s alloca.s atof.c bcmp.s bcopy.s bzero.s disktab.c \
  	ecvt.c fabs.s ffs.s frexp.s index.s insque.s ldexp.s ldfps.s \
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.6.2 (2.11BSD GTE) 4/9/94
  #
  SRCS=	_setjmp.s abs.s alloca.s atof.c bcmp.s bcopy.s bzero.s disktab.c \
  	ecvt.c fabs.s ffs.s frexp.s index.s insque.s ldexp.s ldfps.s \
***************
*** 13,31 ****
  	ecvt.o fabs.o ffs.o frexp.o index.o insque.o ldexp.o ldfps.o \
  	modf.o nsym.o remque.o rindex.o rollback.o setjmp.o setjmperr.o \
  	strcat.o strcmp.o strcpy.o strlen.o strncat.o strncmp.o strncpy.o
  CFLAGS=	-O ${DEFS}
  TAGSFILE=tags
  
  .s.o:
! 	/lib/cpp -E -DPROF ${DEFS} $*.s | sed -e 's;^#;/;' > x.s
! 	as -V -o $*.o x.s
  	-ld -X -r $*.o
  	mv a.out profiled/$*.o
! 	/lib/cpp -E ${DEFS} $*.s | sed -e 's;^#;/;' > x.s
! 	as -V -o $*.o x.s
  	-ld -x -r $*.o
  	mv a.out $*.o
- 	rm -f x.s
  
  .c.o:
  	cc -p -c ${CFLAGS} $*.c
--- 13,29 ----
  	ecvt.o fabs.o ffs.o frexp.o index.o insque.o ldexp.o ldfps.o \
  	modf.o nsym.o remque.o rindex.o rollback.o setjmp.o setjmperr.o \
  	strcat.o strcmp.o strcpy.o strlen.o strncat.o strncmp.o strncpy.o
+ 
  CFLAGS=	-O ${DEFS}
  TAGSFILE=tags
  
  .s.o:
! 	/lib/cpp -E -DPROF ${DEFS} $< | sed -e 's;^#;/;' | as -V -o $@
  	-ld -X -r $*.o
  	mv a.out profiled/$*.o
! 	/lib/cpp -E ${DEFS} $< | sed -e 's;^#;/;' | as -V -o $@
  	-ld -x -r $*.o
  	mv a.out $*.o
  
  .c.o:
  	cc -p -c ${CFLAGS} $*.c
*** /usr/src/lib/libc/pdp/crt/Makefile.old	Sun Jun  6 20:49:46 1993
--- /usr/src/lib/libc/pdp/crt/Makefile	Sat Apr  9 01:07:04 1994
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.7 (2.11BSD GTE) 6/6/93
  #
  #
  SRCS=	aldiv.s almul.s alrem.s csv.s ldiv.s lmul.s lrem.s udiv.s \
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.7.1 (2.11BSD GTE) 4/9/94
  #
  #
  SRCS=	aldiv.s almul.s alrem.s csv.s ldiv.s lmul.s lrem.s udiv.s \
***************
*** 15,29 ****
  TAGSFILE=tags
  
  .s.o:
! 	/lib/cpp -E -DPROF ${DEFS} $*.s | sed -e 's;^#;/;' > x.s
! 	as -V -o $*.o x.s
  	-ld -X -r $*.o
  	mv a.out profiled/$*.o
! 	/lib/cpp -E ${DEFS} $*.s | sed -e 's;^#;/;' > x.s
! 	as -V -o $*.o x.s
  	-ld -x -r $*.o
  	mv a.out $*.o
- 	rm -f x.s
  
  .c.o:
  	cc -p -c ${CFLAGS} $*.c
--- 15,26 ----
  TAGSFILE=tags
  
  .s.o:
! 	/lib/cpp -E -DPROF ${DEFS} $< | sed -e 's;^#;/;' | as -V -o $@
  	-ld -X -r $*.o
  	mv a.out profiled/$*.o
! 	/lib/cpp -E ${DEFS} $< | sed -e 's;^#;/;' | as -V -o $@
  	-ld -x -r $*.o
  	mv a.out $*.o
  
  .c.o:
  	cc -p -c ${CFLAGS} $*.c
*** /usr/src/lib/libc/pdp/csu/Makefile.old	Mon Mar 30 14:26:14 1992
--- /usr/src/lib/libc/pdp/csu/Makefile	Sat Apr  9 01:15:24 1994
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.6 (Berkeley) 1/29/87
  #
  #	crt0	Normal C run time startoff
  #	mcrt0	C run time start off for profiling, ``prof'' conventions
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.6.1 (2.11BSD GTE) 4/9/94
  #
  #	crt0	Normal C run time startoff
  #	mcrt0	C run time start off for profiling, ``prof'' conventions
***************
*** 24,39 ****
  #	install -c -m 0644 gcrt0.o ${DESTDIR}/usr/lib/gcrt0.o
  
  crt0.o:	crt0.s
! 	/lib/cpp ${DEFS} ${DFLAGS} crt0.s | sed 's;^#;/;' > x.s
! 	as -o x.o x.s
  	ld -x -r -o crt0.o x.o
! 	rm -f x.s x.o
  
  moncrt0.o: crt0.s
! 	/lib/cpp ${DEFS} ${DFLAGS} -DMCRT0 crt0.s | sed 's;^#;/;' > x.s
! 	as -o x.o x.s
  	ld -x -r -o moncrt0.o x.o
! 	rm -f x.s x.o
  
  gcrt0.o: moncrt0.o gmon.o
  	ld -x -r -o gcrt0.o moncrt0.o gmon.o
--- 24,37 ----
  #	install -c -m 0644 gcrt0.o ${DESTDIR}/usr/lib/gcrt0.o
  
  crt0.o:	crt0.s
! 	/lib/cpp ${DEFS} ${DFLAGS} crt0.s | sed 's;^#;/;' | as -o x.o
  	ld -x -r -o crt0.o x.o
! 	rm -f x.o
  
  moncrt0.o: crt0.s
! 	/lib/cpp ${DEFS} ${DFLAGS} -DMCRT0 crt0.s | sed 's;^#;/;' | as -o x.o
  	ld -x -r -o moncrt0.o x.o
! 	rm -f x.o
  
  gcrt0.o: moncrt0.o gmon.o
  	ld -x -r -o gcrt0.o moncrt0.o gmon.o
*** /usr/src/lib/libc/pdp/net/Makefile.old	Wed Feb  4 21:19:40 1987
--- /usr/src/lib/libc/pdp/net/Makefile	Sat Apr  9 01:20:21 1994
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.6 (Berkeley) 1/25/87
  #
  SRCS=	htonl.s htons.s
  OBJS=	htonl.o htons.o
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.6.1 (2.11 BSD) 4/9/94
  #
  SRCS=	htonl.s htons.s
  OBJS=	htonl.o htons.o
***************
*** 11,25 ****
  TAGSFILE=tags
  
  .s.o:
! 	/lib/cpp -E -DPROF ${DEFS} $*.s | sed -e 's;^#;/;' > x.s
! 	as -V -o $*.o x.s
  	-ld -X -r $*.o
  	mv a.out profiled/$*.o
! 	/lib/cpp -E ${DEFS} $*.s | sed -e 's;^#;/;' > x.s
! 	as -V -o $*.o x.s
  	-ld -x -r $*.o
  	mv a.out $*.o
- 	rm -f x.s
  
  .c.o:
  	cc -p -c ${CFLAGS} $*.c
--- 11,22 ----
  TAGSFILE=tags
  
  .s.o:
! 	/lib/cpp -E -DPROF ${DEFS} $< | sed -e 's;^#;/;' | as -V -o $@
  	-ld -X -r $*.o
  	mv a.out profiled/$*.o
! 	/lib/cpp -E ${DEFS} $< | sed -e 's;^#;/;' | as -V -o $*.o
  	-ld -x -r $*.o
  	mv a.out $*.o
  
  .c.o:
  	cc -p -c ${CFLAGS} $*.c
*** /usr/src/lib/libc/pdp/stdio/Makefile.old	Sat May 13 21:58:18 1989
--- /usr/src/lib/libc/pdp/stdio/Makefile	Sat Apr  9 01:23:12 1994
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.6 (Berkeley) 2/4/87
  #
  # SRCS=	doprnt.s ffltpr.s fgetc.s fgets.s fltpr.s fputc.s puts.s gets.s
  # OBJS=	doprnt.o ffltpr.o fgetc.o fgets.o fltpr.o fputc.o puts.o gets.o
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.6.1 (2.11BSD GTE) 4/9/94
  #
  # SRCS=	doprnt.s ffltpr.s fgetc.s fgets.s fltpr.s fputc.s puts.s gets.s
  # OBJS=	doprnt.o ffltpr.o fgetc.o fgets.o fltpr.o fputc.o puts.o gets.o
***************
*** 13,27 ****
  TAGSFILE=tags
  
  .s.o:
! 	/lib/cpp -E -DPROF ${DEFS} $*.s | sed -e 's;^#;/;' > x.s
! 	as -V -o $*.o x.s
  	-ld -X -r $*.o
  	mv a.out profiled/$*.o
! 	/lib/cpp -E ${DEFS} $*.s | sed -e 's;^#;/;' > x.s
! 	as -V -o $*.o x.s
  	-ld -x -r $*.o
  	mv a.out $*.o
- 	rm -f x.s
  
  .c.o:
  	cc -p -c ${CFLAGS} $*.c
--- 13,24 ----
  TAGSFILE=tags
  
  .s.o:
! 	/lib/cpp -E -DPROF ${DEFS} $< | sed -e 's;^#;/;' | as -V -o $@
  	-ld -X -r $*.o
  	mv a.out profiled/$*.o
! 	/lib/cpp -E ${DEFS} $< | sed -e 's;^#;/;' | as -V -o $@
  	-ld -x -r $*.o
  	mv a.out $*.o
  
  .c.o:
  	cc -p -c ${CFLAGS} $*.c
*** /usr/src/lib/libc/pdp/sys/Makefile.old	Fri Mar 12 19:26:13 1993
--- /usr/src/lib/libc/pdp/sys/Makefile	Sat Apr  9 01:28:03 1994
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.6 (Berkeley) 1/25/87
  #
  SRCS=	_exit.s accept.s access.s acct.s adjtime.s bind.s brk.s chdir.s \
  	chmod.s chown.s chroot.s close.s connect.s creat.s dup.s dup2.s \
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.6.1 (2.11BSD GTE) 4/9/94
  #
  SRCS=	_exit.s accept.s access.s acct.s adjtime.s bind.s brk.s chdir.s \
  	chmod.s chown.s chroot.s close.s connect.s creat.s dup.s dup2.s \
***************
*** 39,57 ****
  	sigreturn.o sigsetmask.o sigstack.o sigvec.o socket.o socketpair.o \
  	stat.o symlink.o sync.o truncate.o umask.o umount.o unlink.o \
  	utimes.o vfork.o vhangup.o wait4.o write.o writev.o
  CFLAGS=	-O ${DEFS}
  TAGSFILE=tags
  
  .s.o:
! 	/lib/cpp -E -DPROF ${DEFS} $*.s | sed -e 's;^#;/;' > x.s
! 	as -V -o $*.o x.s
  	-ld -X -r $*.o
  	mv a.out profiled/$*.o
! 	/lib/cpp -E ${DEFS} $*.s | sed -e 's;^#;/;' > x.s
! 	as -V -o $*.o x.s
  	-ld -x -r $*.o
  	mv a.out $*.o
- 	rm -f x.s
  
  .c.o:
  	cc -p -c ${CFLAGS} $*.c
--- 39,55 ----
  	sigreturn.o sigsetmask.o sigstack.o sigvec.o socket.o socketpair.o \
  	stat.o symlink.o sync.o truncate.o umask.o umount.o unlink.o \
  	utimes.o vfork.o vhangup.o wait4.o write.o writev.o
+ 
  CFLAGS=	-O ${DEFS}
  TAGSFILE=tags
  
  .s.o:
! 	/lib/cpp -E -DPROF ${DEFS} $< | sed -e 's;^#;/;' | as -V -o $@
  	-ld -X -r $*.o
  	mv a.out profiled/$*.o
! 	/lib/cpp -E ${DEFS} $< | sed -e 's;^#;/;' | as -V -o $@
  	-ld -x -r $*.o
  	mv a.out $*.o
  
  .c.o:
  	cc -p -c ${CFLAGS} $*.c
*** /usr/src/lib/libc/pdp/Makefile.old	Wed Jun  6 17:30:55 1990
--- /usr/src/lib/libc/pdp/Makefile	Sat Apr  9 00:43:41 1994
***************
*** 3,13 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.6 (Berkeley) 6/12/88
  #
  # Machine dependent routines for the PDP are located here
  #
! COMPAT=	compat-2.9 compat-4.1
  ALL=	crt gen net stdio sys ${COMPAT}
  TAGSFILE=tags
  
--- 3,13 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.6.1 (2.11BSD GTE) 4/9/94
  #
  # Machine dependent routines for the PDP are located here
  #
! COMPAT=	compat-2.9
  ALL=	crt gen net stdio sys ${COMPAT}
  TAGSFILE=tags
  
*** /usr/src/lib/libc/pdp/compat-2.9/Makefile.old	Mon Mar 15 19:59:35 1993
--- /usr/src/lib/libc/pdp/compat-2.9/Makefile	Sat Apr  9 01:48:58 1994
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.7 (2.11BSD GTE) 3/15/93
  #
  SRCS=	fetchi.s fperr.s gldav.s l3.c loadav.c lock.s phys.s ucall.s
  OBJS=	fetchi.o fperr.o gldav.o l3.o loadav.o lock.o phys.o ucall.o
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.7.1 (2.11BSD GTE) 4/9/94
  #
  SRCS=	fetchi.s fperr.s gldav.s l3.c loadav.c lock.s phys.s ucall.s
  OBJS=	fetchi.o fperr.o gldav.o l3.o loadav.o lock.o phys.o ucall.o
***************
*** 11,25 ****
  TAGSFILE=tags
  
  .s.o:
! 	/lib/cpp -E -DPROF ${DEFS} $*.s | sed -e 's;^#;/;' > x.s
! 	as -V -o $*.o x.s
  	-ld -X -r $*.o
  	mv a.out profiled/$*.o
! 	/lib/cpp -E ${DEFS} $*.s | sed -e 's;^#;/;' > x.s
! 	as -V -o $*.o x.s
  	-ld -x -r $*.o
  	mv a.out $*.o
- 	rm -f x.s
  
  .c.o:
  	cc -p -c ${CFLAGS} $*.c
--- 11,22 ----
  TAGSFILE=tags
  
  .s.o:
! 	/lib/cpp -E -DPROF ${DEFS} $< | sed -e 's;^#;/;' | as -V -o $@
  	-ld -X -r $*.o
  	mv a.out profiled/$*.o
! 	/lib/cpp -E ${DEFS} $< | sed -e 's;^#;/;' | as -V -o $@
  	-ld -x -r $*.o
  	mv a.out $*.o
  
  .c.o:
  	cc -p -c ${CFLAGS} $*.c
*** /usr/src/ucb/tn3270/Makefile.old	Wed Jan 26 22:28:33 1994
--- /usr/src/ucb/tn3270/Makefile	Fri Apr  8 23:34:53 1994
***************
*** 1,5 ****
  # Makefile for tn3270 and friends...
! # @(#)Makefile	2.11	2.11
  
  CC	= cc
  SEPFLAG	= -i
--- 1,5 ----
  # Makefile for tn3270 and friends...
! # @(#)Makefile	2.11	April 8, 1994
  
  CC	= cc
  SEPFLAG	= -i
***************
*** 52,60 ****
  
  # PDP-11 assembly rules:
  .s.o:
! 	/lib/cpp -E $*.s | sed -e 's;^#;/;' > x.s
! 	as -V -o $*.o x.s
! 	rm -f x.s
  
  # Vax assembly rules:
  #.s.o:
--- 52,58 ----
  
  # PDP-11 assembly rules:
  .s.o:
! 	/lib/cpp -E $*.s | sed -e 's;^#;/;' | as -V -o $@
  
  # Vax assembly rules:
  #.s.o: