From 2fdb91d36dafb60196705e412e96c95354ef61bc Mon Sep 17 00:00:00 2001 From: obrien Date: Sat, 23 Mar 2002 02:10:28 +0000 Subject: Restore CSRG ID's lost in January 1995. --- lib/libc/i386/gen/_setjmp.S | 11 +++++------ lib/libc/i386/gen/alloca.S | 14 +++++++++++--- lib/libc/i386/gen/fabs.S | 14 +++++++++++--- lib/libc/i386/gen/frexp.c | 3 +++ lib/libc/i386/gen/isinf.c | 3 +++ lib/libc/i386/gen/ldexp.c | 3 +++ lib/libc/i386/gen/modf.S | 11 +++++------ lib/libc/i386/gen/setjmp.S | 9 +++++---- lib/libc/i386/gen/sigsetjmp.S | 10 +++++++--- lib/libc/i386/net/htonl.S | 11 +++++------ lib/libc/i386/net/htons.S | 11 +++++------ lib/libc/i386/net/ntohl.S | 11 +++++------ lib/libc/i386/net/ntohs.S | 9 +++++---- lib/libc/i386/stdlib/abs.S | 11 ++++++----- lib/libc/i386/stdlib/labs.S | 9 +++++---- lib/libc/i386/sys/Ovfork.S | 9 +++++---- lib/libc/i386/sys/brk.S | 9 +++++---- lib/libc/i386/sys/cerror.S | 9 +++++---- lib/libc/i386/sys/exect.S | 9 +++++---- lib/libc/i386/sys/pipe.S | 9 +++++---- lib/libc/i386/sys/ptrace.S | 9 +++++---- lib/libc/i386/sys/reboot.S | 9 +++++---- lib/libc/i386/sys/sbrk.S | 9 +++++---- lib/libc/i386/sys/setlogin.S | 9 +++++---- lib/libc/i386/sys/sigreturn.S | 9 +++++---- lib/libc/i386/sys/syscall.S | 9 +++++---- 26 files changed, 139 insertions(+), 100 deletions(-) (limited to 'lib/libc/i386') diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S index 03a594c..d2b7b6e 100644 --- a/lib/libc/i386/gen/_setjmp.S +++ b/lib/libc/i386/gen/_setjmp.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)_setjmp.s 5.1 (Berkeley) 4/23/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); /* * C library -- _setjmp, _longjmp @@ -49,8 +50,6 @@ * The previous signal state is NOT restored. */ -#include - ENTRY(_setjmp) movl 4(%esp),%eax movl 0(%esp),%edx diff --git a/lib/libc/i386/gen/alloca.S b/lib/libc/i386/gen/alloca.S index 279f159..52e3226 100644 --- a/lib/libc/i386/gen/alloca.S +++ b/lib/libc/i386/gen/alloca.S @@ -34,10 +34,18 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)alloca.s 5.2 (Berkeley) 5/14/90" +#endif /* LIBC_SCCS and not lint */ +#if !defined(lint) && !defined(STRIP_FBSDID) +#ifdef __ELF__ + .ident "$FreeBSD$" +#else + .data .asciz "$FreeBSD$" -#endif /* LIBC_RCS and not lint */ + .previous +#endif +#endif /* like alloc, but automatic automatic free in return */ diff --git a/lib/libc/i386/gen/fabs.S b/lib/libc/i386/gen/fabs.S index 85fff00..0bce2ac 100644 --- a/lib/libc/i386/gen/fabs.S +++ b/lib/libc/i386/gen/fabs.S @@ -34,10 +34,18 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)fabs.s 5.2 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ +#if !defined(lint) && !defined(STRIP_FBSDID) +#ifdef __ELF__ + .ident "$FreeBSD$" +#else + .data .asciz "$FreeBSD$" -#endif /* LIBC_RCS and not lint */ + .previous +#endif +#endif #include diff --git a/lib/libc/i386/gen/frexp.c b/lib/libc/i386/gen/frexp.c index 25baeca..37f6a57 100644 --- a/lib/libc/i386/gen/frexp.c +++ b/lib/libc/i386/gen/frexp.c @@ -31,6 +31,9 @@ * SUCH DAMAGE. */ +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)frexp.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ #include __FBSDID("$FreeBSD$"); diff --git a/lib/libc/i386/gen/isinf.c b/lib/libc/i386/gen/isinf.c index 4c49f9a..e735cd4 100644 --- a/lib/libc/i386/gen/isinf.c +++ b/lib/libc/i386/gen/isinf.c @@ -31,6 +31,9 @@ * SUCH DAMAGE. */ +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)isinf.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ #include __FBSDID("$FreeBSD$"); diff --git a/lib/libc/i386/gen/ldexp.c b/lib/libc/i386/gen/ldexp.c index bb82b14..65c2748 100644 --- a/lib/libc/i386/gen/ldexp.c +++ b/lib/libc/i386/gen/ldexp.c @@ -34,6 +34,9 @@ * SUCH DAMAGE. */ +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)ldexp.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ #include __FBSDID("$FreeBSD$"); diff --git a/lib/libc/i386/gen/modf.S b/lib/libc/i386/gen/modf.S index 41bdc45..426037b 100644 --- a/lib/libc/i386/gen/modf.S +++ b/lib/libc/i386/gen/modf.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)modf.s 5.5 (Berkeley) 3/18/91" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); /* * modf(value, iptr): return fractional part of value, and stores the @@ -49,8 +50,6 @@ /* With CHOP mode on, frndint behaves as TRUNC does. Useful. */ -#include - ENTRY(modf) pushl %ebp movl %esp,%ebp diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S index ed85036..f64c77f 100644 --- a/lib/libc/i386/gen/setjmp.S +++ b/lib/libc/i386/gen/setjmp.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); /* * C library -- _setjmp, _longjmp diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S index 6fd1305..09b512d 100644 --- a/lib/libc/i386/gen/sigsetjmp.S +++ b/lib/libc/i386/gen/sigsetjmp.S @@ -32,12 +32,16 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * @(#)setjmp.s 5.1 (Berkeley) 4/23/90" */ -#if defined(LIBC_RCS) && !defined(lint) +#if defined(LIBC_SCCS) && !defined(lint) .text - .asciz "$FreeBSD$" -#endif /* LIBC_RCS and not lint */ + .asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" diff --git a/lib/libc/i386/net/htonl.S b/lib/libc/i386/net/htonl.S index 6658b69..da74ed6 100644 --- a/lib/libc/i386/net/htonl.S +++ b/lib/libc/i386/net/htonl.S @@ -34,15 +34,14 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)htonl.s 5.3 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); /* netorder = htonl(hostorder) */ -#include - .weak CNAME(htonl) .set CNAME(htonl),CNAME(__htonl) ENTRY(__htonl) diff --git a/lib/libc/i386/net/htons.S b/lib/libc/i386/net/htons.S index c354eaa..d5d63fc 100644 --- a/lib/libc/i386/net/htons.S +++ b/lib/libc/i386/net/htons.S @@ -34,15 +34,14 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)htons.s 5.2 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); /* netorder = htons(hostorder) */ -#include - .weak CNAME(htons) .set CNAME(htons),CNAME(__htons) ENTRY(__htons) diff --git a/lib/libc/i386/net/ntohl.S b/lib/libc/i386/net/ntohl.S index 46ff54e..15e2d6e 100644 --- a/lib/libc/i386/net/ntohl.S +++ b/lib/libc/i386/net/ntohl.S @@ -34,15 +34,14 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)ntohl.s 5.2 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); /* hostorder = ntohl(netorder) */ -#include - .weak CNAME(ntohl) .set CNAME(ntohl),CNAME(__ntohl) ENTRY(__ntohl) diff --git a/lib/libc/i386/net/ntohs.S b/lib/libc/i386/net/ntohs.S index 3f0a36a..eb0668c 100644 --- a/lib/libc/i386/net/ntohs.S +++ b/lib/libc/i386/net/ntohs.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)ntohs.s 5.2 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); /* hostorder = ntohs(netorder) */ diff --git a/lib/libc/i386/stdlib/abs.S b/lib/libc/i386/stdlib/abs.S index fb21819..55a9296 100644 --- a/lib/libc/i386/stdlib/abs.S +++ b/lib/libc/i386/stdlib/abs.S @@ -34,12 +34,13 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* LIBC_RCS and not lint */ - +#if defined(LIBC_SCCS) && !defined(lint) + .text + .asciz "@(#)abs.s 5.2 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ #include +__FBSDID("$FreeBSD$"); + ENTRY(abs) movl 4(%esp),%eax diff --git a/lib/libc/i386/stdlib/labs.S b/lib/libc/i386/stdlib/labs.S index ffcb22a..9dd474d 100644 --- a/lib/libc/i386/stdlib/labs.S +++ b/lib/libc/i386/stdlib/labs.S @@ -34,12 +34,13 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) +#if defined(LIBC_SCCS) && !defined(lint) .text - .asciz "$FreeBSD$" -#endif /* LIBC_RCS and not lint */ - + .asciz "@(#)abs.s 5.2 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ #include +__FBSDID("$FreeBSD$"); + ENTRY(labs) movl 4(%esp),%eax diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S index 4c3c47f..20ece5e 100644 --- a/lib/libc/i386/sys/Ovfork.S +++ b/lib/libc/i386/sys/Ovfork.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)Ovfork.s 5.1 (Berkeley) 4/23/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" diff --git a/lib/libc/i386/sys/brk.S b/lib/libc/i386/sys/brk.S index d9d8877..61f6cbe 100644 --- a/lib/libc/i386/sys/brk.S +++ b/lib/libc/i386/sys/brk.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)brk.s 5.2 (Berkeley) 12/17/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" diff --git a/lib/libc/i386/sys/cerror.S b/lib/libc/i386/sys/cerror.S index 6c91cfc..1d625be 100644 --- a/lib/libc/i386/sys/cerror.S +++ b/lib/libc/i386/sys/cerror.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)cerror.s 5.1 (Berkeley) 4/23/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" diff --git a/lib/libc/i386/sys/exect.S b/lib/libc/i386/sys/exect.S index d3c8433..5848e61 100644 --- a/lib/libc/i386/sys/exect.S +++ b/lib/libc/i386/sys/exect.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)exect.s 5.1 (Berkeley) 4/23/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" #include diff --git a/lib/libc/i386/sys/pipe.S b/lib/libc/i386/sys/pipe.S index b982cfd..99a7ff0 100644 --- a/lib/libc/i386/sys/pipe.S +++ b/lib/libc/i386/sys/pipe.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)pipe.s 5.1 (Berkeley) 4/23/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" diff --git a/lib/libc/i386/sys/ptrace.S b/lib/libc/i386/sys/ptrace.S index dc786fb..71ce5c7 100644 --- a/lib/libc/i386/sys/ptrace.S +++ b/lib/libc/i386/sys/ptrace.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)ptrace.s 5.1 (Berkeley) 4/23/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" diff --git a/lib/libc/i386/sys/reboot.S b/lib/libc/i386/sys/reboot.S index 68a885b..80e3d36 100644 --- a/lib/libc/i386/sys/reboot.S +++ b/lib/libc/i386/sys/reboot.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)reboot.s 5.1 (Berkeley) 4/23/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" diff --git a/lib/libc/i386/sys/sbrk.S b/lib/libc/i386/sys/sbrk.S index 066535e..dffb7ea 100644 --- a/lib/libc/i386/sys/sbrk.S +++ b/lib/libc/i386/sys/sbrk.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)sbrk.s 5.1 (Berkeley) 4/23/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" diff --git a/lib/libc/i386/sys/setlogin.S b/lib/libc/i386/sys/setlogin.S index 54a0670..013dc7e 100644 --- a/lib/libc/i386/sys/setlogin.S +++ b/lib/libc/i386/sys/setlogin.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)setlogin.s 5.2 (Berkeley) 4/12/91" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" diff --git a/lib/libc/i386/sys/sigreturn.S b/lib/libc/i386/sys/sigreturn.S index 8e68520..2556ab9 100644 --- a/lib/libc/i386/sys/sigreturn.S +++ b/lib/libc/i386/sys/sigreturn.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)sigreturn.s 5.2 (Berkeley) 12/17/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" diff --git a/lib/libc/i386/sys/syscall.S b/lib/libc/i386/sys/syscall.S index 460d874..c6e9083 100644 --- a/lib/libc/i386/sys/syscall.S +++ b/lib/libc/i386/sys/syscall.S @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)syscall.s 5.1 (Berkeley) 4/23/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" -- cgit v1.1