about summary refs log tree commit diff
path: root/ports
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-10-24 17:13:24 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-10-24 17:13:24 +0000
commit0bf57f872cb14db88ca8860e9f5b295e38394f16 (patch)
treef6c7c002b3ab821e0fd2bcc0dca008cef65411d7 /ports
parent8175a2532bd19cca1592f9c7f598302c5ae3770a (diff)
downloadglibc-0bf57f872cb14db88ca8860e9f5b295e38394f16.tar.gz
glibc-0bf57f872cb14db88ca8860e9f5b295e38394f16.tar.xz
glibc-0bf57f872cb14db88ca8860e9f5b295e38394f16.zip
Don't set resource limits in tst-oddstacklimit-ENV.
Diffstat (limited to 'ports')
-rw-r--r--ports/ChangeLog.hppa5
-rw-r--r--ports/sysdeps/hppa/nptl/Makefile8
-rw-r--r--ports/sysdeps/hppa/nptl/tst-oddstacklimit.c26
3 files changed, 32 insertions, 7 deletions
diff --git a/ports/ChangeLog.hppa b/ports/ChangeLog.hppa
index 53ed2768c4..2bfd5d481a 100644
--- a/ports/ChangeLog.hppa
+++ b/ports/ChangeLog.hppa
@@ -1,3 +1,8 @@
+2012-10-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/hppa/nptl/Makefile (tst-oddstacklimit-ENV): Remove.
+	* sysdeps/hppa/nptl/tst-oddstacklimit.c: New file.
+
 2012-10-10  Carlos O'Donell  <carlos@systemhalted.org>
 
 	* sysdeps/unix/sysv/linux/hppa/nptl/pthread.h: Update.
diff --git a/ports/sysdeps/hppa/nptl/Makefile b/ports/sysdeps/hppa/nptl/Makefile
index 86be06ade8..bc09dd1e79 100644
--- a/ports/sysdeps/hppa/nptl/Makefile
+++ b/ports/sysdeps/hppa/nptl/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
 # The GNU C Library is free software; you can redistribute it and/or
@@ -18,9 +18,3 @@
 ifeq ($(subdir),csu)
 gen-as-const-headers += tcb-offsets.sym
 endif
-
-# This sets the stack resource limit to 8193kb, which is not a multiple
-# of the page size, and therefore an odd sized stack limit. We override
-# this because the default is too small to run with. 
-tst-oddstacklimit-ENV = ; ulimit -s 8193;
-
diff --git a/ports/sysdeps/hppa/nptl/tst-oddstacklimit.c b/ports/sysdeps/hppa/nptl/tst-oddstacklimit.c
new file mode 100644
index 0000000000..6fcc9e312d
--- /dev/null
+++ b/ports/sysdeps/hppa/nptl/tst-oddstacklimit.c
@@ -0,0 +1,26 @@
+/* Test NPTL with stack limit that is not a multiple of the page size.
+   HPPA version.
+   Copyright (C) 2012 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+/* This sets the stack resource limit to 8193kb, which is not a multiple
+   of the page size, and therefore an odd sized stack limit.  We override
+   this because the default is too small to run with.  */
+
+#define ODD_STACK_LIMIT (8193 * 1024)
+
+#include <sysdeps/../nptl/tst-oddstacklimit.c>