diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.shlib | 10 | ||||
-rw-r--r-- | src/backend/port/dynloader/irix.c | 6 | ||||
-rw-r--r-- | src/backend/port/dynloader/irix.h | 46 | ||||
-rw-r--r-- | src/backend/utils/adt/float.c | 64 | ||||
-rw-r--r-- | src/include/port/irix.h | 7 | ||||
-rw-r--r-- | src/include/storage/s_lock.h | 25 |
6 files changed, 0 insertions, 158 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 2a0c7a9d017..4e476c30369 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -215,16 +215,6 @@ ifeq ($(PORTNAME), hpux) endif endif -ifeq ($(PORTNAME), irix) - ifdef SO_MAJOR_VERSION - shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) - endif - LINK.shared = $(COMPILER) -shared - ifdef soname - LINK.shared += -Wl,-set_version,sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) - endif -endif - ifeq ($(PORTNAME), linux) LINK.shared = $(COMPILER) -shared ifdef soname diff --git a/src/backend/port/dynloader/irix.c b/src/backend/port/dynloader/irix.c deleted file mode 100644 index df2843a9509..00000000000 --- a/src/backend/port/dynloader/irix.c +++ /dev/null @@ -1,6 +0,0 @@ -/* src/backend/port/dynloader/irix.c */ - -/* Dummy file used for nothing at this point - * - * see irix.h - */ diff --git a/src/backend/port/dynloader/irix.h b/src/backend/port/dynloader/irix.h deleted file mode 100644 index d845b167256..00000000000 --- a/src/backend/port/dynloader/irix.h +++ /dev/null @@ -1,46 +0,0 @@ -/*------------------------------------------------------------------------- - * - * irix.h - * port-specific prototypes for Irix - * - * - * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group - * Portions Copyright (c) 1994, Regents of the University of California - * - * src/backend/port/dynloader/irix.h - * - *------------------------------------------------------------------------- - */ -#ifndef PORT_PROTOS_H -#define PORT_PROTOS_H - -#include <dlfcn.h> -#include "utils/dynamic_loader.h" /* pgrminclude ignore */ - -/* - * Dynamic Loader on Irix. - * - * 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 dlsym -#define pg_dlclose dlclose -#define pg_dlerror dlerror - -#endif /* PORT_PROTOS_H */ diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index b6c31c2fd92..54690bddb3b 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -294,38 +294,6 @@ float4in(PG_FUNCTION_ARGS) } #endif /* HAVE_BUGGY_SOLARIS_STRTOD */ -#ifdef HAVE_BUGGY_IRIX_STRTOD - - /* - * In some IRIX versions, strtod() recognizes only "inf", so if the input - * is "infinity" we have to skip over "inity". Also, it may return - * positive infinity for "-inf". - */ - if (isinf(val)) - { - if (pg_strncasecmp(num, "Infinity", 8) == 0) - { - val = get_float4_infinity(); - endptr = num + 8; - } - else if (pg_strncasecmp(num, "+Infinity", 9) == 0) - { - val = get_float4_infinity(); - endptr = num + 9; - } - else if (pg_strncasecmp(num, "-Infinity", 9) == 0) - { - val = -get_float4_infinity(); - endptr = num + 9; - } - else if (pg_strncasecmp(num, "-inf", 4) == 0) - { - val = -get_float4_infinity(); - endptr = num + 4; - } - } -#endif /* HAVE_BUGGY_IRIX_STRTOD */ - /* skip trailing whitespace */ while (*endptr != '\0' && isspace((unsigned char) *endptr)) endptr++; @@ -525,38 +493,6 @@ float8in(PG_FUNCTION_ARGS) } #endif /* HAVE_BUGGY_SOLARIS_STRTOD */ -#ifdef HAVE_BUGGY_IRIX_STRTOD - - /* - * In some IRIX versions, strtod() recognizes only "inf", so if the input - * is "infinity" we have to skip over "inity". Also, it may return - * positive infinity for "-inf". - */ - if (isinf(val)) - { - if (pg_strncasecmp(num, "Infinity", 8) == 0) - { - val = get_float8_infinity(); - endptr = num + 8; - } - else if (pg_strncasecmp(num, "+Infinity", 9) == 0) - { - val = get_float8_infinity(); - endptr = num + 9; - } - else if (pg_strncasecmp(num, "-Infinity", 9) == 0) - { - val = -get_float8_infinity(); - endptr = num + 9; - } - else if (pg_strncasecmp(num, "-inf", 4) == 0) - { - val = -get_float8_infinity(); - endptr = num + 4; - } - } -#endif /* HAVE_BUGGY_IRIX_STRTOD */ - /* skip trailing whitespace */ while (*endptr != '\0' && isspace((unsigned char) *endptr)) endptr++; diff --git a/src/include/port/irix.h b/src/include/port/irix.h deleted file mode 100644 index bb05314a793..00000000000 --- a/src/include/port/irix.h +++ /dev/null @@ -1,7 +0,0 @@ -/* src/include/port/irix.h */ - -/* - * IRIX 6.5.26f and 6.5.22f (at least) have a strtod() that accepts - * "infinity", but leaves endptr pointing to "inity". - */ -#define HAVE_BUGGY_IRIX_STRTOD diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index 1b493ace4f4..7dcd5d90b21 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -836,31 +836,6 @@ typedef unsigned int slock_t; #endif /* HPUX on IA64, non gcc */ - -#if defined(__sgi) /* SGI compiler */ -/* - * SGI IRIX 5 - * slock_t is defined as a unsigned long. We use the standard SGI - * mutex API. - * - * The following comment is left for historical reasons, but is probably - * not a good idea since the mutex ABI is supported. - * - * This stuff may be supplemented in the future with Masato Kataoka's MIPS-II - * assembly from his NECEWS SVR4 port, but we probably ought to retain this - * for the R3000 chips out there. - */ -#define HAS_TEST_AND_SET - -typedef unsigned long slock_t; - -#include "mutex.h" -#define TAS(lock) (test_and_set(lock,1)) -#define S_UNLOCK(lock) (test_then_and(lock,0)) -#define S_INIT_LOCK(lock) (test_then_and(lock,0)) -#define S_LOCK_FREE(lock) (test_then_add(lock,0) == 0) -#endif /* __sgi */ - #if defined(_AIX) /* AIX */ /* * AIX (POWER) |