about summary refs log tree commit diff
path: root/iconvdata
diff options
context:
space:
mode:
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/Makefile5
-rw-r--r--iconvdata/bug-iconv3.c50
2 files changed, 54 insertions, 1 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 5e96ef5203..c85ffcbcd7 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -58,7 +58,7 @@ modules.so := $(addsuffix .so, $(modules))
 include ../Makeconfig
 
 ifeq (yes,$(build-shared))
-tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4
+tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv3
 
 test-srcs := tst-table-from tst-table-to
 endif
@@ -321,6 +321,9 @@ $(objpfx)bug-iconv1.out: $(objpfx)gconv-modules \
 			 $(addprefix $(objpfx),$(modules.so))
 $(objpfx)bug-iconv2.out: $(objpfx)gconv-modules \
 			 $(addprefix $(objpfx),$(modules.so))
+$(objpfx)bug-iconv3: $(libdl)
+$(objpfx)bug-iconv3.out: $(objpfx)gconv-modules \
+			 $(addprefix $(objpfx),$(modules.so))
 $(objpfx)tst-loading.out: $(objpfx)gconv-modules \
 			  $(addprefix $(objpfx),$(modules.so))
 $(objpfx)tst-iconv4.out: $(objpfx)gconv-modules \
diff --git a/iconvdata/bug-iconv3.c b/iconvdata/bug-iconv3.c
new file mode 100644
index 0000000000..f733db89d4
--- /dev/null
+++ b/iconvdata/bug-iconv3.c
@@ -0,0 +1,50 @@
+/* Copyright (C) 2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
+
+   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 <dlfcn.h>
+#include <iconv.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <gnu/lib-names.h>
+
+
+static int
+do_test (void)
+{
+  /* Get the iconv machinery initialized.  */
+  (void) iconv_open ("ISO-8859-1", "ISO-8859-2");
+
+  /* Dynamically load libpthread.  */
+  if (dlopen (LIBPTHREAD_SO, RTLD_NOW) == NULL)
+    {
+      printf ("cannot load %s: %s\n", LIBPTHREAD_SO, dlerror ());
+      exit (1);
+    }
+
+  /* And load some more.  This call hang for some configuration since
+     the internal locking necessary wasn't adequately written to
+     handle a dynamically loaded libpthread after the first call to
+     iconv_open.  */
+  (void) iconv_open ("ISO-8859-2", "ISO-8859-3");
+
+  return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"