WIP plpgsql wasm build

Author: samwillis

src/Makefile.shlib

@@ -122,13 +122,13 @@ ifeq ($(PORTNAME), darwin)
     ifneq ($(SO_MAJOR_VERSION), 0)
       version_link	= -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
     endif
-    LINK.shared		= $(COMPILER) -dynamiclib -install_name '$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link) $(exported_symbols_list) -multiply_defined suppress
+    LINK.shared		= $(COMPILER) -dynamiclib -install_name '$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link) $(exported_symbols_list)
     shlib		= lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
     shlib_major		= lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
   else
     # loadable module
     DLSUFFIX		= .so
-    LINK.shared		= $(COMPILER) -bundle -multiply_defined suppress
+    LINK.shared		= $(COMPILER) -bundle
   endif
   BUILD.exports		= $(AWK) '/^[^\#]/ {printf "_%s\n",$$1}' $< >$@
   exports_file		= $(SHLIB_EXPORTS:%.txt=%.list)

src/backend/Makefile

@@ -63,7 +63,7 @@ ifneq ($(PORTNAME), win32)
 ifneq ($(PORTNAME), aix)
 
 postgres: $(OBJS)
-	$(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(LIBS) -sALLOW_MEMORY_GROWTH=1 -sFORCE_FILESYSTEM=1 -lnodefs.js -lproxyfs.js -lidbfs.js -o $@
+	$(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(LIBS) -sMAIN_MODULE=2 -sALLOW_MEMORY_GROWTH=1 -sFORCE_FILESYSTEM=1 -lnodefs.js -lproxyfs.js -lidbfs.js -o $@
 
 endif
 endif

src/include/fmgr.h

@@ -15,6 +15,11 @@
  *
  *-------------------------------------------------------------------------
  */
+
+#ifdef EMSCRIPTEN
+#include <emscripten.h>
+#endif
+
 #ifndef FMGR_H
 #define FMGR_H
 
@@ -416,7 +421,7 @@ typedef const Pg_finfo_record *(*PGFInfoFunction) (void);
 extern Datum funcname(PG_FUNCTION_ARGS); \
 extern PGDLLEXPORT const Pg_finfo_record * CppConcat(pg_finfo_,funcname)(void); \
 const Pg_finfo_record * \
-CppConcat(pg_finfo_,funcname) (void) \
+EMSCRIPTEN_KEEPALIVE CppConcat(pg_finfo_,funcname) (void) \
 { \
 	static const Pg_finfo_record my_finfo = { 1 }; \
 	return &my_finfo; \

src/makefiles/Makefile.darwin

@@ -5,11 +5,11 @@ DLSUFFIX = .so
 # env var name to use in place of LD_LIBRARY_PATH
 ld_library_path_var = DYLD_LIBRARY_PATH
 
-ifdef PGXS
-  BE_DLLLIBS = -bundle_loader $(bindir)/postgres
-else
-  BE_DLLLIBS = -bundle_loader $(top_builddir)/src/backend/postgres
-endif
+# ifdef PGXS
+#   BE_DLLLIBS = -bundle_loader $(bindir)/postgres
+# else
+#   BE_DLLLIBS = -bundle_loader $(top_builddir)/src/backend/postgres
+# endif
 
 # Rule for building a shared library from a single .o file
 %.so: %.o

src/pl/plpgsql/src/pl_handler.c

@@ -27,6 +27,10 @@
 #include "utils/syscache.h"
 #include "utils/varlena.h"
 
+#ifdef EMSCRIPTEN
+#include <emscripten.h>
+#endif
+
 static bool plpgsql_extra_checks_check_hook(char **newvalue, void **extra, GucSource source);
 static void plpgsql_extra_warnings_assign_hook(const char *newvalue, void *extra);
 static void plpgsql_extra_errors_assign_hook(const char *newvalue, void *extra);
@@ -142,7 +146,7 @@ plpgsql_extra_errors_assign_hook(const char *newvalue, void *extra)
  * DO NOT make this static nor change its name!
  */
 void
-_PG_init(void)
+EMSCRIPTEN_KEEPALIVE _PG_init(void)
 {
 	/* Be sure we do initialization only once (should be redundant now) */
 	static bool inited = false;
@@ -219,7 +223,7 @@ _PG_init(void)
 PG_FUNCTION_INFO_V1(plpgsql_call_handler);
 
 Datum
-plpgsql_call_handler(PG_FUNCTION_ARGS)
+EMSCRIPTEN_KEEPALIVE plpgsql_call_handler(PG_FUNCTION_ARGS)
 {
 	bool		nonatomic;
 	PLpgSQL_function *func;
@@ -312,7 +316,7 @@ plpgsql_call_handler(PG_FUNCTION_ARGS)
 PG_FUNCTION_INFO_V1(plpgsql_inline_handler);
 
 Datum
-plpgsql_inline_handler(PG_FUNCTION_ARGS)
+EMSCRIPTEN_KEEPALIVE plpgsql_inline_handler(PG_FUNCTION_ARGS)
 {
 	LOCAL_FCINFO(fake_fcinfo, 0);
 	InlineCodeBlock *codeblock = castNode(InlineCodeBlock, DatumGetPointer(PG_GETARG_DATUM(0)));
@@ -439,7 +443,7 @@ plpgsql_inline_handler(PG_FUNCTION_ARGS)
 PG_FUNCTION_INFO_V1(plpgsql_validator);
 
 Datum
-plpgsql_validator(PG_FUNCTION_ARGS)
+EMSCRIPTEN_KEEPALIVE plpgsql_validator(PG_FUNCTION_ARGS)
 {
 	Oid			funcoid = PG_GETARG_OID(0);
 	HeapTuple	tuple;