[Glibc-bsd-commits] r4563 - trunk/glibc-ports/fbtl

[Petr Salinger]

Author: ps-guest
Date: 2013-06-22 08:08:00 +0000 (Sat, 22 Jun 2013)
New Revision: 4563

Modified:
   trunk/glibc-ports/fbtl/nptl-init.c
Log:
hacks in nptl-init.c



Modified: trunk/glibc-ports/fbtl/nptl-init.c
===================================================================
--- trunk/glibc-ports/fbtl/nptl-init.c	2013-06-22 08:07:29 UTC (rev 4562)
+++ trunk/glibc-ports/fbtl/nptl-init.c	2013-06-22 08:08:00 UTC (rev 4563)
@@ -41,6 +41,8 @@
 size_t __static_tls_size;
 size_t __static_tls_align_m1;
 
+#warning TODO whole file
+#if 0
 #ifndef __ASSUME_SET_ROBUST_LIST
 /* Negative if we do not have the system call and we can use it.  */
 int __set_robust_list_avail;
@@ -58,6 +60,7 @@
 #else
 #define __set_futex_clock_realtime() do { } while (0)
 #endif
+#endif
 
 /* Version of the library, used in libthread_db to detect mismatches.  */
 static const char nptl_version[] __attribute_used__ = VERSION;
@@ -162,9 +165,11 @@
 void
 __nptl_set_robust (struct pthread *self)
 {
+#if 0
   INTERNAL_SYSCALL_DECL (err);
   INTERNAL_SYSCALL (set_robust_list, err, 2, &self->robust_head,
 		    sizeof (struct robust_list_head));
+#endif		    
 }
 
 
@@ -181,10 +186,14 @@
   /* Safety check.  It would be possible to call this function for
      other signals and send a signal from another process.  This is not
      correct and might even be a security problem.  Try to catch as
-     many incorrect invocations as possible.  */
+     many incorrect invocations as possible.  */     
   if (sig != SIGCANCEL
       || si->si_pid != pid
+#if 1
+   )
+#else         
       || si->si_code != SI_TKILL)
+#endif      
     return;
 
   struct pthread *self = THREAD_SELF;
@@ -243,11 +252,11 @@
       || si->si_pid != pid
       || si->si_code != SI_TKILL)
     return;
-
+#if 0
   INTERNAL_SYSCALL_DECL (err);
   INTERNAL_SYSCALL_NCS (__xidcmd->syscall_no, err, 3, __xidcmd->id[0],
 			__xidcmd->id[1], __xidcmd->id[2]);
-
+#endif
   /* Reset the SETXID flag.  */
   struct pthread *self = THREAD_SELF;
   int flags, newval;
@@ -293,8 +302,10 @@
 
   /* Minimal initialization of the thread descriptor.  */
   struct pthread *pd = THREAD_SELF;
+#if 0  
   INTERNAL_SYSCALL_DECL (err);
   pd->pid = pd->tid = INTERNAL_SYSCALL (set_tid_address, err, 1, &pd->tid);
+#endif  
   THREAD_SETMEM (pd, specific[0], &pd->specific_1stblock[0]);
   THREAD_SETMEM (pd, user_stack, true);
   if (LLL_LOCK_INITIALIZER != 0)
@@ -318,6 +329,7 @@
 #endif
     set_robust_list_not_avail ();
 
+#if 0
 #ifndef __ASSUME_PRIVATE_FUTEX
   /* Private futexes are always used (at least internally) so that
      doing the test once this early is beneficial.  */
@@ -351,7 +363,7 @@
 	__set_futex_clock_realtime ();
     }
 #endif
-
+#endif
   /* Set initial thread's stack block from 0 up to __libc_stack_end.
      It will be bigger than it actually is, but for unwind.c/pt-longjmp.c
      purposes this is good enough.  */
@@ -386,8 +398,7 @@
      structure.  It is already cleared.  */
   __sigaddset (&sa.sa_mask, SIGCANCEL);
   __sigaddset (&sa.sa_mask, SIGSETXID);
-  (void) INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_UNBLOCK, &sa.sa_mask,
-			   NULL, _NSIG / 8);
+  INLINE_SYSCALL (sigprocmask, 3, SIG_UNBLOCK, &sa.sa_mask, NULL);
 
   /* Get the size of the static and alignment requirements for the TLS
      block.  */