diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.shlib | 4 | ||||
| -rw-r--r-- | src/backend/main/main.c | 29 | ||||
| -rw-r--r-- | src/backend/port/dynloader/osf.c | 7 | ||||
| -rw-r--r-- | src/backend/port/dynloader/osf.h | 47 | ||||
| -rw-r--r-- | src/backend/utils/misc/ps_status.c | 2 | ||||
| -rw-r--r-- | src/include/port/osf.h | 4 | ||||
| -rw-r--r-- | src/include/storage/barrier.h | 9 | ||||
| -rw-r--r-- | src/include/storage/s_lock.h | 66 | ||||
| -rw-r--r-- | src/makefiles/Makefile.osf | 10 | ||||
| -rw-r--r-- | src/template/osf | 6 |
10 files changed, 1 insertions, 183 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 029c7e96fc..0bf3a17e1e 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -236,10 +236,6 @@ ifeq ($(PORTNAME), solaris) endif endif -ifeq ($(PORTNAME), osf) - LINK.shared = $(LD) -shared -expect_unresolved '*' -endif - ifeq ($(PORTNAME), sco) ifeq ($(GCC), yes) LINK.shared = $(CC) -shared diff --git a/src/backend/main/main.c b/src/backend/main/main.c index c6fb8c9fbe..c1116e0f15 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -22,14 +22,6 @@ #include <unistd.h> -#if defined(__alpha) && defined(__osf__) /* no __alpha__ ? */ -#include <sys/sysinfo.h> -#include "machine/hal_sysinfo.h" -#define ASSEMBLER -#include <sys/proc.h> -#undef ASSEMBLER -#endif - #if defined(__NetBSD__) #include <sys/param.h> #endif @@ -245,27 +237,6 @@ static void startup_hacks(const char *progname) { /* - * On some platforms, unaligned memory accesses result in a kernel trap; - * the default kernel behavior is to emulate the memory access, but this - * results in a significant performance penalty. We want PG never to make - * such unaligned memory accesses, so this code disables the kernel - * emulation: unaligned accesses will result in SIGBUS instead. - */ -#ifdef NOFIXADE - -#if defined(__alpha) /* no __alpha__ ? */ - { - int buffer[] = {SSIN_UACPROC, UAC_SIGBUS | UAC_NOPRINT}; - - if (setsysinfo(SSI_NVPAIRS, buffer, 1, (caddr_t) NULL, - (unsigned long) NULL) < 0) - write_stderr("%s: setsysinfo failed: %s\n", - progname, strerror(errno)); - } -#endif /* __alpha */ -#endif /* NOFIXADE */ - - /* * Windows-specific execution environment hacking. */ #ifdef WIN32 diff --git a/src/backend/port/dynloader/osf.c b/src/backend/port/dynloader/osf.c deleted file mode 100644 index aabf8054cd..0000000000 --- a/src/backend/port/dynloader/osf.c +++ /dev/null @@ -1,7 +0,0 @@ -/* - * src/backend/port/dynloader/osf.c - * - * Dummy file used for nothing at this point - * - * see osf.h - */ diff --git a/src/backend/port/dynloader/osf.h b/src/backend/port/dynloader/osf.h deleted file mode 100644 index 273a9034f2..0000000000 --- a/src/backend/port/dynloader/osf.h +++ /dev/null @@ -1,47 +0,0 @@ -/*------------------------------------------------------------------------- - * - * osf.h - * prototypes for OSF/1-specific routines - * - * - * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group - * Portions Copyright (c) 1994, Regents of the University of California - * - * src/backend/port/dynloader/osf.h - * - *------------------------------------------------------------------------- - */ - -#ifndef PORT_PROTOS_H -#define PORT_PROTOS_H - -#include <dlfcn.h> -#include "utils/dynamic_loader.h" /* pgrminclude ignore */ - -/* - * Dynamic Loader on Alpha OSF/1.x - * - * this dynamic loader uses the system dynamic loading interface for shared - * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared - * library as the file to be dynamically loaded. - */ - -/* - * 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(h, f) ((PGFunction) dlsym(h, f)) -#define pg_dlclose(h) dlclose(h) -#define pg_dlerror() dlerror() - -#endif /* PORT_PROTOS_H */ diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c index 3aeceae67c..5407d3f9ac 100644 --- a/src/backend/utils/misc/ps_status.c +++ b/src/backend/utils/misc/ps_status.c @@ -66,7 +66,7 @@ bool update_process_title = true; #define PS_USE_PS_STRINGS #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__) +#elif defined(__linux__) || defined(_AIX) || defined(__sgi) || (defined(sun) && !defined(BSD)) || defined(__svr5__) || defined(__darwin__) #define PS_USE_CLOBBER_ARGV #elif defined(WIN32) #define PS_USE_WIN32 diff --git a/src/include/port/osf.h b/src/include/port/osf.h deleted file mode 100644 index d56b35b399..0000000000 --- a/src/include/port/osf.h +++ /dev/null @@ -1,4 +0,0 @@ -/* src/include/port/osf.h */ - -#define NOFIXADE -#define DISABLE_XOPEN_NLS diff --git a/src/include/storage/barrier.h b/src/include/storage/barrier.h index bc61de0ff1..79a2f8d9b2 100644 --- a/src/include/storage/barrier.h +++ b/src/include/storage/barrier.h @@ -109,16 +109,7 @@ extern slock_t dummy_spinlock; #define pg_memory_barrier() __asm__ __volatile__ ("sync" : : : "memory") #define pg_read_barrier() __asm__ __volatile__ ("lwsync" : : : "memory") #define pg_write_barrier() __asm__ __volatile__ ("lwsync" : : : "memory") -#elif defined(__alpha) || defined(__alpha__) /* Alpha */ -/* - * Unlike all other known architectures, Alpha allows dependent reads to be - * reordered, but we don't currently find it necessary to provide a conditional - * read barrier to cover that case. We might need to add that later. - */ -#define pg_memory_barrier() __asm__ __volatile__ ("mb" : : : "memory") -#define pg_read_barrier() __asm__ __volatile__ ("rmb" : : : "memory") -#define pg_write_barrier() __asm__ __volatile__ ("wmb" : : : "memory") #elif defined(__hppa) || defined(__hppa__) /* HP PA-RISC */ /* HPPA doesn't do either read or write reordering */ diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index ba4dfe12d8..895abe672b 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -548,51 +548,6 @@ tas(volatile slock_t *lock) #endif /* __vax__ */ -#if defined(__alpha) || defined(__alpha__) /* Alpha */ -/* - * Correct multi-processor locking methods are explained in section 5.5.3 - * of the Alpha AXP Architecture Handbook, which at this writing can be - * found at ftp://ftp.netbsd.org/pub/NetBSD/misc/dec-docs/index.html. - * For gcc we implement the handbook's code directly with inline assembler. - */ -#define HAS_TEST_AND_SET - -typedef unsigned long slock_t; - -#define TAS(lock) tas(lock) - -static __inline__ int -tas(volatile slock_t *lock) -{ - register slock_t _res; - - __asm__ __volatile__( - " ldq $0, %1 \n" - " bne $0, 2f \n" - " ldq_l %0, %1 \n" - " bne %0, 2f \n" - " mov 1, $0 \n" - " stq_c $0, %1 \n" - " beq $0, 2f \n" - " mb \n" - " br 3f \n" - "2: mov 1, %0 \n" - "3: \n" -: "=&r"(_res), "+m"(*lock) -: -: "memory", "0"); - return (int) _res; -} - -#define S_UNLOCK(lock) \ -do \ -{\ - __asm__ __volatile__ (" mb \n"); \ - *((volatile slock_t *) (lock)) = 0; \ -} while (0) - -#endif /* __alpha || __alpha__ */ - #if defined(__mips__) && !defined(__sgi) /* non-SGI MIPS */ /* Note: on SGI we use the OS' mutex ABI, see below */ @@ -733,27 +688,6 @@ tas(volatile slock_t *s_lock) #endif /* defined(USE_UNIVEL_CC) */ -#if defined(__alpha) || defined(__alpha__) /* Tru64 Unix Alpha compiler */ -/* - * The Tru64 compiler doesn't support gcc-style inline asm, but it does - * have some builtin functions that accomplish much the same results. - * For simplicity, slock_t is defined as long (ie, quadword) on Alpha - * regardless of the compiler in use. LOCK_LONG and UNLOCK_LONG only - * operate on an int (ie, longword), but that's OK as long as we define - * S_INIT_LOCK to zero out the whole quadword. - */ -#define HAS_TEST_AND_SET - -typedef unsigned long slock_t; - -#include <alpha/builtins.h> -#define S_INIT_LOCK(lock) (*(lock) = 0) -#define TAS(lock) (__LOCK_LONG_RETRY((lock), 1) == 0) -#define S_UNLOCK(lock) __UNLOCK_LONG(lock) - -#endif /* __alpha || __alpha__ */ - - #if defined(__hppa) || defined(__hppa__) /* HP PA-RISC, GCC and HP compilers */ /* * HP's PA-RISC diff --git a/src/makefiles/Makefile.osf b/src/makefiles/Makefile.osf deleted file mode 100644 index 31822fd79d..0000000000 --- a/src/makefiles/Makefile.osf +++ /dev/null @@ -1,10 +0,0 @@ -AROPT = crs -DLSUFFIX = .so -CFLAGS_SL = -rpath = -rpath '$(rpathdir)' - -# Rule for building a shared library from a single .o file -%.so: %.o - $(LD) -shared -expect_unresolved '*' -o $@ $< - -sqlmansect = 5 diff --git a/src/template/osf b/src/template/osf deleted file mode 100644 index 4f10ad619a..0000000000 --- a/src/template/osf +++ /dev/null @@ -1,6 +0,0 @@ -# src/template/osf - -if test "$GCC" != yes ; then - CC="$CC -std" - CFLAGS="-O -ieee" -fi |