* sysdeps/unix/sysv/linux/i386/profil-counter.h: New file.

3 files changed, 37 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 0bfa6a74a1..40f5eb4631 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Mon May 13 12:03:03 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* sysdeps/unix/sysv/linux/i386/profil-counter.h: New file.
+
 	* extra-lib.mk: Skip the hair if $(object-suffixes-$(lib)) is empty.
 
 	* posix/glob.h [_AMIGA]: Remove `struct stat;' forward decl.
diff --git a/sysdeps/unix/bsd/telldir.c b/sysdeps/unix/bsd/telldir.c
index dbab289a37..06580937e4 100644
--- a/sysdeps/unix/bsd/telldir.c
+++ b/sysdeps/unix/bsd/telldir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995, 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
@@ -48,8 +48,8 @@ DEFUN(telldir, (dirp), DIR *dirp)
   if (new == NULL)
     return (off_t) -1;
 
-  new->pos = dirp->__pos;
-  new->offset = dirp->__offset;
+  new->pos = dirp->filepos;
+  new->offset = dirp->offset;
   new->cookie = ++lastpos;
   new->next = records[new->cookie % NBUCKETS];
   records[new->cookie % NBUCKETS] = new;
@@ -70,15 +70,15 @@ DEFUN(seekdir, (dirp, pos), DIR *dirp AND __off_t pos)
        prevr = &r->next, r = r->next)
     if (r->cookie == pos)
       {
-	if (dirp->__pos != r->pos || dirp->__offset != r->offset)
+	if (dirp->filepos != r->pos || dirp->offset != r->offset)
 	  {
-	    dirp->__size = 0;	/* Must read a fresh buffer.  */
+	    dirp->size = 0;	/* Must read a fresh buffer.  */
 	    /* Move to the saved position.  */
-	    __lseek (dirp->__fd, r->pos, SEEK_SET);
-	    dirp->__pos = r->pos;
-	    dirp->__offset = 0;
+	    __lseek (dirp->fd, r->pos, SEEK_SET);
+	    dirp->filepos = r->pos;
+	    dirp->offset = 0;
 	    /* Read entries until we reach the saved offset.  */
-	    while (dirp->__offset < r->offset)
+	    while (dirp->offset < r->offset)
 	      if (readdir (dirp) == NULL)
 		break;
 	  }
diff --git a/sysdeps/unix/sysv/linux/i386/profil-counter.h b/sysdeps/unix/sysv/linux/i386/profil-counter.h
new file mode 100644
index 0000000000..91e7b507bd
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/i386/profil-counter.h
@@ -0,0 +1,26 @@
+/* Low-level statistical profiling support function.  Linux/i386 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.  */
+
+#include <asm/sigcontext.h>
+
+void
+profil_counter (int signo, struct sigcontext_struct sc)
+{
+  profil_count ((void *) sc.sc_eip);
+}