7 files changed, 18 insertions, 12 deletions
diff --git a/sysdeps/alpha/bzero.S b/sysdeps/alpha/bzero.S
index 1e0792395b..a2aa3a5213 100644
--- a/sysdeps/alpha/bzero.S
+++ b/sysdeps/alpha/bzero.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
    Contributed by Richard Henderson (rth@tamu.edu)
    This file is part of the GNU C Library.
 
@@ -116,5 +116,5 @@ $oneq:
 
 $done:	ret
 
-	END(bzero)
+	END(__bzero)
 weak_alias (__bzero, bzero)
diff --git a/sysdeps/alpha/htonl.S b/sysdeps/alpha/htonl.S
index 4308192cbf..a4e39cee1b 100644
--- a/sysdeps/alpha/htonl.S
+++ b/sysdeps/alpha/htonl.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -41,6 +41,6 @@ ENTRY(htonl)
 	or	t2, v0, v0	# v0 = ddccbbaa
 	ret
 
-	END(__htonl)
+	END(htonl)
 
 weak_alias(htonl, ntohl)
diff --git a/sysdeps/alpha/htons.S b/sysdeps/alpha/htons.S
index f65f0e0826..d5d4467359 100644
--- a/sysdeps/alpha/htons.S
+++ b/sysdeps/alpha/htons.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -35,6 +35,6 @@ ENTRY(htons)
 	bis	v0, t1, v0	# v0 = bbaa
 	ret
 
-	END(__htons)
+	END(htons)
 
 weak_alias(htons, ntohs)
diff --git a/sysdeps/generic/memmem.c b/sysdeps/generic/memmem.c
index 9e4e342237..482ab6aa0b 100644
--- a/sysdeps/generic/memmem.c
+++ b/sysdeps/generic/memmem.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 96, 97, 98 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -35,8 +35,8 @@ memmem (haystack, haystack_len, needle, needle_len)
 
   if (needle_len == 0)
     /* The first occurrence of the empty string is deemed to occur at
-       the end of the string.  */
-    return (void *) &((const char *) haystack)[haystack_len - 1];
+       the beginning of the string.  */
+    return (void *) &((const char *) haystack);
 
   for (begin = (const char *) haystack; begin <= last_possible; ++begin)
     if (begin[0] == ((const char *) needle)[0] &&
diff --git a/sysdeps/sparc/sparc32/__longjmp.S b/sysdeps/sparc/sparc32/__longjmp.S
index 651ede4c15..cbd941fa82 100644
--- a/sysdeps/sparc/sparc32/__longjmp.S
+++ b/sysdeps/sparc/sparc32/__longjmp.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1993, 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,6 +19,7 @@
 #include <sysdep.h>
 
 #define _ASM 1
+#define _SETJMP_H
 #include <bits/setjmp.h>
 #define ENV(reg) [%g1 + (reg * 4)]
 
diff --git a/sysdeps/sparc/sparc32/setjmp.S b/sysdeps/sparc/sparc32/setjmp.S
index 44dcadb66e..2ab409b54c 100644
--- a/sysdeps/sparc/sparc32/setjmp.S
+++ b/sysdeps/sparc/sparc32/setjmp.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 93, 94, 96, 97, 98 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -20,6 +20,7 @@
 #include <sys/trap.h>
 
 #define _ASM 1
+#define _SETJMP_H
 #include <bits/setjmp.h>
 
 ENTRY(__setjmp)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c b/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c
index d39eb7cc76..64cc21eb70 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c
@@ -1,5 +1,5 @@
 /* POSIX.1 sigaction call for Linux/SPARC.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Miguel de Icaza (miguel@nuclecu.unam.mx), 1997.
 
@@ -22,6 +22,10 @@
 #include <sys/signal.h>
 #include <errno.h>
 
+/* The variable is shared between all wrappers around signal handling
+   functions which have RT equivalents.  */
+int __libc_have_rt_sigs = -1;
+
 /* Commented out while I figure out what the fuck goes on */
 long ____sig_table [NSIG];
 #if 0