From 14531e0c44c1a06c209ddccdffbb56c1562bf129 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Wed, 19 May 2004 21:37:43 +0000 Subject: Rename irix5 port to irix. --- configure | 2 +- configure.in | 4 ++-- src/Makefile.shlib | 4 ++-- src/backend/port/dynloader/irix.c | 4 ++++ src/backend/port/dynloader/irix.h | 46 ++++++++++++++++++++++++++++++++++++++ src/backend/port/dynloader/irix5.c | 4 ---- src/backend/port/dynloader/irix5.h | 46 -------------------------------------- src/makefiles/Makefile.irix | 20 +++++++++++++++++ src/makefiles/Makefile.irix5 | 20 ----------------- src/template/irix | 0 src/template/irix5 | 0 11 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 src/backend/port/dynloader/irix.c create mode 100644 src/backend/port/dynloader/irix.h delete mode 100644 src/backend/port/dynloader/irix5.c delete mode 100644 src/backend/port/dynloader/irix5.h create mode 100644 src/makefiles/Makefile.irix delete mode 100644 src/makefiles/Makefile.irix5 create mode 100644 src/template/irix delete mode 100644 src/template/irix5 diff --git a/configure b/configure index 80fa0952bc7..1ac7abc2136 100755 --- a/configure +++ b/configure @@ -1389,7 +1389,7 @@ case $host_os in dgux*) template=dgux ;; freebsd*) template=freebsd ;; hpux*) template=hpux ;; - irix*) template=irix5 ;; + irix*) template=irix ;; linux*) template=linux ;; mingw*) template=win32 ;; netbsd*) template=netbsd ;; diff --git a/configure.in b/configure.in index 10f4e27f185..ef5d175da8f 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $PostgreSQL: pgsql/configure.in,v 1.351 2004/05/18 04:11:29 momjian Exp $ +dnl $PostgreSQL: pgsql/configure.in,v 1.352 2004/05/19 21:37:42 momjian Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -56,7 +56,7 @@ case $host_os in dgux*) template=dgux ;; freebsd*) template=freebsd ;; hpux*) template=hpux ;; - irix*) template=irix5 ;; + irix*) template=irix ;; linux*) template=linux ;; mingw*) template=win32 ;; netbsd*) template=netbsd ;; diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 0414398d89c..300d8854470 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.75 2004/05/12 21:56:27 momjian Exp $ +# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.76 2004/05/19 21:37:43 momjian Exp $ # #------------------------------------------------------------------------- @@ -139,7 +139,7 @@ ifeq ($(PORTNAME), hpux) endif endif -ifeq ($(PORTNAME), irix5) +ifeq ($(PORTNAME), irix) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) LINK.shared = $(COMPILER) -shared -Wl,-set_version,sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) endif diff --git a/src/backend/port/dynloader/irix.c b/src/backend/port/dynloader/irix.c new file mode 100644 index 00000000000..d5a654b0cfe --- /dev/null +++ b/src/backend/port/dynloader/irix.c @@ -0,0 +1,4 @@ +/* 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 new file mode 100644 index 00000000000..c49418dcfc8 --- /dev/null +++ b/src/backend/port/dynloader/irix.h @@ -0,0 +1,46 @@ +/*------------------------------------------------------------------------- + * + * irix.h + * port-specific prototypes for Irix + * + * + * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * $PostgreSQL: pgsql/src/backend/port/dynloader/irix.h,v 1.1 2004/05/19 21:37:43 momjian Exp $ + * + *------------------------------------------------------------------------- + */ +#ifndef PORT_PROTOS_H +#define PORT_PROTOS_H + +#include +#include "utils/dynamic_loader.h" + +/* + * Dynamic Loader on SunOS 4. + * + * 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/port/dynloader/irix5.c b/src/backend/port/dynloader/irix5.c deleted file mode 100644 index a8e7f971959..00000000000 --- a/src/backend/port/dynloader/irix5.c +++ /dev/null @@ -1,4 +0,0 @@ -/* Dummy file used for nothing at this point - * - * see irix5.h - */ diff --git a/src/backend/port/dynloader/irix5.h b/src/backend/port/dynloader/irix5.h deleted file mode 100644 index c642f5db9d3..00000000000 --- a/src/backend/port/dynloader/irix5.h +++ /dev/null @@ -1,46 +0,0 @@ -/*------------------------------------------------------------------------- - * - * irix5.h - * port-specific prototypes for Irix 5 - * - * - * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group - * Portions Copyright (c) 1994, Regents of the University of California - * - * $PostgreSQL: pgsql/src/backend/port/dynloader/irix5.h,v 1.15 2003/11/29 22:39:55 pgsql Exp $ - * - *------------------------------------------------------------------------- - */ -#ifndef PORT_PROTOS_H -#define PORT_PROTOS_H - -#include -#include "utils/dynamic_loader.h" - -/* - * Dynamic Loader on SunOS 4. - * - * 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/makefiles/Makefile.irix b/src/makefiles/Makefile.irix new file mode 100644 index 00000000000..4062161d9ef --- /dev/null +++ b/src/makefiles/Makefile.irix @@ -0,0 +1,20 @@ +MK_NO_LORDER= true +AROPT = crs +rpath = -Wl,-rpath,$(libdir) +shlib_symbolic = -Wl,-B,symbolic + +DLSUFFIX = .so +# PIC is default +CFLAGS_SL = + +%.so: %.o + $(LD) -G -Bdynamic -shared -o $@ $< + +override CPPFLAGS += -U_NO_XOPEN4 + +ifneq ($(GCC), yes) +CFLAGS += -woff 1164,1171,1185,1195,1552 +endif +LDFLAGS += -Wl,-woff,15 -Wl,-woff,84 + +sqlmansect = 5sql diff --git a/src/makefiles/Makefile.irix5 b/src/makefiles/Makefile.irix5 deleted file mode 100644 index 4062161d9ef..00000000000 --- a/src/makefiles/Makefile.irix5 +++ /dev/null @@ -1,20 +0,0 @@ -MK_NO_LORDER= true -AROPT = crs -rpath = -Wl,-rpath,$(libdir) -shlib_symbolic = -Wl,-B,symbolic - -DLSUFFIX = .so -# PIC is default -CFLAGS_SL = - -%.so: %.o - $(LD) -G -Bdynamic -shared -o $@ $< - -override CPPFLAGS += -U_NO_XOPEN4 - -ifneq ($(GCC), yes) -CFLAGS += -woff 1164,1171,1185,1195,1552 -endif -LDFLAGS += -Wl,-woff,15 -Wl,-woff,84 - -sqlmansect = 5sql diff --git a/src/template/irix b/src/template/irix new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/template/irix5 b/src/template/irix5 deleted file mode 100644 index e69de29bb2d..00000000000 -- cgit v1.2.3