Compiles with gcc-2.3.3 now.

This commit is contained in:
proven 1993-05-26 18:58:11 +00:00
parent 37e6c3d951
commit 8d60a2631f
2 changed files with 17 additions and 18 deletions

View File

@ -1,6 +1,6 @@
# @(#)Makefile 5.24 (Berkeley) 7/1/91
#
# $Header: /cvsroot/src/bin/csh/Makefile,v 1.3 1993/03/23 00:23:53 cgd Exp $
# $Header: /cvsroot/src/bin/csh/Makefile,v 1.4 1993/05/26 19:05:47 proven Exp $
#
# C Shell with process control; VM/UNIX VAX Makefile
# Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@ -8,7 +8,7 @@
# To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
PROG= csh
CFLAGS+=-fcombine-regs -fstrength-reduce -DFILEC -DNLS -DSHORT_STRINGS -I.
CFLAGS+=-fstrength-reduce -DFILEC -DNLS -DSHORT_STRINGS -I.
SRCS= alloc.c char.c const.c csh.c dir.c dol.c err.c exec.c exp.c file.c \
func.c glob.c hist.c init.c lex.c misc.c parse.c print.c printf.c \
proc.c sem.c set.c str.c time.c

View File

@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
* $Id: npx.c,v 1.4 1993/05/20 14:35:11 cgd Exp $
* $Id: npx.c,v 1.5 1993/05/26 18:58:11 proven Exp $
*/
#include "npx.h"
#if NNPX > 0
@ -130,21 +130,20 @@ static volatile u_int npx_traps_while_probing;
* latch stuff in probintr() can be moved to npxprobe().
*/
void probeintr(void);
asm
("
.text
_probeintr:
ss
incl _npx_intrs_while_probing
pushl %eax
movb $0x20,%al /* EOI (asm in strings loses cpp features) */
outb %al,$0xa0 /* IO_ICU2 */
outb %al,$0x20 /* IO_ICU1 */
movb $0,%al
outb %al,$0xf0 /* clear BUSY# latch */
popl %eax
iret
");
asm ( \
".text;" \
"_probeintr:;" \
"ss;" \
"incl _npx_intrs_while_probing;" \
"pushl %eax;" \
"movb $0x20,%al;" /* EOI (asm in strings loses cpp features) */ \
"outb %al,$0xa0;" /* IO_ICU2 */ \
"outb %al,$0x20;" /* IO_ICU1 */ \
"movb $0,%al;" \
"outb %al,$0xf0;" /* clear BUSY# latch */ \
"popl %eax;" \
"iret" \
);
void probetrap(void);
asm