From 2f996b04d1a0a0cd37e05dc298ea64cee8b3e3e7 Mon Sep 17 00:00:00 2001 From: William Nesheim Date: Mon, 17 Dec 1990 23:40:01 -0800 Subject: [PATCH] trivial errors and GAS heartburn. SCCS-vsn: lib/libc/i386/sys/brk.s 5.2 SCCS-vsn: lib/libc/i386/sys/sigsuspend.s 5.2 SCCS-vsn: lib/libc/i386/sys/sigprocmask.s 5.2 SCCS-vsn: lib/libc/i386/sys/sigreturn.s 5.2 --- usr/src/lib/libc/i386/sys/brk.s | 4 ++-- usr/src/lib/libc/i386/sys/sigprocmask.s | 4 ++-- usr/src/lib/libc/i386/sys/sigreturn.s | 6 +++--- usr/src/lib/libc/i386/sys/sigsuspend.s | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/usr/src/lib/libc/i386/sys/brk.s b/usr/src/lib/libc/i386/sys/brk.s index 12b1334410..1f164c04b0 100644 --- a/usr/src/lib/libc/i386/sys/brk.s +++ b/usr/src/lib/libc/i386/sys/brk.s @@ -9,7 +9,7 @@ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)brk.s 5.1 (Berkeley) %G%" + .asciz "@(#)brk.s 5.2 (Berkeley) %G%" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" @@ -24,7 +24,7 @@ ENTRY(_brk) ENTRY(brk) movl 4(%esp),%eax cmpl %eax,minbrk - jge ok + jl ok movl minbrk,%eax movl %eax,4(%esp) ok: diff --git a/usr/src/lib/libc/i386/sys/sigprocmask.s b/usr/src/lib/libc/i386/sys/sigprocmask.s index ba5341dcb2..26c2e51b35 100644 --- a/usr/src/lib/libc/i386/sys/sigprocmask.s +++ b/usr/src/lib/libc/i386/sys/sigprocmask.s @@ -9,7 +9,7 @@ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)sigprocmask.s 5.1 (Berkeley) %G%" + .asciz "@(#)sigprocmask.s 5.2 (Berkeley) %G%" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" @@ -19,7 +19,7 @@ err: ENTRY(sigprocmask) movl 8(%esp),%ecx # fetch new sigset pointer - cmpl $0,(%ecx) # check new sigset pointer + cmpl $0,%ecx # check new sigset pointer jne 1f # if not null, indirect /* movl $0,8(%esp) # null mask pointer: block empty set */ movl $1,4(%esp) # SIG_BLOCK diff --git a/usr/src/lib/libc/i386/sys/sigreturn.s b/usr/src/lib/libc/i386/sys/sigreturn.s index 63959680c4..37bf5c5ef1 100644 --- a/usr/src/lib/libc/i386/sys/sigreturn.s +++ b/usr/src/lib/libc/i386/sys/sigreturn.s @@ -9,7 +9,7 @@ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)sigreturn.s 5.1 (Berkeley) %G%" + .asciz "@(#)sigreturn.s 5.2 (Berkeley) %G%" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" @@ -20,8 +20,8 @@ #ifdef PROF #undef ENTRY #define ENTRY(x) \ - .globl _/**/x; .align 4; _/**/x: pusha ; \ - .data; 1:; .long 0; .text; movl $1b,%eax; call mcount; popa + .globl _/**/x; .align 2; _/**/x: pusha ; \ + .data; 1:; .long 0; .text; movl $1b,%eax; call mcount; popa ; nop #endif /* PROF */ SYSCALL(sigreturn) diff --git a/usr/src/lib/libc/i386/sys/sigsuspend.s b/usr/src/lib/libc/i386/sys/sigsuspend.s index 7a1edcab9d..52d1630ad0 100644 --- a/usr/src/lib/libc/i386/sys/sigsuspend.s +++ b/usr/src/lib/libc/i386/sys/sigsuspend.s @@ -9,7 +9,7 @@ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)sigsuspend.s 5.1 (Berkeley) %G%" + .asciz "@(#)sigsuspend.s 5.2 (Berkeley) %G%" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" @@ -24,5 +24,5 @@ ENTRY(sigsuspend) movl $ SYS_sigsuspend ,%eax LCALL(0x7,0) jb err - xorl %eax,%eax # shouldn't happen + xorl %eax,%eax # shouldn t happen ret -- 2.20.1