4 files changed, 10 insertions, 3 deletions
diff --git a/gcc/config/i386/netware-crt0.c b/gcc/config/i386/netware-crt0.c
index b553f3d..0da9114 100644
--- a/gcc/config/i386/netware-crt0.c
+++ b/gcc/config/i386/netware-crt0.c
@@ -23,6 +23,9 @@ Boston, MA 02111-1307, USA.  */
 #include <stdint.h>
 #include "unwind-dw2-fde.h"
 
+int __init_environment (void *);
+int __deinit_environment (void *);
+
 
 #define SECTION_DECL(name, decl) decl __attribute__((__section__(name)))
 
@@ -54,7 +57,7 @@ __init_environment (void *unused __attribute__((__unused__)))
 
   for (pctor = &__CTOR_END__ - 1; pctor > &__CTOR_LIST__; --pctor)
     if (*pctor != NULL)
-      pctor();
+      (*pctor)();
 
   return 0;
 }
diff --git a/gcc/config/i386/netware.h b/gcc/config/i386/netware.h
index 9246f3f..13e5e39 100644
--- a/gcc/config/i386/netware.h
+++ b/gcc/config/i386/netware.h
@@ -47,7 +47,7 @@ Boston, MA 02111-1307, USA.  */
 #define TARGET_OS_CPP_BUILTINS()					\
   do									\
     {									\
-	builtin_define ("IAPX386");					\
+	builtin_define_std ("IAPX386");					\
 	builtin_define ("_M_IX86=300");					\
 	builtin_define ("__netware__");					\
 	builtin_assert ("system=netware");				\
diff --git a/gcc/config/i386/nwld.h b/gcc/config/i386/nwld.h
index 8dd7c9f..67fa213 100644
--- a/gcc/config/i386/nwld.h
+++ b/gcc/config/i386/nwld.h
@@ -57,3 +57,6 @@ void nwld_named_section_asm_out_destructor (rtx, int);
 
 #undef  EH_FRAME_SECTION_NAME
 #define EH_FRAME_SECTION_NAME ".eh_frame"TARGET_SUB_SECTION_SEPARATOR
+
+/* nwld does not currently support stabs debug info */
+#undef DBX_DEBUGGING_INFO
diff --git a/gcc/config/i386/t-nwld b/gcc/config/i386/t-nwld
index f56f1f1..2535563 100644
--- a/gcc/config/i386/t-nwld
+++ b/gcc/config/i386/t-nwld
@@ -38,6 +38,7 @@ SHLIB_SRC = $(srcdir)/config/i386/netware-libgcc.c
 
 SHLIB_LINK = set -e; \
 	cat $(SHLIB_DEF) >@shlib_so_name@.def; \
+	echo "name $(SHLIB_NAME)" >>@shlib_so_name@.def; \
 	echo "version $(gcc_version)" | sed "s!\.!,!g" >>@shlib_so_name@.def; \
 	touch libgcc/build; \
 	echo "build $$$$(($$$$(<libgcc/build)+0))" >>@shlib_so_name@.def; \
@@ -47,7 +48,7 @@ SHLIB_LINK = set -e; \
 		else echo "WARNING: $(SHLIB_NAME) built without XDC data will not work well." 1>&2; \
 	fi; \
 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -o $(SHLIB_NAME) \
-		$(SHLIB_SRC) -static-libgcc -lnetware \
+		$(SHLIB_SRC) -posix -static-libgcc -lnetware \
 		-Wl,--Map,--map-info,full,--strip-all,--def-file,@shlib_so_name@.def; \
 	rm -f @shlib_so_name@.imp; $(LN_S) $(SHLIB_MAP) @shlib_so_name@.imp; \
 	echo $$$$(($$$$(<libgcc/build)+1)) >libgcc/build