diff --git a/src/Makefile.global b/src/Makefile.global index c5fe5ed943..0a367917b1 100644 --- a/src/Makefile.global +++ b/src/Makefile.global @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.14 1996/07/25 07:26:37 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.15 1996/07/25 20:43:35 scrappy Exp $ # # NOTES # This is seen by any Makefiles that include mk/postgres.mk. To @@ -47,6 +47,7 @@ # bsdi_2_1 - BSD/OS 2.1 # aix - IBM on AIX 3.2.5 # irix5 - SGI MIPS on IRIX 5.3 +# dgux - DG/UX 5.4R3.10 # Some hooks are provided for # svr4 - Intel x86 on Intel SVR4 # next - Motorola MC68K or Intel x86 on NeXTSTEP 3.2 diff --git a/src/backend/port/dgux/Makefile.inc b/src/backend/port/dgux/Makefile.inc new file mode 100644 index 0000000000..407e440b3d --- /dev/null +++ b/src/backend/port/dgux/Makefile.inc @@ -0,0 +1,25 @@ +#------------------------------------------------------------------------- +# +# Makefile.inc-- +# Makefile for port/linux (Linux specific stuff) +# +# Copyright (c) 1994, Regents of the University of California +# +# +# IDENTIFICATION +# $Header: /cvsroot/pgsql/src/backend/port/dgux/Attic/Makefile.inc,v 1.1 1996/07/25 20:43:56 scrappy Exp $ +# +# NOTES +# The Linux port is included here by courtesy of Kai Petzke. +# +# (C) 1994, Kai Petzke, wpp@marie.physik.tu-berlin.de +# +#------------------------------------------------------------------------- + +BIGOBJS= false + +CFLAGS+= -DLINUX_ELF + +HEADERS+= machine.h port-protos.h +CFLAGS+= #-DNEED_CBRT + diff --git a/src/backend/port/dgux/dynloader.c b/src/backend/port/dgux/dynloader.c new file mode 100644 index 0000000000..7ec648fb44 --- /dev/null +++ b/src/backend/port/dgux/dynloader.c @@ -0,0 +1,91 @@ +/*------------------------------------------------------------------------- + * + * dynloader.c-- + * Dynamic Loader for Postgres for DG/UX, generated from those for + * Linux. + * + * Copyright (c) 1994, Regents of the University of California + * + * + * IDENTIFICATION + * $Header: /cvsroot/pgsql/src/backend/port/dgux/Attic/dynloader.c,v 1.1 1996/07/25 20:43:58 scrappy Exp $ + * + *------------------------------------------------------------------------- + */ +#include +#include +#include "postgres.h" +#include "port-protos.h" +#include "utils/elog.h" +#include "fmgr.h" + +extern char pg_pathname[]; + +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 (pg_pathname))) { + 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(NOTICE, "dld: Cannot link C library!"); + return NULL; + } + if(dld_undefined_sym_count > 0) { + if (dld_link("/usr/lib/libm.a")) { + elog(NOTICE, "dld: Cannot 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 */ + elog(NOTICE, "dld: Undefined:"); + do { + elog(NOTICE, " %s", *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); +} diff --git a/src/backend/port/dgux/machine.h b/src/backend/port/dgux/machine.h new file mode 100644 index 0000000000..75596a2619 --- /dev/null +++ b/src/backend/port/dgux/machine.h @@ -0,0 +1,18 @@ +/*------------------------------------------------------------------------- + * + * machine.h-- + * + * + * + * Copyright (c) 1994, Regents of the University of California + * + * $Id: machine.h,v 1.1 1996/07/25 20:43:59 scrappy Exp $ + * + *------------------------------------------------------------------------- + */ +#ifndef MACHINE_H +#define MACHINE_H + +#define BLCKSZ 8192 + +#endif diff --git a/src/backend/port/dgux/port-protos.h b/src/backend/port/dgux/port-protos.h new file mode 100644 index 0000000000..13862f9a00 --- /dev/null +++ b/src/backend/port/dgux/port-protos.h @@ -0,0 +1,30 @@ +/*------------------------------------------------------------------------- + * + * port-protos.h-- + * port-specific prototypes for SunOS 4 + * + * + * Copyright (c) 1994, Regents of the University of California + * + * $Id: port-protos.h,v 1.1 1996/07/25 20:44:00 scrappy Exp $ + * + *------------------------------------------------------------------------- + */ +#ifndef PORT_PROTOS_H +#define PORT_PROTOS_H + +#include "fmgr.h" /* for func_ptr */ +#include "utils/dynamic_loader.h" +#include "dlfcn.h" + +/* dynloader.c */ + +/* #define pg_dlopen(f) dlopen(f, 1) */ +#define pg_dlopen(f) dlopen(f, 2) +#define pg_dlsym dlsym +#define pg_dlclose dlclose +#define pg_dlerror dlerror + +/* port.c */ + +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dgux/port.c b/src/backend/port/dgux/port.c new file mode 100644 index 0000000000..46fe71db56 --- /dev/null +++ b/src/backend/port/dgux/port.c @@ -0,0 +1,13 @@ +/*------------------------------------------------------------------------- + * + * port.c-- + * Linux-specific routines + * + * Copyright (c) 1994, Regents of the University of California + * + * + * IDENTIFICATION + * $Header: /cvsroot/pgsql/src/backend/port/dgux/Attic/port.c,v 1.1 1996/07/25 20:44:00 scrappy Exp $ + * + *------------------------------------------------------------------------- + */ diff --git a/src/mk/port/postgres.mk.dgux b/src/mk/port/postgres.mk.dgux new file mode 100644 index 0000000000..9569e7d92e --- /dev/null +++ b/src/mk/port/postgres.mk.dgux @@ -0,0 +1,39 @@ +#------------------------------------------------------------------------- +# +# postgres.mk.linux-- +# Intel x86/Linux specific rules and variables +# +# Copyright (c) 1994-5, Regents of the University of California +# +# $Id: postgres.mk.dgux,v 1.1 1996/07/25 20:45:05 scrappy Exp $ +# +# NOTE +# you may remove lines that start with ## which are general comments +#------------------------------------------------------------------------- +ifndef MK_PORT +MK_PORT= linux + +RANLIB= ranlib +SLSUFF= .so +#LDFLAGS+= -rdynamic + + +CFLAGS_SL= -fpic +%.so: %.o + cd $(objdir); $(CC) -shared -o $(@F) $(