Update.

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

diff --git a/elf/dl-support.c b/elf/dl-support.c
index 8b69ef0..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, 1997 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
@@ -20,9 +20,10 @@
 /* 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 <link.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <elf/ldsodefs.h>
 #include <dl-machine.h>
 
 extern char *__progname;
@@ -36,6 +37,14 @@ const char *_dl_rpath = DEFAULT_RPATH;
 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;
 
@@ -44,9 +53,12 @@ struct r_search_path *_dl_search_paths;
 
 /* We never do profiling.  */
 const char *_dl_profile;
-struct link_map *_dl_profile_map;
 
-extern void __libc_init_secure (void);
+/* 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));
@@ -58,11 +70,9 @@ non_dynamic_init (void)
 
   _dl_pagesize = __getpagesize ();
 
-  __libc_init_secure ();
-
   /* Initialize the data structures for the search paths for shared
      objects.  */
-  _dl_init_paths ();
+  _dl_init_paths (getenv ("LD_LIBRARY_PATH"));
 
 #ifdef DL_PLATFORM_INIT
   DL_PLATFORM_INIT;
@@ -73,3 +83,22 @@ non_dynamic_init (void)
     _dl_platformlen = strlen (_dl_platform);
 }
 text_set_element (__libc_subinit, non_dynamic_init);
+
+const struct r_strlenpair *
+internal_function
+_dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
+                     size_t *max_capstrlen)
+{
+  struct r_strlenpair *result;
+
+  /* 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");
+
+  result[0].str = (char *) result;     /* Does not really matter.  */
+  result[0].len = 0;
+
+  *sz = 1;
+  return result;
+}