Libc-498.1.7.tar.gz

diff --git a/man/Makefile.inc b/man/Makefile.inc
index 8206a141ea5042c2743c062fab019ad84f09c88c..44090a4e673c37491630381eba6c1e6b5e4b8b84 100644 (file)
--- a/man/Makefile.inc
+++ b/man/Makefile.inc
@@ -7,6 +7,8 @@
 MAN3 += assert.3 bitstring.3 stdarg.3
 .ifdef FEATURE_LEGACY_UTMP_APIS
 MAN5 += utmp.5
 MAN3 += assert.3 bitstring.3 stdarg.3
 .ifdef FEATURE_LEGACY_UTMP_APIS
 MAN5 += utmp.5

+MLINKS += utmp.5 lastlog.5
+MLINKS += utmp.5 wtmp.5

 .endif
 MAN7 += environ.7
 
 .endif
 MAN7 += environ.7
 

diff --git a/man/utmp.5 b/man/utmp.5
index 288097ebb33ab6f8b2412a005d84017b632373cc..b822a4e26be317c9705b9355a174b131b250a415 100644 (file)
--- a/man/utmp.5
+++ b/man/utmp.5
@@ -47,7 +47,7 @@
 The interfaces in file
 .Aq Pa utmp.h
 are all
 The interfaces in file
 .Aq Pa utmp.h
 are all

-.Sy DEPRECIATED
+.Sy DEPRECATED

 and are only provided for compatibility with previous releases of Mac OS X.
 See
 .Xr pututxline 3
 and are only provided for compatibility with previous releases of Mac OS X.
 See
 .Xr pututxline 3

diff --git a/ppc/sys/OSAtomic.s b/ppc/sys/OSAtomic.s
index 24858e901e314c389dfaa153470ef83c30da571b..8ce3cd11ab8c49ce14b2fc7d39ee4b5cb327edcf 100644 (file)
--- a/ppc/sys/OSAtomic.s
+++ b/ppc/sys/OSAtomic.s
@@ -36,8 +36,19 @@
 
 /* int32_t     OSAtomicAdd32( int32_t theAmount, int32_t *theValue ); */
 
 
 /* int32_t     OSAtomicAdd32( int32_t theAmount, int32_t *theValue ); */
 

+#if defined(__ppc__)

 MI_ENTRY_POINT(_OSAtomicAdd32)
     ba      _COMM_PAGE_ATOMIC_ADD32
 MI_ENTRY_POINT(_OSAtomicAdd32)
     ba      _COMM_PAGE_ATOMIC_ADD32

+#elif defined(__ppc64__)
+MI_ENTRY_POINT(_OSAtomicAdd32)
+    mflr    r12                        // save return address
+    bla            _COMM_PAGE_ATOMIC_ADD32
+    mtlr    r12
+    extsw   r3,r3              // sign extend return value
+    blr
+#else
+#error undefined architecture
+#endif

 
 
 /* int32_t     OSAtomicOr32( int32_t theMask, int32_t *theValue ); */
 
 
 /* int32_t     OSAtomicOr32( int32_t theMask, int32_t *theValue ); */


@@ -240,7 +251,13 @@ MI_ENTRY_POINT(_OSAtomicAdd32Barrier)
     cmpwi   r3,0                // did swap occur?
     beq--   1b                  // compare-and-swap failed, try again
     mtlr    r12                 // restore return adddress
     cmpwi   r3,0                // did swap occur?
     beq--   1b                  // compare-and-swap failed, try again
     mtlr    r12                 // restore return adddress

+#if defined(__ppc__)

     mr      r3,r4               // return new value
     mr      r3,r4               // return new value

+#elif defined(__ppc64__)
+    extsw   r3,r4              // sign extend return value
+#else
+#error undefined architecture
+#endif

     blr
 
 
     blr
 
 

diff --git a/pthreads/pthread.c b/pthreads/pthread.c
index b01850a6e270c16f2a61db077962af2ab33b31f1..7a8459383893db292bc17cf4998981e968309daf 100644 (file)
--- a/pthreads/pthread.c
+++ b/pthreads/pthread.c
@@ -3135,7 +3135,6 @@ pthread_workqueue_removeitem_np(pthread_workqueue_t workq, pthread_workitem_hand
                                        }
                                        return(0);
                                } else {
                                        }
                                        return(0);
                                } else {

-                                       workqueue_list_unlock();

                                        return(EBUSY);
                                }
                } 
                                        return(EBUSY);
                                }
                }