Update.

1999-08-08  Ulrich Drepper  <drepper@cygnus.com>

	* string/bits/string2.h: Mark void* operations as extensions.
	* sysdeps/i386/i486/bits/string.h: Likewise.

	* debug/Makefile (routines): Add noophooks.
	(extra-libs): Add libpcprofile.  Add rules to build libpcprofile.
	* debug/noophooks.c: New file.
	* debug/pcprofile.c: New file.

6 files changed, 188 insertions, 74 deletions

diff --git a/ChangeLog b/ChangeLog
index 7c6c6f7f2d..92ff802601 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-08-08  Ulrich Drepper  <drepper@cygnus.com>
+
+	* string/bits/string2.h: Mark void* operations as extensions.
+	* sysdeps/i386/i486/bits/string.h: Likewise.
+
+	* debug/Makefile (routines): Add noophooks.
+	(extra-libs): Add libpcprofile.  Add rules to build libpcprofile.
+	* debug/noophooks.c: New file.
+	* debug/pcprofile.c: New file.
+
 1999-08-06  Ulrich Drepper  <drepper@cygnus.com>
 
 	* rt/aio_misc.c (handle_fildes_io): Imitate the behaviour on other
diff --git a/debug/Makefile b/debug/Makefile
index 9c094c4222..d13be3d684 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -24,18 +24,21 @@ subdir	:= debug
 headers	:= execinfo.h
 distribute = sigcontextinfo.h register-dump.h
 
-routines := backtrace backtracesyms backtracesymsfd
+routines := backtrace backtracesyms backtracesymsfd noophooks
 
 CFLAGS-backtrace.c = -fno-omit-frame-pointer
 
 tests = backtrace-tst
 
-extra-libs = libSegFault
+extra-libs = libSegFault libpcprofile
 extra-libs-others = $(extra-libs)
 
 libSegFault-routines = segfault
 libSegFault-inhibit-o = $(filter-out .os,$(object-suffixes))
 
+libpcprofile-routines = pcprofile
+libpcprofile-inhibit-o = $(filter-out .os,$(object-suffixes))
+
 include ../Makeconfig
 
 distribute += catchsegv.sh
@@ -58,3 +61,4 @@ $(objpfx)catchsegv: catchsegv.sh $(common-objpfx)soversions.mk \
 # This ensures they will load libc.so for needed symbols if loaded by
 # a statically-linked program that hasn't already loaded it.
 $(objpfx)libSegFault.so: $(common-objpfx)libc.so $(common-objpfx)elf/ld.so
+$(objpfx)libpcprofile.so: $(common-objpfx)libc.so $(common-objpfx)elf/ld.so
diff --git a/debug/noophooks.c b/debug/noophooks.c
new file mode 100644
index 0000000000..5c1ae01960
--- /dev/null
+++ b/debug/noophooks.c
@@ -0,0 +1,25 @@
+/* Noop hooks for the instrumenting functions.
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
+
+   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., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+void
+__cyg_profile_func_enter (void *this_fn, void *call_site)
+{
+}
+strong_alias (__cyg_profile_func_enter, __cyg_profile_func_exit)
diff --git a/debug/pcprofile.c b/debug/pcprofile.c
new file mode 100644
index 0000000000..b5dc4e709c
--- /dev/null
+++ b/debug/pcprofile.c
@@ -0,0 +1,75 @@
+/* Profile PC and write result to FIFO.
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
+
+   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., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+/* Nonzero if we are actually doing something.  */
+static int active;
+
+/* The file descriptor of the FIFO.  */
+static int fd;
+
+
+static void
+__attribute__ ((constructor))
+install (void)
+{
+  /* See whether the environment variable `PCPROFILE_OUTPUT' is defined.
+     If yes, it should name a FIFO.  We open it and mark ourself as active.  */
+  const char *outfile = getenv ("PCPROFILE_OUTPUT");
+
+  if (outfile != NULL && *outfile != '\0')
+    {
+      fd = open (outfile, O_RDWR);
+
+      if (fd != -1)
+	active = 1;
+    }
+}
+
+
+static void
+__attribute__ ((destructor))
+uninstall (void)
+{
+  if (active)
+    close (fd);
+}
+
+
+void
+__cyg_profile_func_enter (void *this_fn, void *call_site)
+{
+  void *buf[2];
+
+  if (! active)
+    return;
+
+  /* Now write out the current position and that of the caller.  We do
+     this now, and don't cache the because we want real-time output.  */
+  buf[0] = this_fn;
+  buf[1] = call_site;
+
+  write (fd, buf, sizeof buf);
+}
+/* We don't handle entry and exit differently here.  */
+strong_alias (__cyg_profile_func_enter, __cyg_profile_func_exit)
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 4d27a4488d..902e924cb0 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -122,54 +122,54 @@ __STRING2_COPY_TYPE (8);
        {								      \
        case 15:								      \
 	 __u->__ui = __c * 0x01010101;					      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 11:								      \
 	 __u->__ui = __c * 0x01010101;					      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 7:								      \
 	 __u->__ui = __c * 0x01010101;					      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 3:								      \
 	 __u->__usi = (unsigned short int) __c * 0x0101;		      \
-	 __u = (void *) __u + 2;					      \
+	 __u = __extension__ ((void *) __u + 2);			      \
 	 __u->__uc = (unsigned char) __c;				      \
 	 break;								      \
 									      \
        case 14:								      \
 	 __u->__ui = __c * 0x01010101;					      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 10:								      \
 	 __u->__ui = __c * 0x01010101;					      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 6:								      \
 	 __u->__ui = __c * 0x01010101;					      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 2:								      \
 	 __u->__usi = (unsigned short int) __c * 0x0101;		      \
 	 break;								      \
 									      \
        case 13:								      \
 	 __u->__ui = __c * 0x01010101;					      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 9:								      \
 	 __u->__ui = __c * 0x01010101;					      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 5:								      \
 	 __u->__ui = __c * 0x01010101;					      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 1:								      \
 	 __u->__uc = (unsigned char) __c;				      \
 	 break;								      \
 									      \
        case 16:								      \
 	 __u->__ui = __c * 0x01010101;					      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 12:								      \
 	 __u->__ui = __c * 0x01010101;					      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 8:								      \
 	 __u->__ui = __c * 0x01010101;					      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 4:								      \
 	 __u->__ui = __c * 0x01010101;					      \
        case 0:								      \
@@ -234,47 +234,47 @@ __mempcpy_small (void *__dest1,
     {
     case 1:
       __u->__c = __src0_1;
-      __u = (void *) __u + 1;
+      __u = __extension__ ((void *) __u + 1);
       break;
     case 2:
       __u->__usi = __src0_2;
-      __u = (void *) __u + 2;
+      __u = __extension__ ((void *) __u + 2);
       break;
     case 3:
       __u->__usi = __src0_2;
-      __u = (void *) __u + 2;
+      __u = __extension__ ((void *) __u + 2);
       __u->__c = __src2_1;
-      __u = (void *) __u + 1;
+      __u = __extension__ ((void *) __u + 1);
       break;
     case 4:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       break;
     case 5:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       __u->__c = __src4_1;
-      __u = (void *) __u + 1;
+      __u = __extension__ ((void *) __u + 1);
       break;
     case 6:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       __u->__usi = __src4_2;
-      __u = (void *) __u + 2;
+      __u = __extension__ ((void *) __u + 2);
       break;
     case 7:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       __u->__usi = __src4_2;
-      __u = (void *) __u + 2;
+      __u = __extension__ ((void *) __u + 2);
       __u->__c = __src6_1;
-      __u = (void *) __u + 1;
+      __u = __extension__ ((void *) __u + 1);
       break;
     case 8:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       __u->__ui = __src4_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       break;
     }
   return (void *) __u;
@@ -415,7 +415,7 @@ __strcpy_small (char *__dest,
       break;
     case 3:
       __u->__usi = __src0_2;
-      __u = (void *) __u + 2;
+      __u = __extension__ ((void *) __u + 2);
       __u->__uc = '\0';
       break;
     case 4:
@@ -423,24 +423,24 @@ __strcpy_small (char *__dest,
       break;
     case 5:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       __u->__uc = '\0';
       break;
     case 6:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       __u->__usi = __src4_2;
       break;
     case 7:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       __u->__usi = __src4_2;
-      __u = (void *) __u + 2;
+      __u = __extension__ ((void *) __u + 2);
       __u->__uc = '\0';
       break;
     case 8:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       __u->__ui = __src4_4;
       break;
     }
@@ -571,40 +571,40 @@ __stpcpy_small (char *__dest,
       break;
     case 2:
       __u->__usi = __src0_2;
-      __u = (void *) __u + 1;
+      __u = __extension__ ((void *) __u + 1);
       break;
     case 3:
       __u->__usi = __src0_2;
-      __u = (void *) __u + 2;
+      __u = __extension__ ((void *) __u + 2);
       __u->__uc = '\0';
       break;
     case 4:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 3;
+      __u = __extension__ ((void *) __u + 3);
       break;
     case 5:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       __u->__uc = '\0';
       break;
     case 6:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       __u->__usi = __src4_2;
-      __u = (void *) __u + 1;
+      __u = __extension__ ((void *) __u + 1);
       break;
     case 7:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       __u->__usi = __src4_2;
-      __u = (void *) __u + 2;
+      __u = __extension__ ((void *) __u + 2);
       __u->__uc = '\0';
       break;
     case 8:
       __u->__ui = __src0_4;
-      __u = (void *) __u + 4;
+      __u = __extension__ ((void *) __u + 4);
       __u->__ui = __src4_4;
-      __u = (void *) __u + 3;
+      __u = __extension__ ((void *) __u + 3);
       break;
     }
   return &__u->__uc;
diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h
index 8857a7178a..644967c895 100644
--- a/sysdeps/i386/i486/bits/string.h
+++ b/sysdeps/i386/i486/bits/string.h
@@ -230,54 +230,54 @@ memcmp (__const void *__s1, __const void *__s2, size_t __n)
        {								      \
        case 15:								      \
 	 __u->__ui = __c;						      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 11:								      \
 	 __u->__ui = __c;						      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 7:								      \
 	 __u->__ui = __c;						      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 3:								      \
 	 __u->__usi = (unsigned short int) __c;				      \
-	 __u = (void *) __u + 2;					      \
+	 __u = __extension__ ((void *) __u + 2);			      \
 	 __u->__uc = (unsigned char) __c;				      \
 	 break;								      \
 									      \
        case 14:								      \
 	 __u->__ui = __c;						      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 10:								      \
 	 __u->__ui = __c;						      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 6:								      \
 	 __u->__ui = __c;						      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 2:								      \
 	 __u->__usi = (unsigned short int) __c;				      \
 	 break;								      \
 									      \
        case 13:								      \
 	 __u->__ui = __c;						      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 9:								      \
 	 __u->__ui = __c;						      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 5:								      \
 	 __u->__ui = __c;						      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 1:								      \
 	 __u->__uc = (unsigned char) __c;				      \
 	 break;								      \
 									      \
        case 16:								      \
 	 __u->__ui = __c;						      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 12:								      \
 	 __u->__ui = __c;						      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 8:								      \
 	 __u->__ui = __c;						      \
-	 __u = (void *) __u + 4;					      \
+	 __u = __extension__ ((void *) __u + 4);			      \
        case 4:								      \
 	 __u->__ui = __c;						      \
        case 0:								      \
@@ -529,7 +529,7 @@ __strlen_g (__const char *__str)
 			break;						      \
 		      case 3:						      \
 			__u->__usi = __STRING_SMALL_GET16 (src, 0);	      \
-			__u = (void *) __u + 2;				      \
+			__u = __extension__ ((void *) __u + 2);		      \
 			__u->__uc = '\0';				      \
 			break;						      \
 		      case 4:						      \
@@ -537,24 +537,24 @@ __strlen_g (__const char *__str)
 			break;						      \
 		      case 5:						      \
 			__u->__ui = __STRING_SMALL_GET32 (src, 0);	      \
-			__u = (void *) __u + 4;				      \
+			__u = __extension__ ((void *) __u + 4);		      \
 			__u->__uc = '\0';				      \
 			break;						      \
 		      case 6:						      \
 			__u->__ui = __STRING_SMALL_GET32 (src, 0);	      \
-			__u = (void *) __u + 4;				      \
+			__u = __extension__ ((void *) __u + 4);		      \
 			__u->__usi = __STRING_SMALL_GET16 (src, 4);	      \
 			break;						      \
 		      case 7:						      \
 			__u->__ui = __STRING_SMALL_GET32 (src, 0);	      \
-			__u = (void *) __u + 4;				      \
+			__u = __extension__ ((void *) __u + 4);		      \
 			__u->__usi = __STRING_SMALL_GET16 (src, 4);	      \
-			__u = (void *) __u + 2;				      \
+			__u = __extension__ ((void *) __u + 2);		      \
 			__u->__uc = '\0';				      \
 			break;						      \
 		      case 8:						      \
 			__u->__ui = __STRING_SMALL_GET32 (src, 0);	      \
-			__u = (void *) __u + 4;				      \
+			__u = __extension__ ((void *) __u + 4);		      \
 			__u->__ui = __STRING_SMALL_GET32 (src, 4);	      \
 			break;						      \
 		      }							      \
@@ -616,40 +616,40 @@ __strcpy_g (char *__dest, __const char *__src)
 			break;						      \
 		      case 2:						      \
 			__u->__usi = __STRING_SMALL_GET16 (src, 0);	      \
-			__u = (void *) __u + 1;				      \
+			__u = __extension__ ((void *) __u + 1);		      \
 			break;						      \
 		      case 3:						      \
 			__u->__usi = __STRING_SMALL_GET16 (src, 0);	      \
-			__u = (void *) __u + 2;				      \
+			__u = __extension__ ((void *) __u + 2);		      \
 			__u->__uc = '\0';				      \
 			break;						      \
 		      case 4:						      \
 			__u->__ui = __STRING_SMALL_GET32 (src, 0);	      \
-			__u = (void *) __u + 3;				      \
+			__u = __extension__ ((void *) __u + 3);		      \
 			break;						      \
 		      case 5:						      \
 			__u->__ui = __STRING_SMALL_GET32 (src, 0);	      \
-			__u = (void *) __u + 4;				      \
+			__u = __extension__ ((void *) __u + 4);		      \
 			__u->__uc = '\0';				      \
 			break;						      \
 		      case 6:						      \
 			__u->__ui = __STRING_SMALL_GET32 (src, 0);	      \
-			__u = (void *) __u + 4;				      \
+			__u = __extension__ ((void *) __u + 4);		      \
 			__u->__usi = __STRING_SMALL_GET16 (src, 4);	      \
-			__u = (void *) __u + 1;				      \
+			__u = __extension__ ((void *) __u + 1);		      \
 			break;						      \
 		      case 7:						      \
 			__u->__ui = __STRING_SMALL_GET32 (src, 0);	      \
-			__u = (void *) __u + 4;				      \
+			__u = __extension__ ((void *) __u + 4);		      \
 			__u->__usi = __STRING_SMALL_GET16 (src, 4);	      \
-			__u = (void *) __u + 2;				      \
+			__u = __extension__ ((void *) __u + 2);		      \
 			__u->__uc = '\0';				      \
 			break;						      \
 		      case 8:						      \
 			__u->__ui = __STRING_SMALL_GET32 (src, 0);	      \
-			__u = (void *) __u + 4;				      \
+			__u = __extension__ ((void *) __u + 4);		      \
 			__u->__ui = __STRING_SMALL_GET32 (src, 4);	      \
-			__u = (void *) __u + 3;				      \
+			__u = __extension__ ((void *) __u + 3);		      \
 			break;						      \
 		      }							      \
 		    (char *) __u; }))