lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

Update.

Browse Source 
2000-09-29  H.J. Lu  <hjl@gnu.org>

	* sysdeps/unix/sysv/linux/ia64/dl-cache.h: New.

	* elf/cache.c (print_entry): Replace 64bit with IA-64 in message
	for x86/IA-64 binary.

2000-09-29  Andreas Schwab  <schwab@suse.de>

	* sysdeps/unix/sysv/linux/ia64/readelflib.c: New file.

	* elf/cache.c (print_entry): Check for FLAG_IA64_LIB64.
This commit is contained in:
Ulrich Drepper
2000-09-29 22:53:14 +00:00
parent ed099f029e
commit 955821742e
4 changed files with 101 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@@ -1,3 +1,16 @@
2000-09-29 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/ia64/dl-cache.h: New.
* elf/cache.c (print_entry): Replace 64bit with IA-64 in message
for x86/IA-64 binary.
2000-09-29 Andreas Schwab <schwab@suse.de>
* sysdeps/unix/sysv/linux/ia64/readelflib.c: New file.
* elf/cache.c (print_entry): Check for FLAG_IA64_LIB64.
2000-09-29 Mark Kettenis <kettenis@gnu.org> 2000-09-29 Mark Kettenis <kettenis@gnu.org>
* sysdeps/mach/hurd/dl-sysdep.c (__access): New function. Dummy * sysdeps/mach/hurd/dl-sysdep.c (__access): New function. Dummy

8
elf/cache.c
View File

@@ -71,6 +71,10 @@ print_entry (const char *lib, int flag, unsigned long int hwcap, const char *key
#ifdef __sparc__ #ifdef __sparc__
case FLAG_SPARC_LIB64: case FLAG_SPARC_LIB64:
fputs (",64bit", stdout); fputs (",64bit", stdout);
#endif
#if defined __ia64__ || defined __i386__
case FLAG_IA64_LIB64:
fputs (",IA-64", stdout);
#endif #endif
case 0: case 0:
break; break;
@@ -285,9 +289,9 @@ save_cache (const char *cache_name)
file_entries_new->nlibs = cache_entry_count; file_entries_new->nlibs = cache_entry_count;
file_entries_new->len_strings = total_strlen; file_entries_new->len_strings = total_strlen;
} }
pad = ALIGN_CACHE (file_entries_size) - file_entries_size; pad = ALIGN_CACHE (file_entries_size) - file_entries_size;
/* If we have both formats, we hide the new format in the strings /* If we have both formats, we hide the new format in the strings
table, we have to adjust all string indices for this so that table, we have to adjust all string indices for this so that
old libc5/glibc 2 dynamic linkers just ignore them. */ old libc5/glibc 2 dynamic linkers just ignore them. */

25
sysdeps/unix/sysv/linux/ia64/dl-cache.h Normal file
View File

@@ -0,0 +1,25 @@
/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
Copyright (C) 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 Library General Public License as
published by the Free Software Foundation; either version 2 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
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, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#define _DL_CACHE_DEFAULT_ID 0x203
#define _dl_cache_check_flags(flags) \
((flags) == _DL_CACHE_DEFAULT_ID)
#include_next <dl-cache.h>

57
sysdeps/unix/sysv/linux/ia64/readelflib.c Normal file
View File

@@ -0,0 +1,57 @@
/* Copyright (C) 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 Library General Public License as
published by the Free Software Foundation; either version 2 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
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, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
int process_elf32_file (const char *file_name, const char *lib, int *flag,
char **soname, void *file_contents, size_t file_length);
int process_elf64_file (const char *file_name, const char *lib, int *flag,
char **soname, void *file_contents, size_t file_length);
/* Returns 0 if everything is ok, != 0 in case of error. */
int
process_elf_file (const char *file_name, const char *lib, int *flag,
char **soname, void *file_contents, size_t file_length)
{
ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
int ret;
if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
return process_elf32_file (file_name, lib, flag, soname, file_contents,
file_length);
else
{
ret = process_elf64_file (file_name, lib, flag, soname, file_contents,
file_length);
/* Intel 64bit libraries are always libc.so.6+. */
if (!ret)
*flag = FLAG_IA64_LIB64|FLAG_ELF_LIBC6;
return ret;
}
}
#undef __ELF_NATIVE_CLASS
#undef process_elf_file
#define process_elf_file process_elf32_file
#define __ELF_NATIVE_CLASS 32
#include "sysdeps/generic/readelflib.c"
#undef __ELF_NATIVE_CLASS
#undef process_elf_file
#define process_elf_file process_elf64_file
#define __ELF_NATIVE_CLASS 64
#include "sysdeps/generic/readelflib.c"