Sophie

Sophie

distrib > Arklinux > devel > i586 > by-pkgid > 9e6e445b4efd873f0ea565fdb7c9f225 > files > 14

eglibc-2.14-2ark.src.rpm

--- glibc-2.7/debug/memcpy_chk.c.ark	2007-10-23 13:17:33.000000000 +0200
+++ glibc-2.7/debug/memcpy_chk.c	2007-10-23 13:17:57.000000000 +0200
@@ -23,6 +23,7 @@
 #include <memcopy.h>
 #include <pagecopy.h>
 
+#if 0 // causes symbol clash with sysdeps/i386/i586 version
 void *
 __memcpy_chk (dstpp, srcpp, len, dstlen)
      void *dstpp;
@@ -64,3 +65,4 @@ __memcpy_chk (dstpp, srcpp, len, dstlen)
 
   return dstpp;
 }
+#endif
--- glibc-2.7/debug/memset_chk.c.ark	2007-10-23 14:32:23.000000000 +0200
+++ glibc-2.7/debug/memset_chk.c	2007-10-23 14:32:43.000000000 +0200
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <memcopy.h>
 
+#if 0 // causes symbol clash with asm implementation
 void *
 __memset_chk (dstpp, c, len, dstlen)
      void *dstpp;
@@ -90,3 +91,4 @@ __memset_chk (dstpp, c, len, dstlen)
 
   return dstpp;
 }
+#endif
--- glibc-2.7/debug/mempcpy_chk.c.ark	2007-10-23 15:36:33.000000000 +0200
+++ glibc-2.7/debug/mempcpy_chk.c	2007-10-23 15:36:46.000000000 +0200
@@ -24,6 +24,7 @@
 #include <memcopy.h>
 #include <pagecopy.h>
 
+#if 0 // causes symbol clash with asm version
 void *
 __mempcpy_chk (dstpp, srcpp, len, dstlen)
      void *dstpp;
@@ -65,3 +66,4 @@ __mempcpy_chk (dstpp, srcpp, len, dstlen
 
   return (void *) dstp;
 }
+#endif