3 files changed, 1 insertions, 147 deletions
diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c
deleted file mode 100644
index cdf7444e112..00000000000
--- a/src/backend/port/dynloader/bsdi.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * dynloader.c
- *	  Dynamic Loader for Postgres for Linux, generated from those for
- *	  Ultrix.
- *
- *	  You need to install the dld library on your Linux system!
- *
- * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- *
- * IDENTIFICATION
- *	  src/backend/port/dynloader/bsdi.c
- *
- *-------------------------------------------------------------------------
- */
-#include "postgres.h"
-#ifndef HAVE_DLOPEN
-
-extern char my_exec_path[];
-
-void *
-pg_dlopen(char *filename)
-{
-	static int	dl_initialized = 0;
-
-	/*
-	 * initializes the dynamic loader with the executable's pathname. (only
-	 * needs to do this the first time pg_dlopen is called.)
-	 */
-	if (!dl_initialized)
-	{
-		if (dld_init(dld_find_executable(my_exec_path)))
-			return NULL;
-
-		/*
-		 * if there are undefined symbols, we want dl to search from the
-		 * following libraries also.
-		 */
-		dl_initialized = 1;
-	}
-
-	/*
-	 * link the file, then check for undefined symbols!
-	 */
-	if (dld_link(filename))
-		return NULL;
-
-	/*
-	 * If undefined symbols: try to link with the C and math libraries! This
-	 * could be smarter, if the dynamic linker was able to handle shared libs!
-	 */
-	if (dld_undefined_sym_count > 0)
-	{
-		if (dld_link("/usr/lib/libc.a"))
-		{
-			elog(WARNING, "could not link C library");
-			return NULL;
-		}
-		if (dld_undefined_sym_count > 0)
-		{
-			if (dld_link("/usr/lib/libm.a"))
-			{
-				elog(WARNING, "could not link math library");
-				return NULL;
-			}
-			if (dld_undefined_sym_count > 0)
-			{
-				int			count = dld_undefined_sym_count;
-				char	  **list = dld_list_undefined_sym();
-
-				/* list the undefined symbols, if any */
-				do
-				{
-					elog(WARNING, "\"%s\" is undefined", *list);
-					list++;
-					count--;
-				} while (count > 0);
-
-				dld_unlink_by_file(filename, 1);
-				return NULL;
-			}
-		}
-	}
-
-	return (void *) strdup(filename);
-}
-
-char *
-pg_dlerror()
-{
-	return dld_strerror(dld_errno);
-}
-
-#endif   /* not HAVE_DLOPEN */
diff --git a/src/backend/port/dynloader/bsdi.h b/src/backend/port/dynloader/bsdi.h
deleted file mode 100644
index a4b626bacb0..00000000000
--- a/src/backend/port/dynloader/bsdi.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * bsdi.h
- *		Dynamic loader interface for BSD/OS
- *
- * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/backend/port/dynloader/bsdi.h
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PORT_PROTOS_H
-#define PORT_PROTOS_H
-
-#include "utils/dynamic_loader.h"	/* pgrminclude ignore */
-
-
-#ifdef HAVE_DLOPEN
-
-#include <dlfcn.h>
-
-/*
- * In some older systems, the RTLD_NOW flag isn't defined and the mode
- * argument to dlopen must always be 1.  The RTLD_GLOBAL flag is wanted
- * if available, but it doesn't exist everywhere.
- * If it doesn't exist, set it to 0 so it has no effect.
- */
-#ifndef RTLD_NOW
-#define RTLD_NOW 1
-#endif
-#ifndef RTLD_GLOBAL
-#define RTLD_GLOBAL 0
-#endif
-
-#define		  pg_dlopen(f)	  dlopen((f), RTLD_NOW | RTLD_GLOBAL)
-#define		  pg_dlsym		  dlsym
-#define		  pg_dlclose	  dlclose
-#define		  pg_dlerror	  dlerror
-#else							/* not HAVE_DLOPEN */
-
-#define pg_dlsym(handle, funcname)	  ((PGFunction) dld_get_func((funcname)))
-#define pg_dlclose(handle) \
-do { \
-	dld_unlink_by_file(handle, 1); \
-	free(handle); \
-} while (0)
-#endif   /* not HAVE_DLOPEN */
-
-#endif   /* PORT_PROTOS_H */
diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c
index f1497c63f42..47c47a4e107 100644
--- a/src/backend/utils/misc/ps_status.c
+++ b/src/backend/utils/misc/ps_status.c
@@ -64,7 +64,7 @@ bool		update_process_title = true;
 #define PS_USE_PSTAT
 #elif defined(HAVE_PS_STRINGS)
 #define PS_USE_PS_STRINGS
-#elif (defined(BSD) || defined(__bsdi__) || defined(__hurd__)) && !defined(__darwin__)
+#elif (defined(BSD) || defined(__hurd__)) && !defined(__darwin__)
 #define PS_USE_CHANGE_ARGV
 #elif defined(__linux__) || defined(_AIX) || defined(__sgi) || (defined(sun) && !defined(BSD)) || defined(ultrix) || defined(__ksr__) || defined(__osf__) || defined(__svr5__) || defined(__darwin__)
 #define PS_USE_CLOBBER_ARGV