Missed adding new univel files and removing univel subdirectory

diff --git a/src/backend/port/dynloader/univel.c b/src/backend/port/dynloader/univel.c
new file mode 100644 (file)
index 0000000..c603e81
--- /dev/null
+++ b/src/backend/port/dynloader/univel.c
@@ -0,0 +1,4 @@
+/* Dummy file used for nothing at this point\r
+ *\r
+ * see univel.h\r
+ */\r

diff --git a/src/backend/port/univel/port-protos.h b/src/backend/port/dynloader/univel.h
similarity index 96%
rename from src/backend/port/univel/port-protos.h
rename to src/backend/port/dynloader/univel.h
index 9cafdd84e1d2b3f8b69e8f5310fde4f5c7f83da7..56b9961930dc354654254ae39f053ac5d8a8b629 100644 (file)
--- a/src/backend/port/univel/port-protos.h
+++ b/src/backend/port/dynloader/univel.h
@@ -1,34 +1,34 @@
-/*-------------------------------------------------------------------------
- *
- * port-protos.h--
- *       port-specific prototypes for Intel x86/UNIXWARE
- *
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * port-protos.h,v 1.2 1995/03/17 06:40:18 andrew Exp
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PORT_PROTOS_H
-#define PORT_PROTOS_H
-
-#include <dlfcn.h>
-#include "fmgr.h"                              /* for func_ptr */
-#include "utils/dynamic_loader.h"
-
-/* dynloader.c */
-/*
- * Dynamic Loader on Intel x86/Intel SVR4.
- *
- * 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.
- *
- */
-#define pg_dlopen(f)   dlopen(f,RTLD_LAZY)
-#define pg_dlsym               dlsym
-#define pg_dlclose             dlclose
-#define pg_dlerror             dlerror
-
-#endif                                                 /* PORT_PROTOS_H */
+/*-------------------------------------------------------------------------\r
+ *\r
+ * port-protos.h--\r
+ *       port-specific prototypes for Intel x86/UNIXWARE\r
+ *\r
+ *\r
+ * Copyright (c) 1994, Regents of the University of California\r
+ *\r
+ * port-protos.h,v 1.2 1995/03/17 06:40:18 andrew Exp\r
+ *\r
+ *-------------------------------------------------------------------------\r
+ */\r
+#ifndef PORT_PROTOS_H\r
+#define PORT_PROTOS_H\r
+\r
+#include <dlfcn.h>\r
+#include "fmgr.h"                              /* for func_ptr */\r
+#include "utils/dynamic_loader.h"\r
+\r
+/* dynloader.c */\r
+/*\r
+ * Dynamic Loader on Intel x86/Intel SVR4.\r
+ *\r
+ * this dynamic loader uses the system dynamic loading interface for shared\r
+ * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared\r
+ * library as the file to be dynamically loaded.\r
+ *\r
+ */\r
+#define pg_dlopen(f)   dlopen(f,RTLD_LAZY)\r
+#define pg_dlsym               dlsym\r
+#define pg_dlclose             dlclose\r
+#define pg_dlerror             dlerror\r
+\r
+#endif                                                 /* PORT_PROTOS_H */\r

diff --git a/src/backend/port/univel/Makefile b/src/backend/port/univel/Makefile
deleted file mode 100644 (file)
index 487768f..0000000
--- a/src/backend/port/univel/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile--
-#    Makefile for port/univel
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/univel/Attic/Makefile,v 1.3 1997/12/20 00:26:45 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SRCDIR = ../../..
-include ../../../Makefile.global
-
-INCLUDE_OPT = -I../.. 
-
-CFLAGS+=$(INCLUDE_OPT)
-
-OBJS = #tas.o
-
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) -r -o SUBSYS.o $(OBJS)
-
-depend dep:
-       $(CC) -MM $(INCLUDE_OPT) *.c >depend
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-

diff --git a/src/backend/port/univel/tas.s b/src/backend/port/univel/tas.s
deleted file mode 100644 (file)
index bbc91fc..0000000
--- a/src/backend/port/univel/tas.s
+++ /dev/null
@@ -1,35 +0,0 @@
-/=============================================================================
-/ tas.s -- test and set lock for i386_solaris
-/=============================================================================
-
-        .file   "tas.s"
-        .text
-        .align  16
-.L1.text:
-
-        .globl  tas
-tas:
-        pushl   %ebp            /save prev base pointer
-        movl    %esp,%ebp       /new base pointer
-        pushl   %ebx            /save prev bx
-        movl    8(%ebp),%ebx    /load bx with address of lock
-        pushl   %ebx            /save prev bx
-        movl    8(%ebp),%ebx    /load bx with address of lock
-        movl    $255,%eax       /put something in ax
-        xchgb   %al,(%ebx)      /swap lock value with "0"
-        cmpb    $0,%al          /did we get the lock?
-        jne     .Locked
-        subl    %eax,%eax       /yes, we got it -- return 0
-        jmp     .Finish
-        .align  4
-.Locked:
-        movl    $1,%eax         /no, we didn't get it - return 1
-.Finish:
-        popl    %ebx            /restore prev bx
-        movl    %ebp,%esp       /restore stack state
-        popl    %ebp
-        ret                     /return
-        .align  4
-        .type   tas,@function
-        .size   tas,.-tas
-