Oops, that last diff was backwards, as well as fuzzed...

*** sys/Makefile.inc	Tue Nov 19 04:12:42 1996
--- sys/Makefile.inc.dsg	Sun Oct 20 00:27:51 1996
***************
*** 55,60 ****
--- 52,73 ----
  
  OBJS+=	${ASM} ${NOERR} ${PSEUDO}
  
+ #
+ # this really belongs in  /usr/share/mk/bsd.share.mk
+ #
+ .if (${MACHINE_ARCH} == "alpha")
+ CPPPIC= -DPIC
+ ASPIC=
+ .else
+ .if (${MACHINE_ARCH} == "mips")
+ CPPPIC= -DPIC -DABICALLS
+ ASPIC= -KPIC
+ .else
+ CPPPIC= -DPIC
+ ASPIC= -k
+ .endif
+ .endif
+ 
  ${PASM}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
  	@echo creating ${.TARGET}
  	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
***************
*** 62,78 ****
  	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
  	@rm -f ${.TARGET}.o
  
- .if (${MACHINE_ARCH} != "alpha")
  ${SASM}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
  	@echo creating ${.TARGET}
  	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
! 	    ${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -k -o ${.TARGET}
! .else
! ${SASM}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
! 	@echo creating ${.TARGET}
! 	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
! 	    ${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}
! .endif
  
  ${ASM}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
  	@echo creating ${.TARGET}
--- 75,84 ----
  	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
  	@rm -f ${.TARGET}.o
  
  ${SASM}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
  	@echo creating ${.TARGET}
  	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
! 	${CPP} ${CPPPIC} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} ${ASPIC} -o ${.TARGET}
  
  ${ASM}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
  	@echo creating ${.TARGET}
***************
*** 88,104 ****
  	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
  	@rm -f ${.TARGET}.o
  
- .if (${MACHINE_ARCH} != "alpha")
  ${SNOERR}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
  	@echo creating ${.TARGET}
  	@printf '#include "SYS.h"\nRSYSCALL_NOERROR(${.PREFIX})\n' | \
! 	    ${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -k -o ${.TARGET}
! .else
! ${SNOERR}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
! 	@echo creating ${.TARGET}
! 	@printf '#include "SYS.h"\nRSYSCALL_NOERROR(${.PREFIX})\n' | \
! 	    ${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}
! .endif
  
  ${NOERR}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
  	@echo creating ${.TARGET}
--- 94,103 ----
  	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
  	@rm -f ${.TARGET}.o
  
  ${SNOERR}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
  	@echo creating ${.TARGET}
  	@printf '#include "SYS.h"\nRSYSCALL_NOERROR(${.PREFIX})\n' | \
! 	${CPP} ${CPPPIC} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} ${ASPIC} -o ${.TARGET}
  
  ${NOERR}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
  	@echo creating ${.TARGET}
***************
*** 114,131 ****
  	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
  	@rm -f ${.TARGET}.o
  
- .if (${MACHINE_ARCH} != "alpha")
- ${SPSEUDO}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
- 	@echo creating ${.TARGET}
- 	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
- 	    ${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -k -o ${.TARGET}
- .else
  ${SPSEUDO}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
  	@echo creating ${.TARGET}
  	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
! 	    ${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}
! .endif
! 
  ${PSEUDO}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
  	@echo creating ${.TARGET}
  	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
--- 113,122 ----
  	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
  	@rm -f ${.TARGET}.o
  
  ${SPSEUDO}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
  	@echo creating ${.TARGET}
  	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
! 	${CPP} ${CPPPIC} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} ${ASPIC} -o ${.TARGET}
  ${PSEUDO}: ${.CURDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
  	@echo creating ${.TARGET}
  	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \