(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.

1 files changed, 3 insertions, 23 deletions

diff --git a/nptl/tst-mutex6.c b/nptl/tst-mutex6.c
index de64bdb435..f066c62edc 100644
--- a/nptl/tst-mutex6.c
+++ b/nptl/tst-mutex6.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -21,12 +21,6 @@
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <errno.h>
-
-
-#ifndef ATTR
-# define ATTR NULL
-#endif
 
 
 static int
@@ -34,24 +28,12 @@ do_test (void)
 {
   pthread_mutex_t m;
 
-  int e = pthread_mutex_init (&m, ATTR);
-  if (ATTR != NULL && e == ENOTSUP)
-    {
-      puts ("cannot support selected type of mutexes");
-      e = pthread_mutex_init (&m, NULL);
-    }
-  if (e != 0)
+  if (pthread_mutex_init (&m, NULL) != 0)
     {
       puts ("mutex_init failed");
       return 1;
     }
 
-  if (ATTR != NULL && pthread_mutexattr_destroy (ATTR) != 0)
-    {
-      puts ("mutexattr_destroy failed");
-      return 1;
-    }
-
   if (pthread_mutex_lock (&m) != 0)
     {
       puts ("1st mutex_lock failed");
@@ -69,7 +51,5 @@ do_test (void)
 }
 
 #define EXPECTED_SIGNAL SIGALRM
-#ifndef TEST_FUNCTION
-# define TEST_FUNCTION do_test ()
-#endif
+#define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"