* s390 patches for the trunk.
@ 2002-02-06 6:47 Martin Schwidefsky
2002-02-06 7:19 ` [PATCH] Fix ftw3 test (was Re: s390 patches for the trunk.) Jakub Jelinek
2002-02-07 9:36 ` s390 patches for the trunk Ulrich Drepper
0 siblings, 2 replies; 4+ messages in thread
From: Martin Schwidefsky @ 2002-02-06 6:47 UTC (permalink / raw)
To: libc-hacker
[-- Attachment #1: Type: text/plain, Size: 1684 bytes --]
Hi,
I have another update for the s390/s390x backends. Most of them are self
explaining. The versions problem is solved with the Versions file for
64 bit and a patch for gcc 3.1 that exports __register_frame and co as
GLIBC_2.2 symbols for s390x. The cvs head of today with the attached
patch compiles with gcc 2.95.3 and gcc 3.1 but "make tests" reports one
problem with io/bug-ftw3 and after "make install" the assembler is doing
strange things (but the system is basically working). I haven't tracked
down why so far.
2002-02-06 Martin Schwidefsky <schwidefsky@de.ibm.com>
* sysdeps/unix/sysv/linux/s390/brk.c (__brk): Correct inline assembly
constraints.
* sysdeps/unix/sysv/linux/s390/s390-32/bits/resource.h (RLIMIT_LOCKS):
Add RLIMIT_LOCKS and adjust RLIMIT_NLIMITS.
* sysdeps/unix/sysv/linux/s390/s390-64/bits/resource.h (RLIMIT_LOCKS):
Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/clone.S (clone): Make clone
a weak alias for __clone.
* sysdeps/unix/sysv/linux/s390/s390-64/clone.S (clone): Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/profil-counter.h: Fix typo.
* sysdeps/unix/sysv/linux/s390/s390-64/Makefile: Add framestate.
* sysdeps/unix/sysv/linux/s390/s390-64/Versions: New file.
* sysdeps/unix/sysv/linux/s390/s390-64/mmap.S (__mmap64): Make __mmap
a weak alias for __mmap64.
blue skies,
Martin
(See attached file: s390-fixes.diff)(See attached file: s390-fixes.ChangeLog)
Linux/390 Design & Development, IBM Deutschland Entwicklung GmbH
Schönaicherstr. 220, D-71032 Böblingen, Telefon: 49 - (0)7031 - 16-2247
E-Mail: schwidefsky@de.ibm.com
[-- Attachment #2: s390-fixes.diff --]
[-- Type: application/octet-stream, Size: 5742 bytes --]
diff -urN libc-head/sysdeps/unix/sysv/linux/s390/brk.c libc-s390/sysdeps/unix/sysv/linux/s390/brk.c
--- libc-head/sysdeps/unix/sysv/linux/s390/brk.c Fri Jul 6 06:56:19 2001
+++ libc-s390/sysdeps/unix/sysv/linux/s390/brk.c Tue Feb 5 14:18:21 2002
@@ -35,14 +35,13 @@
void *newbrk;
{
- register long r0 asm ("2");
register void *__addr asm("2") = addr;
asm ("svc %b1\n\t" /* call sys_brk */
- : "=d" (r0)
+ : "=d" (__addr)
: "I" (SYS_ify(brk)), "r" (__addr)
- : _svc_clobber );
- newbrk = (void *) r0;
+ : "cc", "memory" );
+ newbrk = __addr;
}
__curbrk = newbrk;
diff -urN libc-head/sysdeps/unix/sysv/linux/s390/s390-32/bits/resource.h libc-s390/sysdeps/unix/sysv/linux/s390/s390-32/bits/resource.h
--- libc-head/sysdeps/unix/sysv/linux/s390/s390-32/bits/resource.h Fri Jul 6 06:56:19 2001
+++ libc-s390/sysdeps/unix/sysv/linux/s390/s390-32/bits/resource.h Tue Feb 5 14:18:21 2002
@@ -1,5 +1,5 @@
/* Bit values & structures for resource limits. Linux version.
- Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001, 2002 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
@@ -76,7 +76,11 @@
RLIMIT_MEMLOCK = 8,
#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK
- RLIMIT_NLIMITS = 10,
+ /* Maximum number of file locks. */
+ RLIMIT_LOCKS = 10,
+#define RLIMIT_LOCKS RLIMIT_LOCKS
+
+ RLIMIT_NLIMITS = 11,
RLIM_NLIMITS = RLIMIT_NLIMITS
#define RLIMIT_NLIMITS RLIMIT_NLIMITS
#define RLIM_NLIMITS RLIM_NLIMITS
diff -urN libc-head/sysdeps/unix/sysv/linux/s390/s390-32/clone.S libc-s390/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
--- libc-head/sysdeps/unix/sysv/linux/s390/s390-32/clone.S Tue Feb 5 14:18:08 2002
+++ libc-s390/sysdeps/unix/sysv/linux/s390/s390-32/clone.S Tue Feb 5 14:18:29 2002
@@ -65,3 +65,4 @@
.L1: .long _exit - .L0
#endif
PSEUDO_END (__clone)
+weak_alias (__clone, clone)
diff -urN libc-head/sysdeps/unix/sysv/linux/s390/s390-32/profil-counter.h libc-s390/sysdeps/unix/sysv/linux/s390/s390-32/profil-counter.h
--- libc-head/sysdeps/unix/sysv/linux/s390/s390-32/profil-counter.h Sat Dec 29 01:35:20 2001
+++ libc-s390/sysdeps/unix/sysv/linux/s390/s390-32/profil-counter.h Tue Feb 5 14:18:21 2002
@@ -1,5 +1,5 @@
/* Low-level statistical profiling support function. Linux/s390 version.
- Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001, 2002 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
@@ -23,5 +23,5 @@
static void
profil_counter (int signo, SIGCONTEXT scp)
{
- profile_count((void *) ((unsigned long) GET_PC (scp) & 0x7fffffffUL));
+ profil_count((void *) ((unsigned long) GET_PC (scp) & 0x7fffffffUL));
}
diff -urN libc-head/sysdeps/unix/sysv/linux/s390/s390-64/Makefile libc-s390/sysdeps/unix/sysv/linux/s390/s390-64/Makefile
--- libc-head/sysdeps/unix/sysv/linux/s390/s390-64/Makefile Wed May 23 08:24:29 2001
+++ libc-s390/sysdeps/unix/sysv/linux/s390/s390-64/Makefile Tue Feb 5 14:18:21 2002
@@ -2,3 +2,11 @@
sysdep_routines += setfsgid setfsuid setresgid setresuid
sysdep_headers += sys/elf.h
endif
+
+ifeq ($(subdir),elf)
+ifeq (yes,$(build-shared))
+# This is needed to support g++ v2 and v3.
+sysdep_routines += framestate
+shared-only-routines += framestate
+endif
+endif
diff -urN libc-head/sysdeps/unix/sysv/linux/s390/s390-64/Versions libc-s390/sysdeps/unix/sysv/linux/s390/s390-64/Versions
--- libc-head/sysdeps/unix/sysv/linux/s390/s390-64/Versions Thu Jan 1 01:00:00 1970
+++ libc-s390/sysdeps/unix/sysv/linux/s390/s390-64/Versions Tue Feb 5 14:18:21 2002
@@ -0,0 +1,7 @@
+libc {
+ GLIBC_2.2 {
+ # Exception handling support functions from libgcc
+ __register_frame; __register_frame_table; __deregister_frame;
+ __frame_state_for; __register_frame_info_table;
+ }
+}
diff -urN libc-head/sysdeps/unix/sysv/linux/s390/s390-64/bits/resource.h libc-s390/sysdeps/unix/sysv/linux/s390/s390-64/bits/resource.h
--- libc-head/sysdeps/unix/sysv/linux/s390/s390-64/bits/resource.h Fri Jul 6 06:56:20 2001
+++ libc-s390/sysdeps/unix/sysv/linux/s390/s390-64/bits/resource.h Tue Feb 5 14:18:21 2002
@@ -1,5 +1,5 @@
/* Bit values & structures for resource limits. 64 bit S/390 version.
- Copyright (C) 2001 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002 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
@@ -76,7 +76,12 @@
RLIMIT_AS = 9,
#define RLIMIT_AS RLIMIT_AS
- RLIM_NLIMITS = 10
+ /* Maximum number of file locks. */
+ RLIMIT_LOCKS = 10,
+#define RLIMIT_LOCKS RLIMIT_LOCKS
+
+ RLIMIT_NLIMITS = 11,
+ RLIM_NLIMITS = RLIMIT_NLIMITS
#define RLIMIT_NLIMITS RLIMIT_NLIMITS
#define RLIM_NLIMITS RLIM_NLIMITS
};
diff -urN libc-head/sysdeps/unix/sysv/linux/s390/s390-64/clone.S libc-s390/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
--- libc-head/sysdeps/unix/sysv/linux/s390/s390-64/clone.S Tue Feb 5 14:18:04 2002
+++ libc-s390/sysdeps/unix/sysv/linux/s390/s390-64/clone.S Tue Feb 5 14:18:35 2002
@@ -53,3 +53,4 @@
#endif
jg _exit@PLT /* branch to _exit -> thread termination */
PSEUDO_END (__clone)
+weak_alias (__clone, clone)
diff -urN libc-head/sysdeps/unix/sysv/linux/s390/s390-64/mmap.S libc-s390/sysdeps/unix/sysv/linux/s390/s390-64/mmap.S
--- libc-head/sysdeps/unix/sysv/linux/s390/s390-64/mmap.S Fri Jul 6 06:56:20 2001
+++ libc-s390/sysdeps/unix/sysv/linux/s390/s390-64/mmap.S Tue Feb 5 14:18:59 2002
@@ -64,4 +64,4 @@
weak_alias (__mmap, mmap)
weak_alias (__mmap, mmap64)
-
+weak_alias (__mmap, __mmap64)
[-- Attachment #3: s390-fixes.ChangeLog --]
[-- Type: application/octet-stream, Size: 798 bytes --]
2002-02-06 Martin Schwidefsky <schwidefsky@de.ibm.com>
* sysdeps/unix/sysv/linux/s390/brk.c (__brk): Correct inline assembly
constraints.
* sysdeps/unix/sysv/linux/s390/s390-32/bits/resource.h (RLIMIT_LOCKS):
Add RLIMIT_LOCKS and adjust RLIMIT_NLIMITS.
* sysdeps/unix/sysv/linux/s390/s390-64/bits/resource.h (RLIMIT_LOCKS):
Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/clone.S (clone): Make clone
a weak alias for __clone.
* sysdeps/unix/sysv/linux/s390/s390-64/clone.S (clone): Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/profil-counter.h: Fix typo.
* sysdeps/unix/sysv/linux/s390/s390-64/Makefile: Add framestate.
* sysdeps/unix/sysv/linux/s390/s390-64/Versions: New file.
* sysdeps/unix/sysv/linux/s390/s390-64/mmap.S (__mmap64): Make __mmap
a weak alias for __mmap64.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Fix ftw3 test (was Re: s390 patches for the trunk.)
2002-02-06 6:47 s390 patches for the trunk Martin Schwidefsky
@ 2002-02-06 7:19 ` Jakub Jelinek
2002-02-07 9:37 ` Ulrich Drepper
2002-02-07 9:36 ` s390 patches for the trunk Ulrich Drepper
1 sibling, 1 reply; 4+ messages in thread
From: Jakub Jelinek @ 2002-02-06 7:19 UTC (permalink / raw)
To: Martin Schwidefsky; +Cc: libc-hacker
On Wed, Feb 06, 2002 at 03:45:51PM +0100, Martin Schwidefsky wrote:
>
> Hi,
> I have another update for the s390/s390x backends. Most of them are self
> explaining. The versions problem is solved with the Versions file for
> 64 bit and a patch for gcc 3.1 that exports __register_frame and co as
> GLIBC_2.2 symbols for s390x. The cvs head of today with the attached
> patch compiles with gcc 2.95.3 and gcc 3.1 but "make tests" reports one
> problem with io/bug-ftw3.
You were running make check as root, weren't you?
I noticed it already too some weeks ago. That test relies on not beeing run
as root, so it might as well just bail out in that case.
2002-02-06 Jakub Jelinek <jakub@redhat.com>
* io/bug-ftw3.c (main): Don't try the test if root.
--- libc/io/bug-ftw3.c 2002/01/31 21:31:49
+++ libc/io/bug-ftw3.c 2002/01/08 11:46:46
@@ -25,6 +25,12 @@ main (void)
int r;
int e;
+ if (getuid () == 0)
+ {
+ puts ("this test needs to be run by ordinary user");
+ exit (0);
+ }
+
dname = mkdtemp (tmp);
if (dname == NULL)
{
Jakub
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: s390 patches for the trunk.
2002-02-06 6:47 s390 patches for the trunk Martin Schwidefsky
2002-02-06 7:19 ` [PATCH] Fix ftw3 test (was Re: s390 patches for the trunk.) Jakub Jelinek
@ 2002-02-07 9:36 ` Ulrich Drepper
1 sibling, 0 replies; 4+ messages in thread
From: Ulrich Drepper @ 2002-02-07 9:36 UTC (permalink / raw)
To: Martin Schwidefsky; +Cc: libc-hacker
"Martin Schwidefsky" <schwidefsky@de.ibm.com> writes:
> I have another update for the s390/s390x backends.
I've applied the patch, thanks.
--
---------------. ,-. 1325 Chesapeake Terrace
Ulrich Drepper \ ,-------------------' \ Sunnyvale, CA 94089 USA
Red Hat `--' drepper at redhat.com `------------------------
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix ftw3 test (was Re: s390 patches for the trunk.)
2002-02-06 7:19 ` [PATCH] Fix ftw3 test (was Re: s390 patches for the trunk.) Jakub Jelinek
@ 2002-02-07 9:37 ` Ulrich Drepper
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Drepper @ 2002-02-07 9:37 UTC (permalink / raw)
To: libc-hacker
Jakub Jelinek <jakub@redhat.com> writes:
> 2002-02-06 Jakub Jelinek <jakub@redhat.com>
>
> * io/bug-ftw3.c (main): Don't try the test if root.
Makes sense, I've applied it. Thanks,
--
---------------. ,-. 1325 Chesapeake Terrace
Ulrich Drepper \ ,-------------------' \ Sunnyvale, CA 94089 USA
Red Hat `--' drepper at redhat.com `------------------------
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2002-02-07 17:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-02-06 6:47 s390 patches for the trunk Martin Schwidefsky
2002-02-06 7:19 ` [PATCH] Fix ftw3 test (was Re: s390 patches for the trunk.) Jakub Jelinek
2002-02-07 9:37 ` Ulrich Drepper
2002-02-07 9:36 ` s390 patches for the trunk Ulrich Drepper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).