Update.

2000-07-28  Andreas Jaeger  <aj@suse.de>

	* sysdeps/gnu/netinet/tcp.h: Add TCP options from Linux 2.4.

	* dlfcn/Makefile ($(objpfx)tst-dladdr): New.
	($(objpfx)tst-dladdr.out): new.
	(tests): Add tst-dladdr.
	($(objpfx)glrefmain): Use libdl.

	* dlfcn/tst-dladdr.c: New file.  Based on a test by Volkmar Sieh
	<vs@caldera.de>.

diff --git a/ChangeLog b/ChangeLog
index c635ffa..e00bd9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-07-28  Andreas Jaeger  <aj@suse.de>
+
+       * sysdeps/gnu/netinet/tcp.h: Add TCP options from Linux 2.4.
+
+       * dlfcn/Makefile ($(objpfx)tst-dladdr): New.
+       ($(objpfx)tst-dladdr.out): new.
+       (tests): Add tst-dladdr.
+       ($(objpfx)glrefmain): Use libdl.
+
+       * dlfcn/tst-dladdr.c: New file.  Based on a test by Volkmar Sieh
+       <vs@caldera.de>.
+       
 2000-07-27  Jes Sorensen  <jes@linuxcare.com>
 
        * sysdeps/unix/sysv/linux/ia64/syscalls.list: Add truncate(64) and

diff --git a/dlfcn/Makefile b/dlfcn/Makefile
index 3989720..a38be42 100644 (file)
--- a/dlfcn/Makefile
+++ b/dlfcn/Makefile
@@ -33,7 +33,7 @@ endif
 libdl-shared-only-routines += eval
 
 ifeq (yes,$(build-shared))
-tests = glrefmain failtest
+tests = glrefmain failtest tst-dladdr
 endif
 modules-names = glreflib1 glreflib2 failtestmod
 extra-objs += $(modules-names:=.os) eval.os
@@ -47,9 +47,12 @@ test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
 $(test-modules): $(objpfx)%.so: $(objpfx)%.os
        $(build-module)
 
-$(objpfx)glrefmain: $(objpfx)libdl.so
+$(objpfx)glrefmain: $(libdl)
 $(objpfx)glrefmain.out: $(objpfx)glrefmain \
                        $(objpfx)glreflib1.so $(objpfx)glreflib2.so
 
 $(objpfx)failtest: $(libdl)
 $(objpfx)failtest.out: $(objpfx)failtestmod.so
+
+$(objpfx)tst-dladdr: $(libdl)
+$(objpfx)tst-dladdr.out: $(objpfx)glreflib1.so

diff --git a/dlfcn/tst-dladdr.c b/dlfcn/tst-dladdr.c
new file mode 100644 (file)
index 0000000..5493a15
--- /dev/null
+++ b/dlfcn/tst-dladdr.c
@@ -0,0 +1,75 @@
+/* Test for dladdr.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   Contributed by Volkmar Sieh <vs@caldera.de> and Andreas Jaeger <aj@suse.de>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <dlfcn.h>
+#include <errno.h>
+#include <error.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+#define TEST_FUNCTION do_test ()
+
+int
+do_test (void)
+{
+  void *handle;
+  int (*sym) (void); /* We load ref1 from glreflib1.c.  */
+  Dl_info info;
+  int ret;
+
+
+  handle = dlopen ("glreflib1.so", RTLD_NOW);
+  if (handle == NULL)
+    error (EXIT_FAILURE, 0, "cannot load: glreflib1.so");
+
+  sym = dlsym (handle, "ref1");
+  if (sym == NULL)
+    error (EXIT_FAILURE, 0, "dlsym failed");
+
+  memset (&info, 0, sizeof (info));
+  ret = dladdr (sym, &info);
+
+  if (ret == 0)
+    error (EXIT_FAILURE, 0, "dladdr failed");
+
+  printf ("address of ref1 = %p\n", sym);
+  printf ("ret = %d\n", ret);
+  printf ("info.dli_fname = %p (\"%s\")\n", info.dli_fname, info.dli_fname);
+  printf ("info.dli_fbase = %p\n", info.dli_fbase);
+  printf ("info.dli_sname = %p (\"%s\")\n", info.dli_sname, info.dli_sname);
+  printf ("info.dli_saddr = %p\n", info.dli_saddr);
+
+  if (info.dli_fname == NULL)
+    error (EXIT_FAILURE, 0, "dli_fname is NULL");
+  if (info.dli_fbase == NULL)
+    error (EXIT_FAILURE, 0, "dli_fbase is NULL");
+  if (info.dli_sname == NULL)
+    error (EXIT_FAILURE, 0, "dli_sname is NULL");
+  if (info.dli_saddr == NULL)
+    error (EXIT_FAILURE, 0, "dli_saddr is NULL");
+
+  dlclose (handle);
+
+  return 0;
+}
+
+
+#include "../test-skeleton.c"