This is the mail archive of the libc-alpha@sources.redhat.com mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
[PATCH] ppc64 ldconfig changes

From: Steve Munroe <sjmunroe at vnet dot ibm dot com>
To: libc-alpha at sources dot redhat dot com
Cc: aj at suse dot de, geoffk at geoffk dot org, roland at frob dot com
Date: Wed, 11 Sep 2002 15:21:48 -0500
Subject: [PATCH] ppc64 ldconfig changes
The following patch allows ldconfig to recognise both 32-bit and 64-bit 
PowerPC libraries.  Used s390 as a template.

2002-06-04  Steven Munroe  <sjmunroe@us.ibm.com>

	* elf/cache.c (print_entry): Add case for FLAG_POWERPC_LIB64.
	* sysdeps/generic/ldconfig.h: Define FLAG_POWERPC_LIB64.
	* 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.
	
>>>>>>> ppc64-ldconfig.patch
diff -rupPN libc23-cvstip-20020906/elf/cache.c libc23/elf/cache.c
--- libc23-cvstip-20020906/elf/cache.c	Mon Apr  8 10:20:59 2002
+++ libc23/elf/cache.c	Fri Sep  6 15:19:48 2002
@@ -71,24 +71,21 @@ print_entry (const char *lib, int flag, 
     }
   switch (flag & FLAG_REQUIRED_MASK)
     {
-#ifdef __sparc__
     case FLAG_SPARC_LIB64:
       fputs (",64bit", stdout);
-#endif
-#if defined __ia64__ || defined __i386__
+      break;
     case FLAG_IA64_LIB64:
       fputs (",IA-64", stdout);
       break;
-#endif
-#if defined __x86_64__ || defined __i386__
     case FLAG_X8664_LIB64:
       fputs (",x86-64", stdout);
       break;
-#endif
-#if defined __s390__ || defined __s390x__
     case FLAG_S390_LIB64:
       fputs(",64bit", stdout);
-#endif
+      break;
+    case FLAG_POWERPC_LIB64:
+      fputs(",64bit", stdout);
+      break;
     case 0:
       break;
     default:
diff -rupPN libc23-cvstip-20020906/sysdeps/generic/ldconfig.h libc23/sysdeps/generic/ldconfig.h
--- libc23-cvstip-20020906/sysdeps/generic/ldconfig.h	Thu Jul  5 23:55:49 2001
+++ libc23/sysdeps/generic/ldconfig.h	Fri Sep  6 15:19:48 2002
@@ -31,6 +31,7 @@
 #define FLAG_IA64_LIB64		0x0200
 #define FLAG_X8664_LIB64	0x0300
 #define FLAG_S390_LIB64		0x0400
+#define FLAG_POWERPC_LIB64	0x0500
 
 /* Declared in cache.c.  */
 extern void print_cache (const char *cache_name);
diff -rupPN libc23-cvstip-20020906/sysdeps/unix/sysv/linux/powerpc/ldconfig.h libc23/sysdeps/unix/sysv/linux/powerpc/ldconfig.h
--- libc23-cvstip-20020906/sysdeps/unix/sysv/linux/powerpc/ldconfig.h	Wed Dec 31 18:00:00 1969
+++ libc23/sysdeps/unix/sysv/linux/powerpc/ldconfig.h	Fri Sep  6 15:19:48 2002
@@ -0,0 +1,26 @@
+/* Copyright (C) 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 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 },
diff -rupPN libc23-cvstip-20020906/sysdeps/unix/sysv/linux/powerpc/readelflib.c libc23/sysdeps/unix/sysv/linux/powerpc/readelflib.c
--- libc23-cvstip-20020906/sysdeps/unix/sysv/linux/powerpc/readelflib.c	Wed Dec 31 18:00:00 1969
+++ libc23/sysdeps/unix/sysv/linux/powerpc/readelflib.c	Fri Sep  6 15:19:48 2002
@@ -0,0 +1,60 @@
+/* Copyright (C) 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 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"
diff -rupPN libc23-cvstip-20020906/sysdeps/unix/sysv/linux/powerpc/powerpc64/dl-cache.h libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/dl-cache.h
--- libc23-cvstip-20020906/sysdeps/unix/sysv/linux/powerpc/powerpc64/dl-cache.h	Wed Dec 31 18:00:00 1969
+++ libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/dl-cache.h	Fri Sep  6 15:19:48 2002
@@ -0,0 +1,25 @@
+/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
+   Copyright (C) 1999, 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.  */
+
+#define _DL_CACHE_DEFAULT_ID	0x503
+
+#define _dl_cache_check_flags(flags)			\
+  ((flags) == _DL_CACHE_DEFAULT_ID)
+
+#include_next <dl-cache.h>
<<<<<<<	ppc64-ldconfig.patch
Follow-Ups:
- Re: [PATCH] ppc64 ldconfig changes
  - From: Roland McGrath
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]