From: Ulrich Drepper Date: Tue, 6 Feb 2001 00:56:59 +0000 (+0000) Subject: Update. X-Git-Tag: cvs/glibc-2_2_2~112 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a35dfca75ee7f2e3b650f2d80a3f1b4802e21e1;p=platform%2Fupstream%2Fglibc.git Update. * elf/ldconfig.c (search_dir): Use PRIx64 instead of Lx in printf string. Include instead of . --- diff --git a/ChangeLog b/ChangeLog index 8872475..7149df3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-02-05 Ulrich Drepper + * elf/ldconfig.c (search_dir): Use PRIx64 instead of Lx in printf + string. Include instead of . + * configure.in: Add check for bison. * config.make.in: Define BISON variable. * intl/Makefile: Use BISON instead of YACC when generating plural.c. diff --git a/elf/ldconfig.c b/elf/ldconfig.c index f3f51e3..2318411 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -23,12 +23,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include @@ -597,7 +597,7 @@ search_dir (const struct dir_entry *entry) if (opt_verbose) { if (hwcap != 0) - printf ("%s: (hwcap: 0x%Lx)\n", entry->path, hwcap); + printf ("%s: (hwcap: 0x%" PRIx64 ")\n", entry->path, hwcap); else printf ("%s:\n", entry->path); } diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 3e5e7b0..acb8480 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,7 @@ +2001-02-05 Jes Sorensen + + * sysdeps/unix/sysv/linux/ia64/pt-initfini.c: New file. + 2001-02-02 Ulrich Drepper * Versions: Remove __pthread_initialize_minimal. diff --git a/linuxthreads/sysdeps/unix/sysv/linux/ia64/pt-initfini.c b/linuxthreads/sysdeps/unix/sysv/linux/ia64/pt-initfini.c new file mode 100644 index 0000000..766d481 --- /dev/null +++ b/linuxthreads/sysdeps/unix/sysv/linux/ia64/pt-initfini.c @@ -0,0 +1,117 @@ +/* Special .init and .fini section support for ia64. LinuxThreads version. + Copyright (C) 2000, 2001 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 Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + In addition to the permissions in the GNU Library General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The Library General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + 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 Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* This file is compiled into assembly code which is then munged by a sed + script into two files: crti.s and crtn.s. + + * crti.s puts a function prologue at the beginning of the + .init and .fini sections and defines global symbols for + those addresses, so they can be called as functions. + + * crtn.s puts the corresponding function epilogues + in the .init and .fini sections. */ + +__asm__ (" + +#include \"defs.h\" + +/*@HEADER_ENDS*/ + +/*@_init_PROLOG_BEGINS*/ + .section .init + .align 16 + .global _init# + .proc _init# +_init: + alloc r34 = ar.pfs, 0, 3, 0, 0 + mov r32 = r12 + mov r33 = b0 + adds r12 = -16, r12 + addl r14 = @ltoff(@fptr(__gmon_start__#)), gp + ;; + ld8 r15 = [r14] +/* we could use r35 to save gp, but we use the stack since that's what + * all the other init routines will do --davidm 00/04/05 */ + st8 [r12] = gp, -16 + br.call.sptk.many b0 = __pthread_initialize_minimal# ;; + ;; + cmp.eq p6, p7 = 0, r15 + (p6) br.cond.dptk .L5 + + br.call.sptk.many b0 = __gmon_start__# ;; + adds r12 = 16, r12 + ;; +.L5: + ld8 gp = [r12] + ;; + .align 16 + .endp _init# + +/*@_init_PROLOG_ENDS*/ + +/*@_init_EPILOG_BEGINS*/ + .section .init + .regstk 0,2,0,0 + mov r12 = r32 + mov ar.pfs = r34 + mov b0 = r33 + br.ret.sptk.many b0 + .endp _init# +/*@_init_EPILOG_ENDS*/ + +/*@_fini_PROLOG_BEGINS*/ + .section .fini + .align 16 + .global _fini# + .proc _fini# +_fini: + alloc r34 = ar.pfs, 0, 3, 0, 0 + mov r32 = r12 + mov r33 = b0 + adds r12 = -16, r12 + ;; + .align 16 + .endp _fini# + +/*@_fini_PROLOG_ENDS*/ + br.call.sptk.many b0 = i_am_not_a_leaf# ;; + ;; + +/*@_fini_EPILOG_BEGINS*/ + .section .fini + mov r12 = r32 + mov ar.pfs = r34 + mov b0 = r33 + br.ret.sptk.many b0 + .endp _fini# + +/*@_fini_EPILOG_ENDS*/ + +/*@TRAILER_BEGINS*/ + .weak __gmon_start__# +");