* Makefile (headers): Add libc-lock.h.

	* sysdeps/stub/libc-lock.h: New file.

	* inet/getrpcbynumber.c: Remove _r typo.

	* elf/dl-load.c (_dl_map_object): Fix typo in last change.

5 files changed, 54 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f60346a42c..b162265ebd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 Tue Jun 25 02:59:11 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* Makefile (headers): Add libc-lock.h.
+	* sysdeps/stub/libc-lock.h: New file.
+
+	* inet/getrpcbynumber.c: Remove _r typo.
+
+	* elf/dl-load.c (_dl_map_object): Fix typo in last change.
+
 	* nss/nss_files/files-parse.c (parse_list): Reset ELT for elements
 	after the first!
 
diff --git a/Makefile b/Makefile
index 13ca36bdb5..decd21fec7 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ subdirs	:= $(filter mach,$(subdirs)) $(filter hurd,$(subdirs)) \
 					      data headers others)
 
 headers := errno.h sys/errno.h errnos.h limits.h values.h	\
-	   features.h gnu-versions.h
+	   features.h gnu-versions.h libc-lock.h
 aux	 = sysdep $(libc-init) version
 
 echo-headers: subdir_echo-headers
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 7c2f2e3985..f01bdad525 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -463,7 +463,7 @@ _dl_map_object (struct link_map *loader, const char *name, int type)
 	/* If the requested name matches the soname of a loaded object,
 	   use that object.  */
 	(l->l_info[DT_SONAME] &&
-	 ! strcmp (name, (const char *) (l->addr +
+	 ! strcmp (name, (const char *) (l->l_addr +
 					 l->l_info[DT_SONAME]->d_un.d_ptr))))
       {
 	/* The object is already loaded.
diff --git a/inet/getrpcbynumber.c b/inet/getrpcbynumber.c
index 4b0215610f..485632e5fb 100644
--- a/inet/getrpcbynumber.c
+++ b/inet/getrpcbynumber.c
@@ -26,4 +26,4 @@ Boston, MA 02111-1307, USA.  */
 #define ADD_PARAMS	int number
 #define ADD_VARIABLES	number
 
-#include "../nss/getXXbyYY_r.c"
+#include "../nss/getXXbyYY.c"
diff --git a/sysdeps/stub/libc-lock.h b/sysdeps/stub/libc-lock.h
new file mode 100644
index 0000000000..ce6cab0f3f
--- /dev/null
+++ b/sysdeps/stub/libc-lock.h
@@ -0,0 +1,44 @@
+/* libc-internal interface for mutex locks.  Stub version.
+Copyright (C) 1996 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
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+#ifndef _LIBC_LOCK_H
+#define _LIBC_LOCK_H 1
+
+
+/* Define a lock variable NAME with storage class CLASS.  The lock must be
+   initialized with __libc_lock_init before it can be used (or define it
+   with __libc_lock_define_initialized, below).  Use `extern' for CLASS to
+   declare a lock defined in another module.  */
+#define __libc_lock_define(CLASS,NAME)
+
+/* Define an initialized lock variable NAME with storage class CLASS.  */
+#define __libc_lock_define_initialized(CLASS,NAME)
+
+/* Initialize the named lock variable, leaving it in a consistent, unlocked
+   state.  */
+#define __libc_lock_init(NAME)
+
+/* Lock the named lock variable.  */
+#define __libc_lock_lock(NAME)
+
+/* Unlock the named lock variable.  */
+#define __libc_lock_unlock(NAME)
+
+
+#endif	/* libc-lock.h */