[Glibc-bsd-commits] r1837 - in trunk: glibc-2.3-head/sysdeps/kfreebsd/x86_64 glibc-ports/kfreebsd/x86_64

[Aurelien Jarno]

Author: aurel32
Date: 2007-01-04 18:32:01 +0100 (Thu, 04 Jan 2007)
New Revision: 1837

Added:
   trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/dl-cache.h
   trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/readelflib.c
   trunk/glibc-ports/kfreebsd/x86_64/dl-cache.h
   trunk/glibc-ports/kfreebsd/x86_64/readelflib.c
Log:
biarch support for ldconfig


Added: trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/dl-cache.h
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/dl-cache.h	2007-01-04 11:51:50 UTC (rev 1836)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/dl-cache.h	2007-01-04 17:32:01 UTC (rev 1837)
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/x86_64/dl-cache.h>

Added: trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/readelflib.c
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/readelflib.c	2007-01-04 11:51:50 UTC (rev 1836)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/readelflib.c	2007-01-04 17:32:01 UTC (rev 1837)
@@ -0,0 +1,62 @@
+/* Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Andreas Jaeger <aj at suse.de>, 1999 and
+		  Jakub Jelinek <jakub at redhat.com>, 1999.
+
+   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);
+      /* x86-64 64bit libraries are always LIBC6.  */
+      if (!ret)
+	*flag = FLAG_X8664_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"

Added: trunk/glibc-ports/kfreebsd/x86_64/dl-cache.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/dl-cache.h	2007-01-04 11:51:50 UTC (rev 1836)
+++ trunk/glibc-ports/kfreebsd/x86_64/dl-cache.h	2007-01-04 17:32:01 UTC (rev 1837)
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/x86_64/dl-cache.h>

Added: trunk/glibc-ports/kfreebsd/x86_64/readelflib.c
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/readelflib.c	2007-01-04 11:51:50 UTC (rev 1836)
+++ trunk/glibc-ports/kfreebsd/x86_64/readelflib.c	2007-01-04 17:32:01 UTC (rev 1837)
@@ -0,0 +1,62 @@
+/* Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Andreas Jaeger <aj at suse.de>, 1999 and
+		  Jakub Jelinek <jakub at redhat.com>, 1999.
+
+   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);
+      /* x86-64 64bit libraries are always LIBC6.  */
+      if (!ret)
+	*flag = FLAG_X8664_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"