From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 15 Jul 2003 04:34:40 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~448
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da35d15e2b2b51fae6265a0906e87cfd5e4df98f;p=thirdparty%2Fglibc.git

Update.

2003-07-14  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/pthread/configure.in: Require CFI directives also for
	ppc and s390.
---

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 8839bf8c768..7594e5fdf3e 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-14  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/pthread/configure.in: Require CFI directives also for
+	ppc and s390.
+
 2003-07-15  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h (PSEUDO):
diff --git a/nptl/sysdeps/pthread/configure b/nptl/sysdeps/pthread/configure
index 9042c062990..00a58843cc6 100755
--- a/nptl/sysdeps/pthread/configure
+++ b/nptl/sysdeps/pthread/configure
@@ -6,12 +6,14 @@ echo "$as_me: error: compiler support for __thread is required" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-if test "x$libc_cv_asm_cfi_directives" != xyes; then
-    if test "x$base_machine" = xi386 || test "x$base_machine" = "xx86_86"; then
-    { { echo "$as_me:$LINENO: error: CFI directive support in assembler is required" >&5
+if test "sx$libc_cv_asm_cfi_directives" != xyes; then
+    case "$base_machine" in
+    i386 | x86_64 | powerpc | s390)
+      { { echo "$as_me:$LINENO: error: CFI directive support in assembler is required" >&5
 echo "$as_me: error: CFI directive support in assembler is required" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+   { (exit 1); exit 1; }; } ;;
+    *) ;;
+  esac
 fi
 
 
diff --git a/nptl/sysdeps/pthread/configure.in b/nptl/sysdeps/pthread/configure.in
index 4fa9b5db2cf..c998eac705f 100644
--- a/nptl/sysdeps/pthread/configure.in
+++ b/nptl/sysdeps/pthread/configure.in
@@ -7,9 +7,11 @@ fi
 
 if test "x$libc_cv_asm_cfi_directives" != xyes; then
   dnl We need this only for some architectures.
-  if test "x$base_machine" = xi386 || test "x$base_machine" = "xx86_86"; then
-    AC_MSG_ERROR(CFI directive support in assembler is required)
-  fi
+  case "$base_machine" in
+    i386 | x86_64 | powerpc | s390)
+      AC_MSG_ERROR(CFI directive support in assembler is required) ;;
+    *) ;;
+  esac
 fi
 
 dnl Iff <unwind.h> is available, make sure it is the right one and it