[Glibc-bsd-commits] r4884 - trunk/glibc-ports/kfreebsd/fbtl

[Petr Salinger]

Author: ps-guest
Date: 2013-08-08 20:42:17 +0000 (Thu, 08 Aug 2013)
New Revision: 4884

Modified:
   trunk/glibc-ports/kfreebsd/fbtl/pthread_attr_getaffinity.c
   trunk/glibc-ports/kfreebsd/fbtl/pthread_attr_setaffinity.c
   trunk/glibc-ports/kfreebsd/fbtl/pthread_getaffinity.c
   trunk/glibc-ports/kfreebsd/fbtl/pthread_getname.c
   trunk/glibc-ports/kfreebsd/fbtl/pthread_setaffinity.c
Log:
build fixes for 2.18 interfaces


Modified: trunk/glibc-ports/kfreebsd/fbtl/pthread_attr_getaffinity.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fbtl/pthread_attr_getaffinity.c	2013-08-08 18:41:13 UTC (rev 4883)
+++ trunk/glibc-ports/kfreebsd/fbtl/pthread_attr_getaffinity.c	2013-08-08 20:42:17 UTC (rev 4884)
@@ -62,12 +62,8 @@
 
 
 #if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
-int
-__pthread_attr_getaffinity_old (const pthread_attr_t *attr, cpu_set_t *cpuset)
-{
-  /* The old interface by default assumed a 1024 processor bitmap.  */
-  return __pthread_attr_getaffinity_new (attr, 128, cpuset);
-}
+/* The old interface have not been really exposed  */
+strong_alias (__pthread_attr_getaffinity_new, __pthread_attr_getaffinity_old)
 compat_symbol (libpthread, __pthread_attr_getaffinity_old,
 	       pthread_attr_getaffinity_np, GLIBC_2_3_3);
 #endif

Modified: trunk/glibc-ports/kfreebsd/fbtl/pthread_attr_setaffinity.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fbtl/pthread_attr_setaffinity.c	2013-08-08 18:41:13 UTC (rev 4883)
+++ trunk/glibc-ports/kfreebsd/fbtl/pthread_attr_setaffinity.c	2013-08-08 20:42:17 UTC (rev 4884)
@@ -69,12 +69,8 @@
 
 
 #if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
-int
-__pthread_attr_setaffinity_old (pthread_attr_t *attr, cpu_set_t *cpuset)
-{
-  /* The old interface by default assumed a 1024 processor bitmap.  */
-  return __pthread_attr_setaffinity_new (attr, 128, cpuset);
-}
+/* The old interface have not been really exposed  */
+strong_alias (__pthread_attr_setaffinity_new, __pthread_attr_setaffinity_old)
 compat_symbol (libpthread, __pthread_attr_setaffinity_old,
 	       pthread_attr_setaffinity_np, GLIBC_2_3_3);
 #endif

Modified: trunk/glibc-ports/kfreebsd/fbtl/pthread_getaffinity.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fbtl/pthread_getaffinity.c	2013-08-08 18:41:13 UTC (rev 4883)
+++ trunk/glibc-ports/kfreebsd/fbtl/pthread_getaffinity.c	2013-08-08 20:42:17 UTC (rev 4884)
@@ -61,6 +61,7 @@
 
 #if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
 /* The old interface have not been really exposed  */
-compat_symbol (libpthread, __pthread_getaffinity_new, pthread_getaffinity_np,
+strong_alias (__pthread_getaffinity_new, __pthread_getaffinity_old)
+compat_symbol (libpthread, __pthread_getaffinity_old, pthread_getaffinity_np,
 	       GLIBC_2_3_3);
 #endif

Modified: trunk/glibc-ports/kfreebsd/fbtl/pthread_getname.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fbtl/pthread_getname.c	2013-08-08 18:41:13 UTC (rev 4883)
+++ trunk/glibc-ports/kfreebsd/fbtl/pthread_getname.c	2013-08-08 20:42:17 UTC (rev 4884)
@@ -35,16 +35,16 @@
   int res;
   
   ti.pl_tdname[0] = 0;
-  res = __ptrace(PT_LWPINFO, pd->tid, &ti, sizeof(struct ptrace_lwpinfo));
+  res = ptrace(PT_LWPINFO, pd->tid, (caddr_t)&ti, sizeof(struct ptrace_lwpinfo));
 
   if (res != 0)
       return errno;
 
-  res = __strlen(ti.pl_tdname);
+  res = strlen(ti.pl_tdname);
 
   if (len < (res+1))
       return ERANGE;
       
-  __memcpy(buf, ti.pl_tdname, res+1);
+  memcpy(buf, ti.pl_tdname, res+1);
   return 0;    
 }

Modified: trunk/glibc-ports/kfreebsd/fbtl/pthread_setaffinity.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fbtl/pthread_setaffinity.c	2013-08-08 18:41:13 UTC (rev 4883)
+++ trunk/glibc-ports/kfreebsd/fbtl/pthread_setaffinity.c	2013-08-08 20:42:17 UTC (rev 4884)
@@ -64,6 +64,7 @@
 
 #if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
 /* The old interface have not been really exposed  */
-compat_symbol (libpthread, __pthread_setaffinity_new, pthread_setaffinity_np,
+strong_alias (__pthread_setaffinity_new, __pthread_setaffinity_old)
+compat_symbol (libpthread, __pthread_setaffinity_old, pthread_setaffinity_np,
 	       GLIBC_2_3_3);
 #endif