fedora/glibc-ia64-lib64.patch

   1 2004-05-14  Jakub Jelinek  <jakub@redhat.com>
   2
   3         * sysdeps/unix/sysv/linux/configure.in: Use */lib64 even for ia64.
   4         * sysdeps/unix/sysv/linux/configure: Rebuilt.
   5         * sysdeps/unix/sysv/linux/ia64/dl-procinfo.c: New file.
   6         * sysdeps/unix/sysv/linux/ia64/dl-procinfo.h: New file.
   7         * sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed: Change /lib64/ld*
   8         into /lib/ld*.  Add LD_LIBRARY_VERSION.
   9         * sysdeps/unix/sysv/linux/ia64/ldconfig.h
  10         (SYSDEP_KNOWN_INTERPRETER_NAMES): Add /lib64/ld-linux-ia64.so.2.
  11         * sysdeps/unix/sysv/linux/ia64/dl-cache.h: Include sparc-linux
  12         dl-cache.h instead of generic dl-cache.h.
  13
  14 --- libc/sysdeps/unix/sysv/linux/configure.jj   2003-03-23 03:10:04.000000000 +0100
  15 +++ libc/sysdeps/unix/sysv/linux/configure      2004-05-14 15:54:35.669802684 +0200
  16 @@ -225,7 +225,7 @@ case "$prefix" in
  17    # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib
  18    case $machine in
  19    sparc/sparc64 | x86_64 | powerpc/powerpc64 | s390/s390-64 | \
  20 -  mips/mips64/n64/* )
  21 +  mips/mips64/n64/* | ia64 )
  22      libc_cv_slibdir="/lib64"
  23      if test "$libdir" = '${exec_prefix}/lib'; then
  24        libdir='${exec_prefix}/lib64';
  25 --- libc/sysdeps/unix/sysv/linux/configure.in.jj        2003-03-23 03:10:04.000000000 +0100
  26 +++ libc/sysdeps/unix/sysv/linux/configure.in   2004-05-14 15:53:44.355998785 +0200
  27 @@ -158,7 +158,7 @@ case "$prefix" in
  28    # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib
  29    case $machine in
  30    sparc/sparc64 | x86_64 | powerpc/powerpc64 | s390/s390-64 | \
  31 -  mips/mips64/n64/* )
  32 +  mips/mips64/n64/* | ia64 )
  33      libc_cv_slibdir="/lib64"
  34      if test "$libdir" = '${exec_prefix}/lib'; then
  35        libdir='${exec_prefix}/lib64';
  36 --- libc/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c.jj  2004-05-14 15:42:09.307560515 +0200
  37 +++ libc/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     2003-09-30 00:23:24.000000000 +0200
  38 @@ -0,0 +1,5 @@
  39 +#ifdef IS_IN_ldconfig
  40 +#include <sysdeps/i386/dl-procinfo.c>
  41 +#else
  42 +#include <sysdeps/generic/dl-procinfo.c>
  43 +#endif
  44 --- libc/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed.jj        2002-01-17 07:49:28.000000000 +0100
  45 +++ libc/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   2004-05-14 16:21:03.041325040 +0200
  46 @@ -1 +1,4 @@
  47 -s_^\(RTLDLIST=\)\([^   ]*\)-ia64\(\.so\.[0-9.]*\)[     ]*$_\1"\2-ia64\3 \2\3"_
  48 +/LD_TRACE_LOADED_OBJECTS=1/a\
  49 +add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
  50 +s_^\(RTLDLIST=\)/lib64/ld\([^  ]*\)-ia64\(\.so\.[0-9.]*\)[     ]*$_\1"/lib/ld\2-ia64\3 /lib/ld\2\3"_
  51 +s_^\(RTLDLIST=\)\([^"][^       ]*\)-ia64\(\.so\.[0-9.]*\)[     ]*$_\1"\2-ia64\3 \2\3"_
  52 --- libc/sysdeps/unix/sysv/linux/ia64/ldconfig.h.jj     2001-07-06 06:56:17.000000000 +0200
  53 +++ libc/sysdeps/unix/sysv/linux/ia64/ldconfig.h        2004-05-14 15:45:40.103783087 +0200
  54 @@ -1,4 +1,4 @@
  55 -/* Copyright (C) 2001 Free Software Foundation, Inc.
  56 +/* Copyright (C) 2001, 2004 Free Software Foundation, Inc.
  57     This file is part of the GNU C Library.
  58
  59     The GNU C Library is free software; you can redistribute it and/or
  60 @@ -19,7 +19,8 @@
  61  #include <sysdeps/generic/ldconfig.h>
  62
  63  #define SYSDEP_KNOWN_INTERPRETER_NAMES \
  64 -  { "/lib/ld-linux.so.2", FLAG_ELF_LIBC6 },
  65 +  { "/lib/ld-linux.so.2", FLAG_ELF_LIBC6 }, \
  66 +  { "/lib64/ld-linux-ia64.so.2", FLAG_ELF_LIBC6 },
  67  #define SYSDEP_KNOWN_LIBRARY_NAMES \
  68    { "libc.so.6", FLAG_ELF_LIBC6 },     \
  69    { "libm.so.6", FLAG_ELF_LIBC6 },
  70 --- libc/sysdeps/unix/sysv/linux/ia64/dl-cache.h.jj     2001-07-06 06:56:17.000000000 +0200
  71 +++ libc/sysdeps/unix/sysv/linux/ia64/dl-cache.h        2004-05-14 15:41:11.658891907 +0200
  72 @@ -1,5 +1,5 @@
  73  /* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
  74 -   Copyright (C) 2000 Free Software Foundation, Inc.
  75 +   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
  76     This file is part of the GNU C Library.
  77
  78     The GNU C Library is free software; you can redistribute it and/or
  79 @@ -22,4 +22,4 @@
  80  #define _dl_cache_check_flags(flags) \
  81    ((flags) == _DL_CACHE_DEFAULT_ID)
  82
  83 -#include_next <dl-cache.h>
  84 +#include <sysdeps/unix/sysv/linux/sparc/dl-cache.h>
  85 --- libc/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h.jj  2004-05-14 15:42:13.018895395 +0200
  86 +++ libc/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     2003-07-23 00:06:23.000000000 +0200
  87 @@ -0,0 +1,5 @@
  88 +#ifdef IS_IN_ldconfig
  89 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
  90 +#else
  91 +#include <sysdeps/generic/dl-procinfo.h>
  92 +#endif