Update.

[platform/upstream/glibc.git] / elf / dl-support.c

diff --git a/elf/dl-support.c b/elf/dl-support.c
index 35710a0..73c90c2 100644 (file)
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -1,5 +1,5 @@
 /* Support for dynamic linking code in static libc.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 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
@@ -17,69 +17,88 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <assert.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-
 /* This file defines some things that for the dynamic linker are defined in
    rtld.c and dl-sysdep.c in ways appropriate to bootstrap dynamic linking.  */
 
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <elf/ldsodefs.h>
+#include <dl-machine.h>
+
 extern char *__progname;
 char **_dl_argv = &__progname; /* This is checked for some error messages.  */
 
 /* This defines the default search path for libraries.
    For the dynamic linker it is set by -rpath when linking.  */
 const char *_dl_rpath = DEFAULT_RPATH;
-\f
-/* This is the only dl-sysdep.c function that is actually needed at run-time
-   by _dl_map_object.  */
 
-int
-_dl_sysdep_open_zero_fill (void)
+/* Name of the architecture.  */
+const char *_dl_platform;
+size_t _dl_platformlen;
+
+int _dl_debug_libs;
+int _dl_debug_impcalls;
+int _dl_debug_bindings;
+int _dl_debug_symbols;
+int _dl_debug_versions;
+int _dl_debug_reloc;
+int _dl_debug_files;
+
+/* If nonzero print warnings about problematic situations.  */
+int _dl_verbose;
+
+/* Structure to store information about search paths.  */
+struct r_search_path *_dl_search_paths;
+
+/* We never do profiling.  */
+const char *_dl_profile;
+
+/* Names of shared object for which the RPATHs should be ignored.  */
+const char *_dl_inhibit_rpath;
+
+/* This is the address of the last stack address ever used.  */
+void *__libc_stack_end;
+
+
+static void non_dynamic_init (void) __attribute__ ((unused));
+
+static void
+non_dynamic_init (void)
 {
-  return __open ("/dev/zero", O_RDONLY);
+  _dl_verbose = *(getenv ("LD_WARN") ?: "") == '\0' ? 0 : 1;
+
+  _dl_pagesize = __getpagesize ();
+
+  /* Initialize the data structures for the search paths for shared
+     objects.  */
+  _dl_init_paths (getenv ("LD_LIBRARY_PATH"));
+
+#ifdef DL_PLATFORM_INIT
+  DL_PLATFORM_INIT;
+#endif
+
+  /* Now determine the length of the platform string.  */
+  if (_dl_platform != NULL)
+    _dl_platformlen = strlen (_dl_platform);
 }
+text_set_element (__libc_subinit, non_dynamic_init);
 
-/* This should never be called.  */
-void
-_dl_sysdep_fatal (void)
+const struct r_strlenpair *
+internal_function
+_dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
+                     size_t *max_capstrlen)
 {
-  assert (! "_dl_sysdep_fatal called");
-}
+  struct r_strlenpair *result;
 
-/* Read the whole contents of FILE into new mmap'd space with given
-   protections.  *SIZEP gets the size of the file.  */
+  /* XXX We don't try to find the capabilities in this case.  */
+  result = (struct r_strlenpair *) malloc (sizeof (*result));
+  if (result == NULL)
+    _dl_signal_error (ENOMEM, NULL, "cannot create capability list");
 
-void *
-_dl_sysdep_read_whole_file (const char *file, size_t *sizep, int prot)
-{
-  void *result;
-  struct stat st;
-  int fd = __open (file, O_RDONLY);
-  if (fd < 0)
-    return NULL;
-  if (__fstat (fd, &st) < 0)
-    result = NULL;
-  else
-    {
-      /* Map a copy of the file contents.  */
-      result = __mmap (0, st.st_size, prot,
-#ifdef MAP_COPY
-                       MAP_COPY
-#else
-                       MAP_PRIVATE
-#endif
-#ifdef MAP_FILE
-                       | MAP_FILE
-#endif
-                       , fd, 0);
-      if (result == (void *) -1)
-        result = NULL;
-      else
-        *sizep = st.st_size;
-    }
-  __close (fd);
+  result[0].str = (char *) result;     /* Does not really matter.  */
+  result[0].len = 0;
+
+  *sz = 1;
   return result;
 }