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

* sysdeps/generic/ldconfig.h (FLAG_POWERPC_LIB64) New macro.

Browse Source 
* elf/cache.c (print_entry): Add case for FLAG_POWERPC_LIB64.
	Remove per-machine conditionals for FLAG_* cases.
	* sysdeps/unix/sysv/linux/powerpc/ldconfig.h: New file.
	* sysdeps/unix/sysv/linux/powerpc/readelflib.c: New file.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/dl-cache.h: New file.
This commit is contained in:
Roland McGrath
2002-09-14 09:00:42 +00:00
parent 65233b5850
commit 48c5307058
6 changed files with 128 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2002-06-04 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/generic/ldconfig.h (FLAG_POWERPC_LIB64) New macro.
* elf/cache.c (print_entry): Add case for FLAG_POWERPC_LIB64.
Remove per-machine conditionals for FLAG_* cases.
* sysdeps/unix/sysv/linux/powerpc/ldconfig.h: New file.
* sysdeps/unix/sysv/linux/powerpc/readelflib.c: New file.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/dl-cache.h: New file.
2002-09-10 Alan Modra <amodra@bigpond.net.au> 2002-09-10 Alan Modra <amodra@bigpond.net.au>
* csu/gmon-start.c [!TEXT_START]: Define TEXT_START if not already * csu/gmon-start.c [!TEXT_START]: Define TEXT_START if not already

13
elf/cache.c
View File

@ -71,24 +71,21 @@ print_entry (const char *lib, int flag, unsigned int osversion,
} }
switch (flag & FLAG_REQUIRED_MASK) switch (flag & FLAG_REQUIRED_MASK)
{ {
#ifdef __sparc__
case FLAG_SPARC_LIB64: case FLAG_SPARC_LIB64:
fputs (",64bit", stdout); fputs (",64bit", stdout);
#endif break;
#if defined __ia64__ || defined __i386__
case FLAG_IA64_LIB64: case FLAG_IA64_LIB64:
fputs (",IA-64", stdout); fputs (",IA-64", stdout);
break; break;
#endif
#if defined __x86_64__ || defined __i386__
case FLAG_X8664_LIB64: case FLAG_X8664_LIB64:
fputs (",x86-64", stdout); fputs (",x86-64", stdout);
break; break;
#endif
#if defined __s390__ || defined __s390x__
case FLAG_S390_LIB64: case FLAG_S390_LIB64:
fputs(",64bit", stdout); fputs(",64bit", stdout);
#endif break;
case FLAG_POWERPC_LIB64:
fputs(",64bit", stdout);
break;
case 0: case 0:
break; break;
default: default:

1
sysdeps/generic/ldconfig.h
View File

@ -31,6 +31,7 @@
#define FLAG_IA64_LIB64 0x0200 #define FLAG_IA64_LIB64 0x0200
#define FLAG_X8664_LIB64 0x0300 #define FLAG_X8664_LIB64 0x0300
#define FLAG_S390_LIB64 0x0400 #define FLAG_S390_LIB64 0x0400
#define FLAG_POWERPC_LIB64 0x0500
/* Declared in cache.c. */ /* Declared in cache.c. */
extern void print_cache (const char *cache_name); extern void print_cache (const char *cache_name);

27
sysdeps/unix/sysv/linux/powerpc/ldconfig.h Normal file
View File

@ -0,0 +1,27 @@
/* ldconfig default paths and libraries. Linux/PowerPC version.
Copyright (C) 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
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. */
#include <sysdeps/generic/ldconfig.h>
#define SYSDEP_KNOWN_INTERPRETER_NAMES \
{ "/lib/ld.so.1", FLAG_ELF_LIBC6 }, \
{ "/lib64/ld64.so.1", FLAG_ELF_LIBC6 },
#define SYSDEP_KNOWN_LIBRARY_NAMES \
{ "libc.so.6", FLAG_ELF_LIBC6 }, \
{ "libm.so.6", FLAG_ELF_LIBC6 },

25
sysdeps/unix/sysv/linux/powerpc/powerpc64/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) 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
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. */
#define _DL_CACHE_DEFAULT_ID 0x503
#define _dl_cache_check_flags(flags) \
((flags) == _DL_CACHE_DEFAULT_ID)
#include_next <dl-cache.h>

61
sysdeps/unix/sysv/linux/powerpc/readelflib.c Normal file
View File

@ -0,0 +1,61 @@
/* Special checks on libraries for ldconfig. Linux/PowerPC version.
Copyright (C) 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
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. */
int process_elf32_file (const char *file_name, const char *lib, int *flag,
unsigned int *osversion, char **soname,
void *file_contents, size_t file_length);
int process_elf64_file (const char *file_name, const char *lib, int *flag,
unsigned int *osversion, 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,
unsigned int *osversion, 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, osversion, soname,
file_contents, file_length);
else
{
ret = process_elf64_file (file_name, lib, flag, osversion, soname,
file_contents, file_length);
/* PowerPC 64bit libraries are always libc.so.6+. */
if (!ret)
*flag = FLAG_POWERPC_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"