Remove alleged support for last-millennium Unixes

Remove workarounds for NeXTStep (last released in 1995), SunOS (1994),
HP-UX 9.x (1992) and 10.x (1995), OSF/1 / Digital UNIX / Tru64 UNIX
4.x (1999), and AIX 4.x (1999).

HP-UX 11 implements dlopen(), so dropping support for earlier versions
also lets us remove the HP-UX-specific gmodule-dld.

https://bugzilla.gnome.org/show_bug.cgi?id=710519

5 files changed, 5 insertions, 175 deletions

diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index e71270cc8..85d37dbfa 100644
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -13,7 +13,6 @@ EXTRA_DIST +=				\
 		makefile.msc.in 	\
 		gmoduleconf.h.in 	\
 		gmodule-dl.c		\
-		gmodule-dld.c		\
 		gmodule-dyld.c		\
 		gmodule-win32.c		\
 		gmodule-ar.c		\
diff --git a/gmodule/gmodule-dld.c b/gmodule/gmodule-dld.c
deleted file mode 100644
index 401b32f73..000000000
--- a/gmodule/gmodule-dld.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* GMODULE - GLIB wrapper code for dynamic module loading
- * Copyright (C) 1998, 2000 Tim Janik
- *
- * This 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 of the License, or (at your option) any later version.
- *
- * This 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 this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/* 
- * MT safe
- */
-#include "config.h"
-
-#include <dl.h>
-
-
-/* some flags are missing on some systems, so we provide
- * harmless defaults.
- *
- * Mandatory:
- * BIND_IMMEDIATE  - Resolve symbol references when the library is loaded.
- * BIND_DEFERRED   - Delay code symbol resolution until actual reference.
- *
- * Optionally:
- * BIND_FIRST	   - Place the library at the head of the symbol search order.
- * BIND_NONFATAL   - The default BIND_IMMEDIATE behavior is to treat all unsatisfied
- *		     symbols as fatal.	This flag allows binding of unsatisfied code
- *		     symbols to be deferred until use.
- *		     [Perl: For certain libraries, like DCE, deferred binding often
- *		     causes run time problems.	Adding BIND_NONFATAL to BIND_IMMEDIATE
- *		     still allows unresolved references in situations like this.]
- * BIND_NOSTART	   - Do not call the initializer for the shared library when the
- *		     library is loaded, nor on a future call to shl_unload().
- * BIND_VERBOSE	   - Print verbose messages concerning possible unsatisfied symbols.
- *
- * hp9000s700/hp9000s800:
- * BIND_RESTRICTED - Restrict symbols visible by the library to those present at
- *		     library load time.
- * DYNAMIC_PATH	   - Allow the loader to dynamically search for the library specified
- *		     by the path argument.
- */
-#ifndef	DYNAMIC_PATH
-#define	DYNAMIC_PATH	0
-#endif	/* DYNAMIC_PATH */
-#ifndef	BIND_RESTRICTED
-#define	BIND_RESTRICTED	0
-#endif	/* BIND_RESTRICTED */
-
-#define	OPT_BIND_FLAGS	(BIND_NONFATAL | BIND_VERBOSE)
-
-
-/* --- functions --- */
-
-/*
- * shl_load() does not appear to support making symbols invisible to
- * the global namespace.  However, the default is to put the library
- * last in the search order, which is approximately what we want,
- * since it will cause symbols that conflict with existing symbols to
- * be invisible.  It is unclear if BIND_FIRST should be used when
- * bind_local==0, since it may cause the loaded symbols to be used
- * preferentially to the application's symbols, which is Almost
- * Always Wrong.  --ds
- */
-static gpointer
-_g_module_open (const gchar *file_name,
-		gboolean     bind_lazy,
-		gboolean     bind_local)
-{
-  shl_t shl_handle;
-  
-  shl_handle = shl_load (file_name,
-			 (bind_lazy ? BIND_DEFERRED : BIND_IMMEDIATE) | OPT_BIND_FLAGS, 0);
-  if (!shl_handle)
-    {
-      /* the hp-docs say we should better abort() if errno==ENOSYM ;( */
-      g_module_set_error (g_strerror (errno));
-    }
-  
-  return (gpointer) shl_handle;
-}
-
-static gpointer
-_g_module_self (void)
-{
-  shl_t shl_handle;
-  
-  shl_handle = PROG_HANDLE;
-  if (!shl_handle)
-    g_module_set_error (g_strerror (errno));
-  
-  return shl_handle;
-}
-
-static void
-_g_module_close (gpointer handle,
-		 gboolean is_unref)
-{
-  if (!is_unref)
-    {
-      if (shl_unload ((shl_t) handle) != 0)
-	g_module_set_error (g_strerror (errno));
-    }
-}
-
-static gpointer
-_g_module_symbol (gpointer     handle,
-		  const gchar *symbol_name)
-{
-  gpointer p = NULL;
-  
-  /* should we restrict lookups to TYPE_PROCEDURE?
-   */
-  if (handle == PROG_HANDLE)
-    {
-      /* PROG_HANDLE will only lookup symbols in the program itself, not honouring
-       * libraries. passing NULL as a handle will also try to lookup the symbol
-       * in currently loaded libraries. fix pointed out and supplied by:
-       * David Gero <dgero@nortelnetworks.com>
-       */
-      handle = NULL;
-    }
-  if (shl_findsym ((shl_t*) &handle, symbol_name, TYPE_UNDEFINED, &p) != 0 ||
-      handle == NULL || p == NULL)
-    {
-      /* the hp-docs say we should better abort() if errno==ENOSYM ;( */
-      g_module_set_error (g_strerror (errno));
-    }
-  
-  return p;
-}
-
-static gchar*
-_g_module_build_path (const gchar *directory,
-		      const gchar *module_name)
-{
-  if (directory && *directory)
-    if (strncmp (module_name, "lib", 3) == 0)
-      return g_strconcat (directory, "/", module_name, NULL);
-    else
-      return g_strconcat (directory, "/lib", module_name, ".sl", NULL);
-  else if (strncmp (module_name, "lib", 3) == 0)
-    return g_strdup (module_name);
-  else
-    return g_strconcat ("lib", module_name, ".sl", NULL);
-}
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index ebeacef90..e441bbc9d 100644
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -56,7 +56,7 @@
  * These functions provide a portable way to dynamically load object files
  * (commonly known as 'plug-ins'). The current implementation supports all
  * systems that provide an implementation of dlopen() (e.g. Linux/Sun), as
- * well as HP-UX via its shl_load() mechanism, and Windows platforms via DLLs.
+ * well as Windows platforms via DLLs.
  *
  * A program which wants to use these functions must be linked to the
  * libraries output by the command
@@ -167,8 +167,8 @@
  * G_MODULE_SUFFIX:
  *
  * Expands to the proper shared library suffix for the current platform
- * without the leading dot. For the most Unices and Linux this is "so",
- * for some HP-UX versions this is "sl" and for Windows this is "dll".
+ * without the leading dot. For most Unices and Linux this is "so", and
+ * for Windows this is "dll".
  */
 
 /**
@@ -187,9 +187,7 @@
 
 /* We maintain a list of modules, so we can reference count them.
  * That's needed because some platforms don't support references counts on
- * modules e.g. the shl_* implementation of HP-UX
- * (http://www.stat.umn.edu/~luke/xls/projects/dlbasics/dlbasics.html).
- * Also, the module for the program itself is kept seperatedly for
+ * modules. Also, the module for the program itself is kept seperately for
  * faster access and because it has special semantics.
  */
 
@@ -287,8 +285,6 @@ g_module_set_error (const gchar *error)
 #define	SUPPORT_OR_RETURN(rv)	{ g_module_set_error (NULL); }
 #if	(G_MODULE_IMPL == G_MODULE_IMPL_DL)
 #include "gmodule-dl.c"
-#elif	(G_MODULE_IMPL == G_MODULE_IMPL_DLD)
-#include "gmodule-dld.c"
 #elif	(G_MODULE_IMPL == G_MODULE_IMPL_WIN32)
 #include "gmodule-win32.c"
 #elif	(G_MODULE_IMPL == G_MODULE_IMPL_DYLD)
diff --git a/gmodule/gmoduleconf.h.in b/gmodule/gmoduleconf.h.in
index 4e3af4ede..d954c2ef7 100644
--- a/gmodule/gmoduleconf.h.in
+++ b/gmodule/gmoduleconf.h.in
@@ -27,7 +27,6 @@ extern "C" {
 
 #define	G_MODULE_IMPL_NONE	0
 #define	G_MODULE_IMPL_DL	1
-#define	G_MODULE_IMPL_DLD	2
 #define	G_MODULE_IMPL_WIN32	3
 #define	G_MODULE_IMPL_DYLD	6
 #define	G_MODULE_IMPL_AR	7
@@ -37,7 +36,7 @@ extern "C" {
 #if	(@G_MODULE_HAVE_DLERROR@)
 #define	G_MODULE_HAVE_DLERROR
 #endif
-#if	(@G_MODULE_NEED_USCORE@) || defined (hp9000s300) || defined (__hp9000s300) || defined (__hp9000s300__)
+#if	(@G_MODULE_NEED_USCORE@)
 #define	G_MODULE_NEED_USCORE
 #endif
 #if	(@G_MODULE_BROKEN_RTLD_GLOBAL@)
diff --git a/gmodule/gmoduleconf.h.win32 b/gmodule/gmoduleconf.h.win32
index b047c977b..a0fe3afe8 100644
--- a/gmodule/gmoduleconf.h.win32
+++ b/gmodule/gmoduleconf.h.win32
@@ -27,7 +27,6 @@ extern "C" {
 
 #define	G_MODULE_IMPL_NONE	0
 #define	G_MODULE_IMPL_DL	1
-#define	G_MODULE_IMPL_DLD	2
 #define	G_MODULE_IMPL_WIN32	3
 #define	G_MODULE_IMPL_DYLD	6