Update.
authorUlrich Drepper <drepper@redhat.com>
Mon, 19 Apr 2004 06:51:29 +0000 (06:51 +0000)
committerUlrich Drepper <drepper@redhat.com>
Mon, 19 Apr 2004 06:51:29 +0000 (06:51 +0000)
2004-04-18  Randolph Chung  <tausq@debian.org>

* sysdeps/hppa/elf/entry.h: New file.
* sysdeps/hppa/machine-gmon.h: New file.
* sysdeps/unix/sysv/linux/hppa/profil-counter.h: Don't use x86 version.

ChangeLog
linuxthreads/ChangeLog
linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
sysdeps/hppa/elf/entry.h [new file with mode: 0644]
sysdeps/hppa/machine-gmon.h [new file with mode: 0644]
sysdeps/unix/sysv/linux/hppa/profil-counter.h

index 8589918..aa1351a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-18  Randolph Chung  <tausq@debian.org>
+
+       * sysdeps/hppa/elf/entry.h: New file.
+       * sysdeps/hppa/machine-gmon.h: New file.
+       * sysdeps/unix/sysv/linux/hppa/profil-counter.h: Don't use x86 version.
+
 2004-04-18  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/powerpc/rt-sysdep.c: New file.
index 45d38b3..1b0f473 100644 (file)
@@ -1,3 +1,11 @@
+2004-04-18  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
+       (PSEUDO_CANCEL): Define.
+       (PSEUDO): Use it.
+       * sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h (CENABLE,
+       CDISABLE): For librt, append @PLT.
+
 2004-04-17  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/x86_64/tls.h [!__ASSEMBLER__]: Include tcb-offsets.h.
index fb9348b..06f7aed 100644 (file)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
 
@@ -25,9 +25,9 @@
 
 #if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
 
-# undef PSEUDO
-# define PSEUDO(name, syscall_name, args)                                    \
-       .text;                                                                \
+# if !defined NOT_IN_libc || defined IS_IN_libpthread
+
+#  define PSEUDO_CANCEL(name, syscall_name, args)                            \
 L(pseudo_cancel):                                                            \
        STM_##args                                                            \
        stm     %r12,%r15,48(%r15);                                           \
@@ -48,7 +48,42 @@ L(pseudo_cancel):                                                          \
        lm      %r12,%r15,48+96(%r15);                                        \
        j       L(pseudo_check);                                              \
 1:     .long   CENABLE-0b;                                                   \
-2:     .long   CDISABLE-0b;                                                  \
+2:     .long   CDISABLE-0b;
+
+# else /* !libc.so && !libpthread.so */
+
+#  define PSEUDO_CANCEL(name, syscall_name, args)                            \
+L(pseudo_cancel):                                                            \
+       STM_##args                                                            \
+       stm     %r11,%r15,44(%r15);                                           \
+       lr      %r14,%r15;                                                    \
+       ahi     %r15,-96;                                                     \
+       st      %r14,0(%r15);                                                 \
+       basr    %r13,0;                                                       \
+0:     l       %r12,3f-0b(%r13);                                             \
+       l       %r1,1f-0b(%r13);                                              \
+       la      %r12,0(%r12,%r13);                                            \
+       bas     %r14,0(%r1,%r13);                                             \
+       lr      %r0,%r2;                                                      \
+       LM_##args                                                             \
+       DO_CALL(syscall_name, args);                                          \
+       l       %r1,2f-0b(%r13);                                              \
+       lr      %r11,%r2;                                                     \
+       lr      %r2,%r0;                                                      \
+       bas     %r14,0(%r1,%r13);                                             \
+       lr      %r2,%r11;                                                     \
+       lm      %r11,%r15,44+96(%r15);                                        \
+       j       L(pseudo_check);                                              \
+1:     .long   CENABLE@PLT-0b;                                               \
+2:     .long   CDISABLE@PLT-0b;                                              \
+3:     .long   _GLOBAL_OFFSET_TABLE_-0b;
+
+# endif
+
+# undef PSEUDO
+# define PSEUDO(name, syscall_name, args)                                    \
+       .text;                                                                \
+PSEUDO_CANCEL(name, syscall_name, args)                                              \
 ENTRY(name)                                                                  \
        SINGLE_THREAD_P(%r1)                                                  \
        jne     L(pseudo_cancel);                                             \
index e3c2a58..f71ef3f 100644 (file)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
 
@@ -63,8 +63,8 @@ L(pseudo_end):
 #  define CDISABLE     __libc_disable_asynccancel
 #  define __local_multiple_threads     __libc_multiple_threads
 # else
-#  define CENABLE      __librt_enable_asynccancel
-#  define CDISABLE     __librt_disable_asynccancel
+#  define CENABLE      __librt_enable_asynccancel@PLT
+#  define CDISABLE     __librt_disable_asynccancel@PLT
 # endif
 
 #define STM_0          /* Nothing */
diff --git a/sysdeps/hppa/elf/entry.h b/sysdeps/hppa/elf/entry.h
new file mode 100644 (file)
index 0000000..b024db2
--- /dev/null
@@ -0,0 +1,10 @@
+#ifndef __ASSEMBLY__
+extern void _start (void);
+#endif
+
+/* The function's entry point is stored in the first word of the
+   function descriptor (plabel) of _start().  */
+#define ENTRY_POINT __canonicalize_funcptr_for_compare(_start)
+
+/* We have to provide a special declaration.  */
+#define ENTRY_POINT_DECL(class) class void _start (void);
diff --git a/sysdeps/hppa/machine-gmon.h b/sysdeps/hppa/machine-gmon.h
new file mode 100644 (file)
index 0000000..3eeef67
--- /dev/null
@@ -0,0 +1,25 @@
+/* Machine-specific calling sequence for `mcount' profiling function.  PA-RISC
+   Copyright (C) 1995, 1996, 1997, 2000 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/* We can call _mcount directly since gcc supplies the correct
+ * arguments */
+#define _MCOUNT_DECL(from, self) \
+ void _mcount (u_long from, u_long self)
+
+#define MCOUNT
index 8a6a0bc..b108be8 100644 (file)
@@ -1,2 +1,25 @@
-/* We can use the ix86 version.  */
-#include <sysdeps/unix/sysv/linux/i386/profil-counter.h>
+/* Machine-dependent SIGPROF signal handler.  PA-RISC version
+   Copyright (C) 1996, 1997, 2000 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static void
+profil_counter (int signr, siginfo_t *si, struct ucontext *uctx)
+{
+  unsigned long ip = uctx->uc_mcontext.sc_iaoq[0] & ~0x3;
+  profil_count ((void *) ip);
+}