Merge branch 'egil/r16/remove-vxworks-support/OTP-10146'

* egil/r16/remove-vxworks-support/OTP-10146: (30 commits) erts: Update doc to reflect VxWorks removal erts: Remove VxWorks from documentation Update preloaded erl_prim_loader and prim_file snmp: Remove VxWorks megaco: Remove VxWorks diameter: Remove VxWorks mnesia: Remove VxWorks typer: Remove VxWorks ssh: Remove VxWorks inets: Remove VxWorks hipe: Remove VxWorks cosFileTransfer: Remove VxWorks asn1: Remove VxWorks orber: Remove VxWorks os_mon: Remove VxWorks runtime_tools: Remove VxWorks test_server: Remove VxWorks references in doc test_server: Remove VxWorks stdlib: Remove VxWorks kernel: Remove VxWorks from tests ... Conflicts: erts/emulator/test/Makefile
author: Björn-Egil Dahlberg <[email protected]> 2012-07-25 15:00:32 +0200
committer: Björn-Egil Dahlberg <[email protected]> 2012-07-25 15:00:32 +0200
commit: a7bcc6aa05bc61edd1ac178b6331e780aeab940f (patch)
tree: af6cb90b11c95744135e233478c89b55fede8bf7
parent: 81664b189c21710767b78a9db9d74d55585cfeed (diff)
parent: 84bc4fb47b58f258a50e23ba96db51608272b859 (diff)
download: otp-a7bcc6aa05bc61edd1ac178b6331e780aeab940f.tar.gz
otp-a7bcc6aa05bc61edd1ac178b6331e780aeab940f.tar.bz2
otp-a7bcc6aa05bc61edd1ac178b6331e780aeab940f.zip
154 files changed, 1621 insertions, 10986 deletions
diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile
index 13cf003aad..e4ccc330b5 100644
--- a/erts/doc/src/Makefile
+++ b/erts/doc/src/Makefile
@@ -55,7 +55,6 @@ XML_REF3_EFILES = \
 XML_REF3_FILES = \
 	driver_entry.xml \
 	erl_nif.xml \
-	erl_set_memory_block.xml \
 	erl_driver.xml \
 	erl_prim_loader.xml \
 	erlang.xml \
@@ -158,9 +157,6 @@ $(SPECDIR)/specs_driver_entry.xml:
 $(SPECDIR)/specs_erl_nif.xml:
 	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
                 -o$(dir $@) -module erl_nif
-$(SPECDIR)/specs_erl_set_memory_block.xml:
-	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
-                -o$(dir $@) -module erl_set_memory_block
 $(SPECDIR)/specs_erl_driver.xml:
 	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
                 -o$(dir $@) -module erl_driver
diff --git a/erts/doc/src/erl_set_memory_block.xml b/erts/doc/src/erl_set_memory_block.xml
deleted file mode 100644
index d77da56d95..0000000000
--- a/erts/doc/src/erl_set_memory_block.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE cref SYSTEM "cref.dtd">
-
-<cref>
-  <header>
-    <copyright>
-      <year>1998</year><year>2009</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
-    
-    </legalnotice>
-
-    <title>erl_set_memory_block</title>
-    <prepared>Patrik Nyblom</prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>98-08-05</date>
-    <rev>A</rev>
-    <file>erl_set_memory_block.xml</file>
-  </header>
-  <lib>erl_set_memory_block</lib>
-  <libsummary>Custom memory allocation for Erlang on VxWorks&reg;</libsummary>
-  <description>
-    <p>This documentation is specific to VxWorks.</p>
-    <p>The <c><![CDATA[erl_set_memory_block]]></c> function/command initiates custom
-      memory allocation for the Erlang emulator. It has to be called
-      before the Erlang emulator is started and makes Erlang use one
-      single large memory block for all memory allocation.</p>
-    <p>The memory within the block can be utilized by other tasks than
-      Erlang. This is accomplished by calling the functions
-      <c><![CDATA[sys_alloc]]></c>, <c><![CDATA[sys_realloc]]></c> and <c><![CDATA[sys_free]]></c> instead
-      of <c><![CDATA[malloc]]></c>, <c><![CDATA[realloc]]></c> and <c><![CDATA[free]]></c> respectively.</p>
-    <p>The purpose of this is to avoid problems inherent in the
-      VxWorks systems <c><![CDATA[malloc]]></c> library. The memory allocation within the
-      large memory block avoids fragmentation by using an "address
-      order first fit" algorithm. Another advantage of using a
-      separate memory block is that resource reclamation can be made
-      more easily when Erlang is stopped.</p>
-    <p>The <c><![CDATA[erl_set_memory_block]]></c> function is callable from any C
-      program as an ordinary 10 argument function as well as
-      from the commandline.</p>
-  </description>
-  <funcs>
-    <func>
-      <name><ret>int</ret><nametext>erl_set_memory_block(size_t size,  void *ptr, int warn_mixed_malloc, int realloc_always_moves, int use_reclaim, ...)</nametext></name>
-      <fsummary>Specify parameters for Erlang internal memory allocation.</fsummary>
-      <desc>
-        <p>The function is called before Erlang is
-          started to specify a large memory block where Erlang can
-          maintain memory internally.</p>
-        <p>Parameters:</p>
-        <taglist>
-          <tag>size_t size</tag>
-          <item>The size in bytes of Erlang's internal memory block. Has to
-           be specified. Note that the VxWorks system uses dynamic
-           memory allocation heavily, so leave some memory to the system.</item>
-          <tag>void *ptr</tag>
-          <item>
-            <p>A pointer to the actual memory block of size
-              <c><![CDATA[size]]></c>. If this is specified as 0 (NULL), Erlang will
-              allocate the memory when starting and will reclaim the
-              memory block (as a whole) when stopped.</p>
-            <p>If a memory block is allocated and provided here, the
-              <c><![CDATA[sys_alloc]]></c> etc routines can still be used after
-              the Erlang emulator is stopped. The Erlang emulator can 
-              also be restarted while other tasks using the memory
-              block are running without destroying the memory. If
-              Erlang is to be restarted, also set the
-              <c><![CDATA[use_reclaim]]></c> flag.</p>
-            <p>If 0 is specified here, the Erlang system should not
-              be stopped while some other task uses the memory block
-              (has called <c><![CDATA[sys_alloc]]></c>).</p>
-          </item>
-          <tag>int warn_mixed_malloc</tag>
-          <item>
-            <p>If this flag is set to true (anything else than 0), the
-              system will write a warning message on the console if a
-              program is mixing normal <c><![CDATA[malloc]]></c> with
-              <c><![CDATA[sys_realloc]]></c> or <c><![CDATA[sys_free]]></c>.</p>
-          </item>
-          <tag>int realloc_always_moves</tag>
-          <item>
-            <p>If this flag is set to true (anything else than 0), all
-              calls to <c><![CDATA[sys_realloc]]></c> result in a moved memory
-              block. This can in certain conditions give less
-              fragmentation. This flag may be removed in future releases.</p>
-          </item>
-          <tag>int use_reclaim</tag>
-          <item>
-            <p>If this flag is set to true (anything else than 0), all
-              memory allocated with <c><![CDATA[sys_alloc]]></c> is automatically
-              reclaimed as soon as a task exits. This is very useful
-              to make writing port programs (and other programs as
-              well) easier. Combine this with using the routines 
-              <c><![CDATA[save_open]]></c> etc. specified in the reclaim.h 
-              file delivered in the Erlang distribution.</p>
-          </item>
-        </taglist>
-        <p>Return Value:</p>
-        <p>Returns 0 (OK) on success, otherwise a value &lt;&gt; 0.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>int</ret><nametext>erl_memory_show(...)</nametext></name>
-      <fsummary>A utility similar to VxWorks <c><![CDATA[memShow]]></c>, but for the Erlang memory area.</fsummary>
-      <desc>
-        <p>Return Value:</p>
-        <p>Returns 0 (OK) on success, otherwise a value &lt;&gt; 0.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>int</ret><nametext>erl_mem_info_get(MEM_PART_STATS *stats)</nametext></name>
-      <fsummary>A utility similar to VxWorks <c><![CDATA[memPartInfoGet]]></c>, but for the Erlang memory area.</fsummary>
-      <desc>
-        <p>Parameter:</p>
-        <taglist>
-          <tag>MEM_PART_STATS *stats</tag>
-          <item>A pointer to a MEM_PART_STATS structure as defined in
-          <c><![CDATA[<memLib.h>]]></c>. A successful call will fill in all
-           fields of the structure, on error all fields are left untouched. </item>
-        </taglist>
-        <p>Return Value:</p>
-        <p>Returns 0 (OK) on success, otherwise a value &lt;&gt; 0</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>NOTES</title>
-    <p>The memory block used by Erlang actually does not need to be
-      inside the area known to ordinary <c><![CDATA[malloc]]></c>. It is possible
-      to set the <c><![CDATA[USER_RESERVED_MEM]]></c> preprocessor symbol when compiling
-      the wind kernel and then use user reserved memory for
-      Erlang. Erlang can therefor utilize memory above the 32 Mb limit
-      of VxWorks on the PowerPC architecture.</p>
-    <p>Example:</p>
-    <p>In config.h for the wind kernel:</p>
-    <code type="none"><![CDATA[
-      #undef LOCAL_MEM_AUTOSIZE
-      #undef LOCAL_MEM_SIZE
-      #undef USER_RESERVED_MEM
- 
-      #define LOCAL_MEM_SIZE        0x05000000
-      #define USER_RESERVED_MEM     0x03000000
-    ]]></code>
-    <p>In the start-up script/code for the VxWorks node:</p>
-    <code type="none"><![CDATA[
-erl_set_memory_block(sysPhysMemTop()-sysMemTop(),sysMemTop(),0,0,1);
-    ]]></code>
-    <p>Setting the <c><![CDATA[use_reclaim]]></c> flag decreases performance of the
-      system, but makes programming much easier. Other similar
-      facilities are present in the Erlang system even without using a
-      separate memory block. The routines called <c><![CDATA[save_malloc]]></c>,
-      <c><![CDATA[save_realloc]]></c> and <c><![CDATA[save_free]]></c> provide the same
-      facilities by using VxWorks own <c><![CDATA[malloc]]></c>. Similar routines
-      exist for files, see the file <c><![CDATA[reclaim.h]]></c> in the distribution.</p>
-  </section>
-</cref>
-
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index b5ddf0e17c..b691bb9d58 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -2606,8 +2606,8 @@ os_prompt% </pre>
             <p>This is only valid for <c>{spawn, <anno>Command</anno>}</c> and
 	    <c>{spawn_executable, <anno>FileName</anno>}</c>.
               The external program starts using <c><anno>Dir</anno></c> as its
-              working directory. <c><anno>Dir</anno></c> must be a string. Not
-              available on VxWorks.</p>
+              working directory. <c><anno>Dir</anno></c> must be a string.
+		  </p>
           </item>
           <tag><c>{env, <anno>Env</anno>}</c></tag>
           <item>
@@ -2621,8 +2621,8 @@ os_prompt% </pre>
               port process. Both <c><anno>Name</anno></c> and <c><anno>Val</anno></c> must be
               strings. The one exception is <c><anno>Val</anno></c> being the atom
               <c>false</c> (in analogy with <c>os:getenv/1</c>), which
-              removes the environment variable. Not available on
-              VxWorks.</p>
+              removes the environment variable.
+		  </p>
           </item>
 	  <tag><c>{args, [ string() | binary() ]}</c></tag>
           <item>
diff --git a/erts/doc/src/ref_man.xml b/erts/doc/src/ref_man.xml
index 2042cf28bd..5c9938075c 100644
--- a/erts/doc/src/ref_man.xml
+++ b/erts/doc/src/ref_man.xml
@@ -49,7 +49,6 @@
   <xi:include href="escript.xml"/>
   <xi:include href="erlsrv.xml"/>
   <xi:include href="start_erl.xml"/>
-  <xi:include href="erl_set_memory_block.xml"/>
   <xi:include href="run_erl.xml"/>
   <xi:include href="start.xml"/>
   <xi:include href="erl_driver.xml"/>
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index e20e38d61b..7e966c81bb 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -332,15 +332,11 @@ LIBS += $(THR_LIBS)
 
 ifneq ($(findstring erts_internal_r, $(THR_LIBS)),erts_internal_r)
 
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-ERTS_INTERNAL_LIB=erts_internal
-else
 ifneq ($(strip $(THR_LIB_NAME)),)
 ERTS_INTERNAL_LIB=erts_internal_r
 else
 ERTS_INTERNAL_LIB=erts_internal
 endif
-endif
 
 LIBS += -l$(ERTS_INTERNAL_LIB)$(TYPEMARKER)
 
@@ -463,8 +459,6 @@ _create_dirs := $(shell mkdir -p $(CREATE_DIRS))
 GENERATE =
 HIPE_ASM =
 
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-else
 ifdef HIPE_ENABLED
 HIPE_ASM +=	$(TTF_DIR)/hipe_x86_asm.h \
 		$(TTF_DIR)/hipe_amd64_asm.h \
@@ -476,7 +470,6 @@ GENERATE +=	$(HIPE_ASM) \
 		$(TTF_DIR)/hipe_literals.h \
 		$(BINDIR)/hipe_mkliterals$(TF_MARKER)
 endif
-endif
 
 ifdef DTRACE_ENABLED
 # global.h causes problems by including dtrace-wrapper.h which includes
@@ -616,11 +609,6 @@ ifdef PERFCTR_PATH
 INCLUDES += -I$(PERFCTR_PATH)/usr.lib -I$(PERFCTR_PATH)/linux/include
 endif
 
-# Need to include etc dir on VxWorks
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-INCLUDES += -I$(ERL_TOP)/erts/etc/vxworks
-endif
-
 ifeq ($(TARGET),win32)
 $(OBJDIR)/dll_sys.o: sys/$(ERLANG_OSTYPE)/sys.c
 	$(CC) $(CFLAGS) -DERL_RUN_SHARED_LIB=1 $(INCLUDES) -c $< -o $@
@@ -663,12 +651,6 @@ $(OBJDIR)/%.o: drivers/common/%.c
 $(OBJDIR)/%.o: drivers/$(ERLANG_OSTYPE)/%.c
 	$(CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -Idrivers/$(ERLANG_OSTYPE) -I../etc/$(ERLANG_OSTYPE) -c $< -o $@
 
-# VxWorks uses unix drivers too...
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-$(OBJDIR)/%.o: drivers/unix/%.c
-	$(CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@
-endif
-
 # ----------------------------------------------------------------------
 # Specials
 #
@@ -781,12 +763,8 @@ OS_OBJS = \
 	$(OBJDIR)/gzio.o \
 	$(OBJDIR)/elib_memmove.o
 
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-	OS_OBJS += $(OBJDIR)/int64.o 
-else
 	OS_OBJS += $(OBJDIR)/sys_float.o \
                    $(OBJDIR)/sys_time.o
-endif
 DRV_OBJS = \
 	$(OBJDIR)/efile_drv.o \
 	$(OBJDIR)/inet_drv.o \
@@ -794,9 +772,7 @@ DRV_OBJS = \
 	$(OBJDIR)/ram_file_drv.o
 endif
 
-ifneq ($(findstring vxworks,$(TARGET)),vxworks)
 	DRV_OBJS += $(OBJDIR)/ttsl_drv.o
-endif
 
 ifeq ($(ERTS_ENABLE_KERNEL_POLL),yes)
 OS_OBJS += 	$(OBJDIR)/erl_poll.kp.o \
@@ -934,31 +910,6 @@ $(OBJDIR)/hipe_arm.o:           hipe/hipe_arm.c
 # end of HiPE section
 ########################################
 
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-########################################
-# Extract what we need from libgcc.a
-########################################
-GCCLIBFLAGS=@GCCLIBFLAGS@
-STRIP=@STRIP@
-SYMPREFIX=@SYMPREFIX@
-
-NEEDFUNCTIONS=__divdi3 __moddi3 __udivdi3
-KEEPSYMS=$(NEEDFUNCTIONS:%=-K $(SYMPREFIX)%)
-
-$(OBJDIR)/int64.o: $(TARGET)/int64.c
-	$(CC) -o $(OBJDIR)/int64tmp.o -c $(TARGET)/int64.c
-	$(LD) -o $(OBJDIR)/int64.o $(OBJDIR)/int64tmp.o $(LDFLAGS) $(GCCLIBFLAGS)
-	$(STRIP) $(KEEPSYMS) $(OBJDIR)/int64.o
-
-$(TARGET)/int64.c:
-	echo 'void dummy(void); void dummy(void) {' > $(TARGET)/int64.c
-	for x in $(NEEDFUNCTIONS); do echo 'extern void '$$x'();' \
-		>> $(TARGET)/int64.c; done 
-	for x in $(NEEDFUNCTIONS); do echo $$x'();' >> $(TARGET)/int64.c; done
-	echo '}'  >> $(TARGET)/int64.c 
-
-endif
-
 # ----------------------------------------------------------------------
 # The emulator itself
 
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index efce070061..5dc5aa1e03 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -960,16 +960,9 @@ static void save_stacktrace(Process* c_p, BeamInstr* pc, Eterm* reg,
 static struct StackTrace * get_trace_from_exc(Eterm exc);
 static Eterm make_arglist(Process* c_p, Eterm* reg, int a);
 
-#if defined(VXWORKS)
-static int init_done;
-#endif
-
 void
 init_emulator(void)
 {
-#if defined(VXWORKS)
-    init_done = 0;
-#endif
     erts_smp_atomic_init_nob(&warned_for_tuple_funs, (erts_aint_t) 0);
     process_main();
 }
@@ -1102,9 +1095,7 @@ dtrace_drvport_str(ErlDrvPort drvport, char *port_buf)
  */
 void process_main(void)
 {
-#if !defined(VXWORKS)
     static int init_done = 0;
-#endif
     Process* c_p = NULL;
     int reds_used;
 #ifdef DEBUG
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 918a800555..ba73ca6da7 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -2300,11 +2300,7 @@ erts_allocated_areas(int *print_to_p, void *print_to_arg, void *proc)
     values[i].name = "static";
     values[i].ui[0] = 
 	erts_max_ports*sizeof(Port)		/* Port table */
-	+ erts_timer_wheel_memory_size()	/* Timer wheel */
-#ifdef SYS_TMP_BUF_SIZE
-	+ SYS_TMP_BUF_SIZE		/* tmp_buf in sys on vxworks & ose */
-#endif
-	;
+	+ erts_timer_wheel_memory_size();	/* Timer wheel */
     i++;
 
     erts_atom_get_text_space_sizes(&reserved_atom_space, &atom_space);
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types
index 134de6dfa6..7b27b3dda9 100644
--- a/erts/emulator/beam/erl_alloc.types
+++ b/erts/emulator/beam/erl_alloc.types
@@ -420,28 +420,4 @@ type	CON_VPRINTF_BUF	TEMPORARY	SYSTEM		con_vprintf_buf
 
 +endif
 
-+if vxworks
-
-type	SYS_TMP_BUF	LONG_LIVED	SYSTEM		sys_tmp_buf
-type	PEND_DATA	SYSTEM		SYSTEM		pending_data
-type	FD_TAB		LONG_LIVED	SYSTEM		fd_tab
-type	FD_ENTRY_BUF	SYSTEM		SYSTEM		fd_entry_buf
-
-+endif
-
-+if ose
-
-type	SYS_TMP_BUF	LONG_LIVED	SYSTEM		sys_tmp_buf
-type	PUTENV_STR	SYSTEM		SYSTEM		putenv_string
-type	GETENV_STR	SYSTEM		SYSTEM		getenv_string
-type	GETENV_STATE	SYSTEM		SYSTEM		getenv_state
-type	SIG_ENTRY	SYSTEM		SYSTEM		sig_entry
-type	DRIVER_DATA	SYSTEM		SYSTEM		driver_data
-type	PGM_TAB		SYSTEM		SYSTEM		pgm_tab
-type	PGM_ENTRY	SYSTEM		SYSTEM		pgm_entry
-type	PRT_TAB		SYSTEM		SYSTEM		prt_tab
-type	PRT_ENTRY	SYSTEM		SYSTEM		prt_entry
-
-+endif
-
 # ----------------------------------------------------------------------------
diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h
index 1ae9a211d7..771ee46d2b 100644
--- a/erts/emulator/beam/erl_driver.h
+++ b/erts/emulator/beam/erl_driver.h
@@ -87,10 +87,7 @@
 #include <stdlib.h>
 #include <string.h>		/* ssize_t on Mac OS X */
 
-#if defined(VXWORKS)
-#  include <ioLib.h>
-typedef struct iovec SysIOVec;
-#elif defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_)
+#if defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_)
 #ifndef STATIC_ERLANG_DRIVER
    /* Windows dynamic drivers, everything is different... */
 #define ERL_DRIVER_TYPES_ONLY
@@ -370,11 +367,7 @@ typedef struct erl_drv_entry {
 /* For windows dynamic drivers */
 #ifndef ERL_DRIVER_TYPES_ONLY
 
-#if defined(VXWORKS)
-#  define DRIVER_INIT(DRIVER_NAME) \
-    ErlDrvEntry* DRIVER_NAME  ## _init(void); \
-    ErlDrvEntry* DRIVER_NAME  ## _init(void)
-#elif defined(__WIN32__)
+#if defined(__WIN32__)
 #  define DRIVER_INIT(DRIVER_NAME) \
     __declspec(dllexport) ErlDrvEntry* driver_init(void); \
     __declspec(dllexport) ErlDrvEntry* driver_init(void)
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h
index e5d99dc4f1..3fc7b2c9c2 100644
--- a/erts/emulator/beam/erl_nif.h
+++ b/erts/emulator/beam/erl_nif.h
@@ -187,11 +187,7 @@ extern TWinDynNifCallbacks WinDynNifCallbacks;
 #else 
 #  define ERL_NIF_INIT_GLOB
 #  define ERL_NIF_INIT_BODY
-#  if defined(VXWORKS)
-#    define ERL_NIF_INIT_DECL(MODNAME) ErlNifEntry* MODNAME  ## _init(void)
-#  else
-#    define ERL_NIF_INIT_DECL(MODNAME) ErlNifEntry* nif_init(void)
-#  endif
+#  define ERL_NIF_INIT_DECL(MODNAME) ErlNifEntry* nif_init(void)
 #endif
 
 
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index 0d3b910278..1dc6f1d233 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -25,11 +25,6 @@
 #  define NO_FPE_SIGNALS
 #endif
 
-/* xxxP __VXWORKS__ */
-#ifdef VXWORKS
-#include <vxWorks.h>
-#endif
-
 #ifdef DISABLE_CHILD_WAITER_THREAD
 #undef ENABLE_CHILD_WAITER_THREAD
 #endif
@@ -43,8 +38,6 @@
 
 #if defined (__WIN32__)
 #  include "erl_win_sys.h"
-#elif defined (VXWORKS) 
-#  include "erl_vxworks_sys.h"
 #else 
 #  include "erl_unix_sys.h"
 #ifndef UNIX
@@ -182,12 +175,6 @@ void erl_assert_error(char* expr, char* file, int line);
 #  define const
 #endif
 
-#ifdef VXWORKS
-/* Replace VxWorks' printf with a real one that does fprintf(stdout, ...) */
-int real_printf(const char *fmt, ...);
-#  define printf real_printf
-#endif
-
 #undef __deprecated
 #if ERTS_AT_LEAST_GCC_VSN__(3, 0, 0)
 #  define __deprecated __attribute__((deprecated))
@@ -486,38 +473,28 @@ static unsigned long zero_value = 0, one_value = 1;
 #    define SET_NONBLOCKING(fd)	ioctlsocket((fd), FIONBIO, &one_value)
 
 #  else
-#    ifdef VXWORKS
-#      include <fcntl.h> /* xxxP added for O_WRONLY etc ... macro:s ... */
-#      include <ioLib.h>
-static const int zero_value = 0, one_value = 1;
-#      define SET_BLOCKING(fd)	ioctl((fd), FIONBIO, (int)&zero_value)
-#      define SET_NONBLOCKING(fd)	ioctl((fd), FIONBIO, (int)&one_value)
-#      define ERRNO_BLOCK EWOULDBLOCK
-
-#    else
-#      ifdef NB_FIONBIO		/* Old BSD */
-#        include <sys/ioctl.h>
+#    ifdef NB_FIONBIO		/* Old BSD */
+#      include <sys/ioctl.h>
   static const int zero_value = 0, one_value = 1;
-#        define SET_BLOCKING(fd)	ioctl((fd), FIONBIO, &zero_value)
-#        define SET_NONBLOCKING(fd)	ioctl((fd), FIONBIO, &one_value)
-#        define ERRNO_BLOCK EWOULDBLOCK
-#      else /* !NB_FIONBIO */
-#        include <fcntl.h>
-#        ifdef NB_O_NDELAY		/* Nothing needs this? */
-#          define NB_FLAG O_NDELAY
-#          ifndef ERRNO_BLOCK		/* allow override (e.g. EAGAIN) via Makefile */
-#            define ERRNO_BLOCK EWOULDBLOCK
-#          endif
-#        else  /* !NB_O_NDELAY */	/* The True Way - POSIX!:-) */
-#          define NB_FLAG O_NONBLOCK
-#          define ERRNO_BLOCK EAGAIN
-#        endif /* !NB_O_NDELAY */
-#        define SET_BLOCKING(fd)	fcntl((fd), F_SETFL, \
-	  			      fcntl((fd), F_GETFL, 0) & ~NB_FLAG)
-#        define SET_NONBLOCKING(fd)	fcntl((fd), F_SETFL, \
-				      fcntl((fd), F_GETFL, 0) | NB_FLAG)
-#      endif /* !NB_FIONBIO */
-#    endif /* _WXWORKS_ */
+#      define SET_BLOCKING(fd)         ioctl((fd), FIONBIO, &zero_value)
+#      define SET_NONBLOCKING(fd)      ioctl((fd), FIONBIO, &one_value)
+#      define ERRNO_BLOCK EWOULDBLOCK
+#    else /* !NB_FIONBIO */
+#      include <fcntl.h>
+#      ifdef NB_O_NDELAY               /* Nothing needs this? */
+#        define NB_FLAG O_NDELAY
+#        ifndef ERRNO_BLOCK            /* allow override (e.g. EAGAIN) via Makefile */
+#          define ERRNO_BLOCK EWOULDBLOCK
+#        endif
+#      else  /* !NB_O_NDELAY */	/* The True Way - POSIX!:-) */
+#        define NB_FLAG O_NONBLOCK
+#        define ERRNO_BLOCK EAGAIN
+#      endif /* !NB_O_NDELAY */
+#      define SET_BLOCKING(fd)         fcntl((fd), F_SETFL, \
+                                           fcntl((fd), F_GETFL, 0) & ~NB_FLAG)
+#      define SET_NONBLOCKING(fd)      fcntl((fd), F_SETFL, \
+                                           fcntl((fd), F_GETFL, 0) | NB_FLAG)
+#    endif /* !NB_FIONBIO */
 #  endif /* !__WIN32__ */
 #endif /* WANT_NONBLOCKING */
 
@@ -870,13 +847,6 @@ erts_refc_read(erts_refc_t *refcp, erts_aint_t min_val)
 extern int erts_use_kernel_poll;
 #endif
 
-#if defined(VXWORKS)
-/* NOTE! sys_calloc2 does not exist on other 
-   platforms than VxWorks and OSE */
-void* sys_calloc2(Uint, Uint);
-#endif /* VXWORKS || OSE */
-
-
 #define sys_memcpy(s1,s2,n)  memcpy(s1,s2,n)
 #define sys_memmove(s1,s2,n) memmove(s1,s2,n)
 #define sys_memcmp(s1,s2,n)  memcmp(s1,s2,n)
@@ -983,43 +953,6 @@ void erl_bin_write(unsigned char *, int, int);
 #  define DEBUGF(x)
 #endif
 
-
-#ifdef VXWORKS
-/* This includes redefines of malloc etc 
-   this should be done after sys_alloc, etc, above */
-#  include "reclaim.h"
-/*********************Malloc and friends************************
- * There is a problem with the naming of malloc and friends, 
- * malloc is used throughout sys.c and the resolver to mean save_alloc,
- * but it should actually mean either sys_alloc or sys_alloc2,
- * so the definitions from reclaim_master.h are not any
- * good, i redefine the malloc family here, although it's quite 
- * ugly, actually it would be preferrable to use the
- * names sys_alloc and so on throughout the offending code, but
- * that will be saved as an later exercise...
- * I also add an own calloc, to make the BSD resolver source happy.
- ***************************************************************/
-/* Undefine malloc and friends */
-#  ifdef malloc
-#    undef malloc
-#  endif
-#  ifdef calloc
-#    undef calloc
-#  endif
-#  ifdef realloc
-#    undef realloc
-#  endif
-#  ifdef free
-#    undef free
-#  endif
-/* Redefine malloc and friends */
-#  define malloc sys_alloc
-#  define calloc  sys_calloc
-#  define realloc  sys_realloc
-#  define free sys_free
-
-#endif
-
 #ifdef __WIN32__
 #ifdef ARCH_64
 #define ERTS_ALLOC_ALIGN_BYTES 16
@@ -1035,23 +968,20 @@ void erl_bin_write(unsigned char *, int, int);
 
 
 #ifdef __WIN32__
-
 void call_break_handler(void);
 char* last_error(void);
 char* win32_errorstr(int);
-
-
 #endif
 
 /************************************************************************
  * Find out the native filename encoding of the process (look at locale of 
  * Unix processes and just do UTF16 on windows 
  ************************************************************************/
-#define ERL_FILENAME_UNKNOWN 0
-#define ERL_FILENAME_LATIN1 1
-#define ERL_FILENAME_UTF8 2
-#define ERL_FILENAME_UTF8_MAC 3
-#define ERL_FILENAME_WIN_WCHAR 4
+#define ERL_FILENAME_UNKNOWN   (0)
+#define ERL_FILENAME_LATIN1    (1)
+#define ERL_FILENAME_UTF8      (2)
+#define ERL_FILENAME_UTF8_MAC  (3)
+#define ERL_FILENAME_WIN_WCHAR (4)
 
 int erts_get_native_filename_encoding(void);
 /* The set function is only to be used by erl_init! */
@@ -1061,4 +991,3 @@ int erts_get_user_requested_filename_encoding(void);
 void erts_init_sys_common_misc(void);
 
 #endif
-
diff --git a/erts/emulator/drivers/common/gzio.c b/erts/emulator/drivers/common/gzio.c
index a9303d55bc..ca6d25adb4 100644
--- a/erts/emulator/drivers/common/gzio.c
+++ b/erts/emulator/drivers/common/gzio.c
@@ -21,11 +21,6 @@
 #include "erl_driver.h"
 #include "sys.h"
 
-#ifdef VXWORKS
-/* pull in FOPEN from zutil.h instead */
-#undef F_OPEN
-#endif
-
 #ifdef __WIN32__
 #ifndef HAVE_CONFLICTING_FREAD_DECLARATION
 #define HAVE_CONFLICTING_FREAD_DECLARATION
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index cfa158ffb1..0d6419e50e 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -284,27 +284,15 @@ static unsigned long one_value = 1;
 
 #else
 
-#ifdef VXWORKS
-#include <sockLib.h>
-#include <sys/times.h>
-#include <iosLib.h>
-#include <taskLib.h>
-#include <selectLib.h>
-#include <ioLib.h>
-#else
 #include <sys/time.h>
 #ifdef NETDB_H_NEEDS_IN_H
 #include <netinet/in.h>
 #endif
 #include <netdb.h>
-#endif
 
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#ifdef VXWORKS
-#include <rpc/rpctypes.h>
-#endif
 #ifdef DEF_INADDR_LOOPBACK_IN_RPC_TYPES_H
 #include <rpc/types.h>
 #endif
@@ -312,12 +300,10 @@ static unsigned long one_value = 1;
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
-#if (!defined(VXWORKS))
 #include <sys/param.h>
 #ifdef HAVE_ARPA_NAMESER_H
 #include <arpa/nameser.h>
 #endif
-#endif
 
 #ifdef HAVE_SYS_SOCKIO_H
 #include <sys/sockio.h>
@@ -331,7 +317,7 @@ static unsigned long one_value = 1;
 
 /* SCTP support -- currently for UNIX platforms only: */
 #undef HAVE_SCTP
-#if (!defined(VXWORKS) && !defined(__WIN32__) && defined(HAVE_SCTP_H))
+#if (!defined(__WIN32__) && defined(HAVE_SCTP_H))
 
 #include <netinet/sctp.h>
 
@@ -478,15 +464,8 @@ static int my_strncasecmp(const char *s1, const char *s2, size_t n)
 #define sock_connect(s, addr, len)  connect((s), (addr), (len))
 #define sock_listen(s, b)           listen((s), (b))
 #define sock_bind(s, addr, len)     bind((s), (addr), (len))
-#ifdef VXWORKS
-#define sock_getopt(s,t,n,v,l)      wrap_sockopt(&getsockopt,\
-                                                 s,t,n,v,(unsigned int)(l))
-#define sock_setopt(s,t,n,v,l)      wrap_sockopt(&setsockopt,\
-                                                 s,t,n,v,(unsigned int)(l))
-#else
 #define sock_getopt(s,t,n,v,l)      getsockopt((s),(t),(n),(v),(l))
 #define sock_setopt(s,t,n,v,l)      setsockopt((s),(t),(n),(v),(l))
-#endif
 #define sock_name(s, addr, len)     getsockname((s), (addr), (len))
 #define sock_peer(s, addr, len)     getpeername((s), (addr), (len))
 #define sock_ntohs(x)               ntohs((x))
@@ -5260,50 +5239,6 @@ static ErlDrvSSizeT inet_ctl_getifaddrs(inet_descriptor* desc_p,
 
 #endif
 
-
-
-#ifdef VXWORKS
-/*
-** THIS is a terrible creature, a bug in the TCP part
-** of the old VxWorks stack (non SENS) created a race.
-** If (and only if?) a socket got closed from the other
-** end and we tried a set/getsockopt on the TCP level,
-** the task would generate a bus error...
-*/
-static STATUS wrap_sockopt(STATUS (*function)() /* Yep, no parameter
-                                                   check */,
-                           int s, int level, int optname,
-                           char *optval, unsigned int optlen 
-                           /* optlen is a pointer if function 
-                              is getsockopt... */)
-{
-    fd_set rs;
-    struct timeval timeout;
-    int to_read;
-    int ret;
-
-    FD_ZERO(&rs);
-    FD_SET(s,&rs);
-    memset(&timeout,0,sizeof(timeout));
-    if (level == IPPROTO_TCP) {
-        taskLock();
-        if (select(s+1,&rs,NULL,NULL,&timeout)) {
-            if (ioctl(s,FIONREAD,(int)&to_read) == ERROR ||
-                to_read == 0) { /* End of file, other end closed? */
-                sock_errno() = EBADF;
-                taskUnlock();
-                return ERROR;
-            }
-        }
-        ret = (*function)(s,level,optname,optval,optlen);
-        taskUnlock();
-    } else {
-        ret = (*function)(s,level,optname,optval,optlen);
-    }
-    return ret;
-}
-#endif
-
 /* Per H @ Tail-f: The original code here had problems that possibly
    only occur if you abuse it for non-INET sockets, but anyway:
    a) If the getsockopt for SO_PRIORITY or IP_TOS failed, the actual
@@ -5555,23 +5490,11 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
 	case INET_OPT_SNDBUF:    type = SO_SNDBUF; 
 	    DEBUGF(("inet_set_opts(%ld): s=%d, SO_SNDBUF=%d\r\n",
 		    (long)desc->port, desc->s, ival));
-	    /* 
-	     * Setting buffer sizes in VxWorks gives unexpected results
-	     * our workaround is to leave it at default.
-	     */
-#ifdef VXWORKS
-	    goto skip_os_setopt;
-#else
 	    break;
-#endif
 	case INET_OPT_RCVBUF:    type = SO_RCVBUF; 
 	    DEBUGF(("inet_set_opts(%ld): s=%d, SO_RCVBUF=%d\r\n",
 		    (long)desc->port, desc->s, ival));
-#ifdef VXWORKS
-	    goto skip_os_setopt;
-#else
 	    break;
-#endif
 	case INET_OPT_LINGER:    type = SO_LINGER; 
 	    if (len < 4)
 		return -1;
@@ -5693,9 +5616,6 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
 	}
 	DEBUGF(("inet_set_opts(%ld): s=%d returned %d\r\n",
 		(long)desc->port, desc->s, res));
-#ifdef VXWORKS
-skip_os_setopt:
-#endif
 	if (type == SO_RCVBUF) {
 	    /* make sure we have desc->bufsz >= SO_RCVBUF */
 	    if (ival > desc->bufsz)
@@ -7757,8 +7677,6 @@ static ErlDrvSSizeT inet_ctl(inet_descriptor* desc, int cmd, char* buf,
       return ctl_reply(INET_REP_OK, NULL, 0, rbuf, rsize);
     }
 
-#ifndef VXWORKS
-
     case INET_REQ_GETSERVBYNAME: { /* L1 Name-String L2 Proto-String */
 	char namebuf[256];
 	char protobuf[256];
@@ -7809,8 +7727,6 @@ static ErlDrvSSizeT inet_ctl(inet_descriptor* desc, int cmd, char* buf,
 	return ctl_reply(INET_REP_OK, srv->s_name, len, rbuf, rsize);
     }
 	
-#endif /* !VXWORKS */	
-
     default:
 	return ctl_xerror(EXBADPORT, rbuf, rsize);
     }
diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c
index b250bac4dc..2aa373aa7d 100644
--- a/erts/emulator/drivers/unix/unix_efile.c
+++ b/erts/emulator/drivers/unix/unix_efile.c
@@ -45,23 +45,6 @@
 #include <fcntl.h>
 #endif /* DARWIN */
 
-#ifdef VXWORKS
-#include <ioLib.h>
-#include <dosFsLib.h>
-#include <nfsLib.h>
-#include <sys/stat.h>
-/*
-** Not nice to include usrLib.h as MANY normal variable names get reported
-** as shadowing globals, like 'i' for example.
-** Instead we declare the only function we use here
-*/
-/*
- * #include <usrLib.h>
- */
-extern STATUS copy(char *, char *);
-#include <errno.h>
-#endif
-
 #ifdef SUNOS4
 #  define getcwd(buf, size) getwd(buf)
 #endif
@@ -93,276 +76,27 @@ extern STATUS copy(char *, char *);
 #define DIR_MODE  0777
 #endif
 
-#ifdef VXWORKS /* Currently only used on vxworks */
-
-#define EF_ALLOC(S)		driver_alloc((S))
-#define EF_REALLOC(P, S)	driver_realloc((P), (S))
-#define EF_SAFE_ALLOC(S)	ef_safe_alloc((S))
-#define EF_SAFE_REALLOC(P, S)	ef_safe_realloc((P), (S))
-#define EF_FREE(P)		do { if((P)) driver_free((P)); } while(0)
-
-void erl_exit(int n, char *fmt, ...);
-
-static void *ef_safe_alloc(Uint s)
-{
-    void *p = EF_ALLOC(s);
-    if (!p) erl_exit(1,
-		     "unix efile drv: Can't allocate %lu bytes of memory\n",
-		     (unsigned long)s);
-    return p;
-}
-
-#if 0 /* Currently not used */
-
-static void *ef_safe_realloc(void *op, Uint s)
-{
-    void *p = EF_REALLOC(op, s);
-    if (!p) erl_exit(1,
-		     "unix efile drv: Can't reallocate %lu bytes of memory\n",
-		     (unsigned long)s);
-    return p;
-}
-
-#endif /* #if 0 */
-#endif /* #ifdef VXWORKS */
-
 #define IS_DOT_OR_DOTDOT(s) \
     (s[0] == '.' && (s[1] == '\0' || (s[1] == '.' && s[2] == '\0')))
 
-#ifdef VXWORKS
-static int vxworks_to_posix(int vx_errno);
-#endif
-
-/*
-** VxWorks (not) strikes again. Too long RESULTING paths
-** may give the infamous bus error. Have to check ALL
-** filenames and pathnames. No wonder the emulator is slow on
-** these cards...
-*/
-#ifdef VXWORKS
-#define CHECK_PATHLEN(Name, ErrInfo)		\
-   if (path_size(Name) > PATH_MAX) {		\
-       errno = ENAMETOOLONG;			\
-       return check_error(-1, ErrInfo);		\
-   }
-#else
-#define CHECK_PATHLEN(X,Y) /* Nothing */
-#endif
-
 static int check_error(int result, Efile_error* errInfo);
 
 static int
 check_error(int result, Efile_error *errInfo)
 {
     if (result < 0) {
-#ifdef VXWORKS
-	errInfo->posix_errno = errInfo->os_errno = vxworks_to_posix(errno);
-#else
 	errInfo->posix_errno = errInfo->os_errno = errno;
-#endif
 	return 0;
     }
     return 1;
 }
 
-#ifdef VXWORKS
-
-/*
- * VxWorks has different error codes for different file systems.
- * We map those to POSIX ones.
- */
-static int
-vxworks_to_posix(int vx_errno)
-{
-    DEBUGF(("[vxworks_to_posix] vx_errno: %08x\n", vx_errno));
-    switch (vx_errno) {
-	/* dosFsLib mapping */
-#ifdef S_dosFsLib_FILE_ALREADY_EXISTS    
-    case S_dosFsLib_FILE_ALREADY_EXISTS: return EEXIST;
-#else
-    case S_dosFsLib_FILE_EXISTS: return EEXIST;
-#endif
-#ifdef S_dosFsLib_BAD_DISK
-    case S_dosFsLib_BAD_DISK: return EIO;
-#endif
-#ifdef S_dosFsLib_CANT_CHANGE_ROOT
-    case S_dosFsLib_CANT_CHANGE_ROOT: return EINVAL;
-#endif
-#ifdef S_dosFsLib_NO_BLOCK_DEVICE
-    case S_dosFsLib_NO_BLOCK_DEVICE: return ENOTBLK;
-#endif
-#ifdef S_dosFsLib_BAD_SEEK
-    case S_dosFsLib_BAD_SEEK: return ESPIPE;
-#endif
-    case S_dosFsLib_VOLUME_NOT_AVAILABLE: return ENXIO;
-    case S_dosFsLib_DISK_FULL: return ENOSPC;
-    case S_dosFsLib_FILE_NOT_FOUND: return ENOENT;
-    case S_dosFsLib_NO_FREE_FILE_DESCRIPTORS: return ENFILE;
-    case S_dosFsLib_INVALID_NUMBER_OF_BYTES: return EINVAL;
-    case S_dosFsLib_ILLEGAL_NAME: return EINVAL;
-    case S_dosFsLib_CANT_DEL_ROOT: return EACCES;
-    case S_dosFsLib_NOT_FILE: return EISDIR;
-    case S_dosFsLib_NOT_DIRECTORY: return ENOTDIR;
-    case S_dosFsLib_NOT_SAME_VOLUME: return EXDEV;
-    case S_dosFsLib_READ_ONLY: return EACCES;
-    case S_dosFsLib_ROOT_DIR_FULL: return ENOSPC;
-    case S_dosFsLib_DIR_NOT_EMPTY: return EEXIST;
-    case S_dosFsLib_NO_LABEL: return ENXIO;
-    case S_dosFsLib_INVALID_PARAMETER: return EINVAL;
-    case S_dosFsLib_NO_CONTIG_SPACE: return ENOSPC;
-    case S_dosFsLib_FD_OBSOLETE: return EBADF;
-    case S_dosFsLib_DELETED: return EINVAL;
-    case S_dosFsLib_INTERNAL_ERROR: return EIO;
-    case S_dosFsLib_WRITE_ONLY: return EACCES;
-	/* nfsLib mapping - is needed since Windriver has used */
-	/* inconsistent error codes (errno.h/nfsLib.h). */
-    case S_nfsLib_NFS_OK: return 0;
-    case S_nfsLib_NFSERR_PERM: return EPERM;
-    case S_nfsLib_NFSERR_NOENT: return ENOENT;
-    case S_nfsLib_NFSERR_IO: return EIO;
-    case S_nfsLib_NFSERR_NXIO: return ENXIO;
-#ifdef S_nfsLib_NFSERR_ACCES
-    case S_nfsLib_NFSERR_ACCES: return EACCES;
-#else
-    case S_nfsLib_NFSERR_ACCESS: return EACCES;
-#endif
-    case S_nfsLib_NFSERR_EXIST: return EEXIST;
-    case S_nfsLib_NFSERR_NODEV: return ENODEV;
-    case S_nfsLib_NFSERR_NOTDIR: return ENOTDIR;
-    case S_nfsLib_NFSERR_ISDIR: return EISDIR;
-    case S_nfsLib_NFSERR_FBIG: return EFBIG;
-    case S_nfsLib_NFSERR_NOSPC: return ENOSPC;
-    case S_nfsLib_NFSERR_ROFS: return EROFS;
-    case S_nfsLib_NFSERR_NAMETOOLONG: return ENAMETOOLONG;
-    case S_nfsLib_NFSERR_NOTEMPTY: return EEXIST;
-    case S_nfsLib_NFSERR_DQUOT: return ENOSPC;
-    case S_nfsLib_NFSERR_STALE: return EINVAL;
-    case S_nfsLib_NFSERR_WFLUSH: return ENXIO;
-	/* And sometimes (...) the error codes are from ioLib (as in the */
-	/* case of the (for nfsLib) unimplemented rename function) */
-    case  S_ioLib_DISK_NOT_PRESENT: return EIO;
-#if S_ioLib_DISK_NOT_PRESENT != S_ioLib_NO_DRIVER
-    case S_ioLib_NO_DRIVER: return ENXIO;
-#endif
-    case S_ioLib_UNKNOWN_REQUEST: return ENOSYS;
-    case  S_ioLib_DEVICE_TIMEOUT: return EIO;
-#ifdef S_ioLib_UNFORMATED
-	/* Added (VxWorks 5.2 -> 5.3.1) */
-  #if S_ioLib_UNFORMATED != S_ioLib_DEVICE_TIMEOUT
-    case S_ioLib_UNFORMATED: return EIO;
-  #endif
-#endif
-#if S_ioLib_DEVICE_TIMEOUT != S_ioLib_DEVICE_ERROR
-    case S_ioLib_DEVICE_ERROR: return ENXIO;
-#endif
-    case S_ioLib_WRITE_PROTECTED: return EACCES;
-    case S_ioLib_NO_FILENAME: return EINVAL;
-    case S_ioLib_CANCELLED: return EINTR;
-    case  S_ioLib_NO_DEVICE_NAME_IN_PATH: return EINVAL;
-    case  S_ioLib_NAME_TOO_LONG: return ENAMETOOLONG;
-#ifdef S_objLib_OBJ_UNAVAILABLE
-    case S_objLib_OBJ_UNAVAILABLE: return ENOENT;
-#endif
-
-      /* Temporary workaround for a weird error in passFs 
-	 (VxWorks Simsparc only). File operation fails because of
-	 ENOENT, but errno is not set. */
-#ifdef SIMSPARCSOLARIS
-    case 0: return ENOENT;
-#endif
-
-    }
-    /* If the error code matches none of the above, assume */
-    /* it is a POSIX one already. The upper bits (>=16) are */
-    /* cleared since VxWorks uses those bits to indicate in */
-    /* what module the error occured. */
-    return vx_errno & 0xffff;
-}
-
-static int 
-vxworks_enotsup(Efile_error *errInfo) 
-{
-    errInfo->posix_errno = errInfo->os_errno = ENOTSUP;
-    return 0;
-}
-
-static int 
-count_path_length(char *pathname, char *pathname2)
-{
-    static int stack[PATH_MAX / 2 + 1];
-    int sp = 0;
-    char *tmp;
-    char *cpy = NULL;
-    int i;
-    int sum;
-    for(i = 0;i < 2;++i) {
-	if (!i) {
-	    cpy = EF_SAFE_ALLOC(strlen(pathname)+1);
-	    strcpy(cpy, pathname);
-	} else if (pathname2 != NULL) {
-	    EF_FREE(cpy);
-	    cpy = EF_SAFE_ALLOC(strlen(pathname2)+1);
-	    strcpy(cpy, pathname2);
-	} else 
-	    break;
-	    
-	for (tmp = strtok(cpy,"/"); tmp != NULL; tmp = strtok(NULL,"/")) {
-	    if (!strcmp(tmp,"..") && sp > 0)
-		--sp;
-	    else if (strcmp(tmp,".")) 
-		stack[sp++] = strlen(tmp);
-	}
-    }
-    if (cpy != NULL)
-	EF_FREE(cpy);
-    sum = 0;
-    for(i = 0;i < sp; ++i)
-	sum += stack[i]+1;
-    return (sum) ? sum : 1;
-}
-
-static int 
-path_size(char *pathname) 
-{
-    static char currdir[PATH_MAX+2];
-    if (*pathname == '/') 
-	return count_path_length(pathname,NULL);
-    ioDefPathGet(currdir);
-    strcat(currdir,"/");
-    return count_path_length(currdir,pathname);
-}
-    
-#endif /* VXWORKS */
-
 int
 efile_mkdir(Efile_error* errInfo,	/* Where to return error codes. */
 	    char* name)			/* Name of directory to create. */
 {
-    CHECK_PATHLEN(name,errInfo);
 #ifdef NO_MKDIR_MODE
-#ifdef VXWORKS
-	/* This is a VxWorks/nfs workaround for erl_tar to create
-	 * non-existant directories. (of some reason (...) VxWorks
-	 * returns, the *non-module-prefixed*, 0xd code when
-	 * trying to create a directory in a directory that doesn't exist).
-	 * (see efile_openfile)
-	 */
-    if (mkdir(name) < 0) {
-	struct stat sb;
-	if (name[0] == '\0') {
-	/* Return the correct error code enoent */ 
-	    errno = S_nfsLib_NFSERR_NOENT;
-	} else if (stat(name, &sb) == OK) {
-	    errno = S_nfsLib_NFSERR_EXIST;
-	} else if((strchr(name, '/') != NULL) && (errno == 0xd)) {
-	/* Return the correct error code enoent */ 
-	    errno = S_nfsLib_NFSERR_NOENT;
-	}
-	return check_error(-1, errInfo);
-    } else return 1;
-#else
     return check_error(mkdir(name), errInfo);
-#endif
 #else
     return check_error(mkdir(name, DIR_MODE), errInfo);
 #endif
@@ -372,16 +106,9 @@ int
 efile_rmdir(Efile_error* errInfo,	/* Where to return error codes. */
 	    char* name)			/* Name of directory to delete. */
 {
-    CHECK_PATHLEN(name, errInfo);
     if (rmdir(name) == 0) {
 	return 1;
     }
-#ifdef VXWORKS
-    if (name[0] == '\0') {
-	/* Return the correct error code enoent */ 
-	errno = S_nfsLib_NFSERR_NOENT;
-    }
-#else
     if (errno == ENOTEMPTY) {
 	errno = EEXIST;
     }
@@ -401,7 +128,6 @@ efile_rmdir(Efile_error* errInfo,	/* Where to return error codes. */
 	}
 	errno = saved_errno;
     }
-#endif
     return check_error(-1, errInfo);
 }
 
@@ -409,7 +135,6 @@ int
 efile_delete_file(Efile_error* errInfo,	/* Where to return error codes. */
 		  char* name)		/* Name of file to delete. */
 {
-    CHECK_PATHLEN(name,errInfo);
     if (unlink(name) == 0) {
 	return 1;
     }
@@ -457,32 +182,13 @@ efile_rename(Efile_error* errInfo,	/* Where to return error codes. */
 	     char* src,		        /* Original name. */
 	     char* dst)			/* New name. */
 {
-    CHECK_PATHLEN(src,errInfo);
-    CHECK_PATHLEN(dst,errInfo);
-#ifdef VXWORKS
-	
-    /* First check if src == dst, if so, just return. */
-    /* VxWorks dos file system destroys the file otherwise, */
-    /* VxWorks nfs file system rename doesn't work at all. */
-    if(strcmp(src, dst) == 0)
-	return 1;
-#endif
     if (rename(src, dst) == 0) {
 	return 1;
     }
-#ifdef VXWORKS
-    /* nfs for VxWorks doesn't support rename. We try to emulate it */
-    /* (by first copying src to dst and then deleting src). */
-    if(errno == S_ioLib_UNKNOWN_REQUEST &&     /* error code returned 
-						  by ioLib (!) */ 
-       copy(src, dst) == OK &&
-       unlink(src) == OK)
-	return 1;
-#endif
     if (errno == ENOTEMPTY) {
 	errno = EEXIST;
     }
-#if defined (sparc) && !defined(VXWORKS)
+#if defined (sparc)
     /*
      * SunOS 4.1.4 reports overwriting a non-empty directory with a
      * directory as EINVAL instead of EEXIST (first rule out the correct
@@ -543,7 +249,6 @@ int
 efile_chdir(Efile_error* errInfo,   /* Where to return error codes. */
 	    char* name)		    /* Name of directory to make current. */
 {
-    CHECK_PATHLEN(name, errInfo);
     return check_error(chdir(name), errInfo);
 }
 
@@ -600,8 +305,6 @@ efile_readdir(Efile_error* errInfo,	/* Where to return error codes. */
      * If this is the first call, we must open the directory.
      */
 
-    CHECK_PATHLEN(name, errInfo);
-
     if (*p_dir_handle == NULL) {
 	dp = opendir(name);
 	if (dp == NULL)
@@ -641,26 +344,8 @@ efile_openfile(Efile_error* errInfo,	/* Where to return error codes. */
     struct stat statbuf;
     int fd;
     int mode;			/* Open mode. */
-#ifdef VXWORKS
-    char pathbuff[PATH_MAX+2];
-    char sbuff[PATH_MAX*2];
-    char *totbuff = sbuff;
-    int nameneed;
-#endif
-
-
-    CHECK_PATHLEN(name, errInfo);
-
-#ifdef VXWORKS
-    /* Have to check that it's not a directory. */
-    if (stat(name,&statbuf) != ERROR && ISDIR(statbuf)) {
-	errno = EISDIR;
-	return check_error(-1, errInfo);
-    }	
-#endif	
 
     if (stat(name, &statbuf) >= 0 && !ISREG(statbuf)) {
-#if !defined(VXWORKS) && !defined(OSE)
 	/*
 	 * For UNIX only, here is some ugly code to allow
 	 * /dev/null to be opened as a file.
@@ -677,12 +362,9 @@ efile_openfile(Efile_error* errInfo,	/* Where to return error codes. */
 	    }
 	}
 	if (!(dev_null_ino && statbuf.st_ino == dev_null_ino)) {
-#endif
 	    errno = EISDIR;
 	    return check_error(-1, errInfo);
-#if !defined(VXWORKS) && !defined(OSE)
 	}
-#endif
     }
 
     switch (flags & (EFILE_MODE_READ|EFILE_MODE_WRITE)) {
@@ -706,49 +388,14 @@ efile_openfile(Efile_error* errInfo,	/* Where to return error codes. */
 
     if (flags & EFILE_MODE_APPEND) {
 	mode &= ~O_TRUNC;
-#ifndef VXWORKS
-	mode |= O_APPEND; /* Dont make VxWorks think things it shouldn't */
-#endif
+	mode |= O_APPEND;
     }
 
     if (flags & EFILE_MODE_EXCL) {
 	mode |= O_EXCL;
     }
 
-#ifdef VXWORKS
-    if (*name != '/') {
-	/* Make sure it is an absolute pathname, because ftruncate needs it */
-	ioDefPathGet(pathbuff);
-	strcat(pathbuff,"/");
-	nameneed = strlen(pathbuff) + strlen(name) + 1;
-	if (nameneed > PATH_MAX*2)
-	    totbuff = EF_SAFE_ALLOC(nameneed);
-	strcpy(totbuff,pathbuff);
-	strcat(totbuff,name);
-	fd = open(totbuff, mode, FILE_MODE);
-	if (totbuff != sbuff)
-	    EF_FREE(totbuff);
-    } else {
-	fd = open(name, mode, FILE_MODE);
-    }
-#else
     fd = open(name, mode, FILE_MODE);
-#endif
-
-#ifdef VXWORKS
-
-	/* This is a VxWorks/nfs workaround for erl_tar to create 
-	 * non-existant directories. (of some reason (...) VxWorks
-	 * returns, the *non-module-prefixed*, 0xd code when
-	 * trying to write a file in a directory that doesn't exist).
-	 * (see efile_mkdir)
-	 */
-    if ((fd < 0) && (strchr(name, '/') != NULL) && (errno == 0xd)) {
-	/* Return the correct error code enoent */ 
-	errno = S_nfsLib_NFSERR_NOENT;
-	return check_error(-1, errInfo);
-    }
-#endif
 
     if (!check_error(fd, errInfo))
 	return 0;
@@ -797,11 +444,7 @@ efile_fsync(Efile_error *errInfo, /* Where to return error codes. */
 	    int fd)               /* File descriptor for file to sync. */
 {
 #ifdef NO_FSYNC
-#ifdef VXWORKS
-    return check_error(ioctl(fd, FIOSYNC, 0), errInfo); 
-#else
-  undefined fsync
-#endif /* VXWORKS */
+  undefined fsync /* XXX: Really? */
 #else
 #if defined(DARWIN) && defined(F_FULLFSYNC)
     return check_error(fcntl(fd, F_FULLFSYNC), errInfo);
@@ -818,21 +461,8 @@ efile_fileinfo(Efile_error* errInfo, Efile_info* pInfo,
     struct stat statbuf;	/* Information about the file */
     int result;
 
-#ifdef VXWORKS
-    if (*name == '\0') {
-	errInfo->posix_errno = errInfo->os_errno = ENOENT;
-	return 0;
-    }
-#endif
-
-    CHECK_PATHLEN(name, errInfo);
-
     if (info_for_link) {
-#if (defined(VXWORKS))
-	result = stat(name, &statbuf);
-#else
 	result = lstat(name, &statbuf);
-#endif
     } else {
 	result = stat(name, &statbuf);
     }	
@@ -849,19 +479,9 @@ efile_fileinfo(Efile_error* errInfo, Efile_info* pInfo,
 
 #ifdef NO_ACCESS
     /* Just look at read/write access for owner. */
-#ifdef VXWORKS
-
-    pInfo->access = FA_NONE;
-    if(statbuf.st_mode & S_IRUSR)
-        pInfo->access |= FA_READ;
-    if(statbuf.st_mode & S_IWUSR)
-        pInfo->access |= FA_WRITE;
-    
-#else
 
     pInfo->access = ((statbuf.st_mode >> 6) & 07) >> 1;
 
-#endif /* VXWORKS */
 #else
     pInfo->access = FA_NONE;
     if (access(name, R_OK) == 0)
@@ -902,35 +522,6 @@ efile_write_info(Efile_error *errInfo, Efile_info *pInfo, char *name)
 {
     struct utimbuf tval;
 
-    CHECK_PATHLEN(name, errInfo);
-
-#ifdef VXWORKS
-
-    if (pInfo->mode != -1) {
-	int fd;
-	struct stat statbuf;
-
-	fd = open(name, O_RDONLY, 0);
-	if (!check_error(fd, errInfo))
-	    return 0;
-	if (fstat(fd, &statbuf) < 0) {
-	    close(fd);
-	    return check_error(-1, errInfo);
-	}
-	if (pInfo->mode & S_IWUSR) {
-	    /* clear read only bit */
-	    statbuf.st_attrib &= ~DOS_ATTR_RDONLY;
-	} else {
-	    /* set read only bit */
-	    statbuf.st_attrib |= DOS_ATTR_RDONLY;
-	}
-	/* This should work for dos files but not for nfs ditos, so don't 
-	 * report errors (to avoid problems when running e.g. erl_tar)
-	 */
-	ioctl(fd, FIOATTRIBSET, statbuf.st_attrib);
-	close(fd);
-    }
-#else
     /*
      * On some systems chown will always fail for a non-root user unless
      * POSIX_CHOWN_RESTRICTED is not set.  Others will succeed as long as 
@@ -952,20 +543,10 @@ efile_write_info(Efile_error *errInfo, Efile_info *pInfo, char *name)
 	}
     }
 
-#endif /* !VXWORKS */
-
     tval.actime  = pInfo->accessTime;
     tval.modtime = pInfo->modifyTime;
 
-#ifdef VXWORKS
-    /* VxWorks' utime doesn't work when the file is a nfs mounted
-     * one, don't report error if utime fails.
-     */
-    utime(name, &tval);
-    return 1;
-#else
     return check_error(utime(name, &tval), errInfo);
-#endif
 }
 
 
@@ -979,11 +560,6 @@ efile_write(Efile_error* errInfo,	/* Where to return error codes. */
 {
     ssize_t written;			/* Bytes written in last operation. */
 
-#ifdef VXWORKS
-    if (flags & EFILE_MODE_APPEND) {
-	lseek(fd, 0, SEEK_END); /* Naive append emulation on VXWORKS */
-    }
-#endif
     while (count > 0) {
 	if ((written = write(fd, buf, count)) < 0) {
 	    if (errno != EINTR)
@@ -1012,12 +588,6 @@ efile_writev(Efile_error* errInfo,   /* Where to return error codes */
 
     ASSERT(iovcnt >= 0);
     
-#ifdef VXWORKS
-    if (flags & EFILE_MODE_APPEND) {
-	lseek(fd, 0, SEEK_END);      /* Naive append emulation on VXWORKS */
-    }
-#endif
-
     while (cnt < iovcnt) {
 	if ((! iov[cnt].iov_base) || (iov[cnt].iov_len <= 0)) {
 	    /* Empty buffer - skip */
@@ -1226,118 +796,6 @@ efile_seek(Efile_error* errInfo,      /* Where to return error codes. */
 int
 efile_truncate_file(Efile_error* errInfo, int *fd, int flags)
 {
-#ifdef VXWORKS
-    off_t offset;
-    char namebuf[PATH_MAX+1];
-    char namebuf2[PATH_MAX+10];
-    int new;
-    int dummy;
-    int i;
-    int left;
-    static char buff[1024];
-    struct stat st;
-    Efile_error tmperr;
-
-    if ((offset = lseek(*fd, 0, 1)) < 0) {
-	return check_error((int) offset,errInfo);
-    }
-    if (ftruncate(*fd, offset) < 0) {
-	if (vxworks_to_posix(errno) != EINVAL) {
-	    return check_error(-1, errInfo);
-	}
-	/*
-	** Kludge
-	*/
-	if(ioctl(*fd,FIOGETNAME,(int) namebuf) < 0) {
-	    return check_error(-1, errInfo);
-	}
-	for(i=0;i<1000;++i) {
-	    sprintf(namebuf2,"%s%d",namebuf,i);
-	    CHECK_PATHLEN(namebuf2,errInfo);
-	    if (stat(namebuf2,&st) < 0) {
-		break;
-	    }
-	}
-	if (i > 1000) {
-	    errno = EINVAL;
-	    return check_error(-1, errInfo);
-	}
-	if (close(*fd) < 0) {
-	    return check_error(-1, errInfo);
-	}
-	if (efile_rename(&tmperr,namebuf,namebuf2) < 0) {
-	    i = check_error(-1,&tmperr);
-	    if (!efile_openfile(errInfo,namebuf,flags | EFILE_NO_TRUNCATE,
-				fd,&dummy)) {
-		*fd = -1;
-	    } else {
-		*errInfo = tmperr;
-	    }
-	    return i;
-	}
-	if ((*fd = open(namebuf2, O_RDONLY, 0)) < 0) {
-	    i = check_error(-1,errInfo);
-	    efile_rename(&tmperr,namebuf2,namebuf); /* at least try */
-	    if (!efile_openfile(errInfo,namebuf,flags | EFILE_NO_TRUNCATE,
-				fd,&dummy)) {
-		*fd = -1;
-	    } else {
-		lseek(*fd,offset,SEEK_SET);
-	    }
-	    return i;
-	}
-	/* Point of no return... */
-
-	if ((new = open(namebuf,O_RDWR | O_CREAT, FILE_MODE)) < 0) {
-	    close(*fd);
-	    *fd = -1;
-	    return 0;
-	}
-	left = offset;
-	
-	while (left) {
-	    if ((i = read(*fd,buff,(left > 1024) ? 1024 : left)) < 0) {
-		i = check_error(-1,errInfo);
-		close(new);
-		close(*fd);
-		unlink(namebuf);
-		efile_rename(&tmperr,namebuf2,namebuf); /* at least try */
-		if (!efile_openfile(errInfo,namebuf,flags | EFILE_NO_TRUNCATE,
-				    fd,&dummy)) {
-		    *fd = -1;
-		} else {
-		    lseek(*fd,offset,SEEK_SET);
-		}
-		return i;
-	    }
-	    left -= i;
-	    if (write(new,buff,i) < 0) {
-		i = check_error(-1,errInfo);
-		close(new);
-		close(*fd);
-		unlink(namebuf);
-		rename(namebuf2,namebuf); /* at least try */
-		if (!efile_openfile(errInfo,namebuf,flags | EFILE_NO_TRUNCATE,
-				    fd,&dummy)) {
-		    *fd = -1;
-		} else {
-		    lseek(*fd,offset,SEEK_SET);
-		}
-		return i;
-	    }
-	}
-	close(*fd);
-	unlink(namebuf2);
-	close(new);
-	i = efile_openfile(errInfo,namebuf,flags | EFILE_NO_TRUNCATE,fd,
-			   &dummy);
-	if (i) {
-	    lseek(*fd,offset,SEEK_SET);
-	}
-	return i;
-    }
-    return 1;
-#else
 #ifndef NO_FTRUNCATE
     off_t offset;
 
@@ -1347,15 +805,11 @@ efile_truncate_file(Efile_error* errInfo, int *fd, int flags)
 #else
     return 1;
 #endif
-#endif
 }
 
 int
 efile_readlink(Efile_error* errInfo, char* name, char* buffer, size_t size)
 {
-#ifdef VXWORKS
-    return vxworks_enotsup(errInfo);
-#else
     int len;
     ASSERT(size > 0);
     len = readlink(name, buffer, size-1);
@@ -1364,7 +818,6 @@ efile_readlink(Efile_error* errInfo, char* name, char* buffer, size_t size)
     }
     buffer[len] = '\0';
     return 1;
-#endif
 }
 
 int
@@ -1377,21 +830,13 @@ efile_altname(Efile_error* errInfo, char* name, char* buffer, size_t size)
 int
 efile_link(Efile_error* errInfo, char* old, char* new)
 {
-#ifdef VXWORKS
-    return vxworks_enotsup(errInfo);
-#else
     return check_error(link(old, new), errInfo);
-#endif
 }
 
 int
 efile_symlink(Efile_error* errInfo, char* old, char* new)
 {
-#ifdef VXWORKS
-    return vxworks_enotsup(errInfo);
-#else
     return check_error(symlink(old, new), errInfo);
-#endif
 }
 
 int
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 5a8588351d..b0eaf14d90 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -55,17 +55,12 @@
 #  ifdef SYS_SELECT_H
 #    include <sys/select.h>
 #  endif
-#  ifdef VXWORKS
-#    include <selectLib.h>
-#  endif
 #endif
-#ifndef VXWORKS
-#  ifdef NO_SYSCONF
-#    if ERTS_POLL_USE_SELECT
-#      include <sys/param.h>
-#    else
-#      include <limits.h>
-#    endif
+#ifdef NO_SYSCONF
+#  if ERTS_POLL_USE_SELECT
+#    include <sys/param.h>
+#  else
+#    include <limits.h>
 #  endif
 #endif
 #include "erl_thr_progress.h"
@@ -2222,10 +2217,6 @@ ERTS_POLL_EXPORT(erts_poll_max_fds)(void)
  * --- Initialization --------------------------------------------------------
  */
 
-#ifdef VXWORKS
-extern int erts_vxworks_max_files;
-#endif
-
 void
 ERTS_POLL_EXPORT(erts_poll_init)(void)
 {
@@ -2234,9 +2225,7 @@ ERTS_POLL_EXPORT(erts_poll_init)(void)
 
     errno = 0;
 
-#if defined(VXWORKS)
-    max_fds = erts_vxworks_max_files;
-#elif !defined(NO_SYSCONF)
+#if !defined(NO_SYSCONF)
     max_fds = sysconf(_SC_OPEN_MAX);
 #elif ERTS_POLL_USE_SELECT
     max_fds = NOFILE;
diff --git a/erts/emulator/sys/vxworks/driver_int.h b/erts/emulator/sys/vxworks/driver_int.h
deleted file mode 100644
index f6bc71a799..0000000000
--- a/erts/emulator/sys/vxworks/driver_int.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-/*----------------------------------------------------------------------
-** Purpose : System dependant driver declarations
-**---------------------------------------------------------------------- */
-
-#ifndef __DRIVER_INT_H__
-#define __DRIVER_INT_H__
-
-#include <ioLib.h>
-
-typedef struct iovec SysIOVec;
-
-#endif
diff --git a/erts/emulator/sys/vxworks/erl_main.c b/erts/emulator/sys/vxworks/erl_main.c
deleted file mode 100644
index c9b44a635a..0000000000
--- a/erts/emulator/sys/vxworks/erl_main.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2000-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#include "sys.h"
-#include "erl_vm.h"
-
-#if defined(__GNUC__)
-/*
- * The generated assembler does the usual trick (relative
- * branch-and-link to next instruction) to get a copy of the
- * instruction ptr. Instead of branching to an explicit zero offset,
- * it branches to the symbol `__eabi' --- which is expected to be
- * undefined and thus zero (if it is defined as non-zero, things will
- * be interesting --- as in the Chinese curse). To shut up the VxWorks
- * linker, we define `__eabi' as zero.
- *
- * This is just a work around. It's really Wind River's GCC's code
- * generator that should be fixed.
- */
-__asm__(".equ __eabi, 0");
-#endif
-
-void 
-erl_main(int argc, char **argv)
-{
-    erl_start(argc, argv);
-}
diff --git a/erts/emulator/sys/vxworks/erl_vxworks_sys.h b/erts/emulator/sys/vxworks/erl_vxworks_sys.h
deleted file mode 100644
index 3d53238ea6..0000000000
--- a/erts/emulator/sys/vxworks/erl_vxworks_sys.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2011. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-#ifndef __ERL_VXWORKS_SYS_H__
-#define __ERL_VXWORKS_SYS_H__
-
-/* stdarg.h don't work without this one... */
-#include <vxWorks.h>
-
-#include <stdio.h>
-#include <math.h>
-#include <limits.h>
-#include <stdlib.h>
-#define index StringIndexFunctionThatIDontWantDeclared
-#include <string.h>
-#undef index
-
-
-
-#include <sys/times.h>
-#include <time.h>/* xxxP */
-
-#include <dirent.h>
-#include <sys/stat.h>
-
-/* xxxP from unix_sys.h  begin */
-
-/*
- * Make sure that MAXPATHLEN is defined.
- */
-
-#ifndef MAXPATHLEN
-#   ifdef PATH_MAX
-#       define MAXPATHLEN PATH_MAX
-#   else
-#       define MAXPATHLEN 2048
-#   endif
-#endif
-
-/* xxxP end */
-
-
-/* Unimplemented math functions */
-#define NO_ASINH
-#define NO_ACOSH
-#define NO_ATANH
-#define NO_ERF
-#define NO_ERFC
-
-/* Stuff that is useful for port programs, drivers, etc */
-#ifndef VXWORKS
-#define VXWORKS
-#endif
-
-#define DONT_USE_MAIN
-#define NO_FSYNC
-#define NO_MKDIR_MODE
-#define NO_UMASK
-#define NO_SYMBOLIC_LINKS
-#define NO_DEVICE_FILES
-#define NO_UID
-#define NO_ACCESS
-#define NO_FCNTL
-#define NO_SYSLOG
-#define NO_SYSCONF
-#define NO_PWD			/* XXX Means what? */
-#define NO_DAEMON
-/* This chooses ~250 reductions instead of 500 in config.h */
-#if (CPU == CPU32)
-#define SLOW_PROCESSOR
-#endif
-
-/*
- * Even though we does not always have small memories on VxWorks
- * we certainly does not have virtual memory.
- */
-#if !defined(LARGE_MEMORY)
-#define SMALL_MEMORY
-#endif
-
-/*************** Floating point exception handling ***************/
-
-/* There are no known ways to customize the handling of invalid floating
-   point operations, such as matherr() or ieee_handler(), in VxWorks 5.1. */
-
-#if (CPU == MC68040 || CPU == CPU32 || CPU == PPC860 || CPU == PPC32 ||        \
-     CPU == PPC603 || CPU == PPC604 || CPU == SIMSPARCSOLARIS)
-
-/* VxWorks 5.1 on Motorola 68040 never generates SIGFPE, but sets the
-   result of invalid floating point ops to Inf and NaN - unfortunately
-   the way to test for those values is undocumented and hidden in a
-   "private" include file...  */
-/* Haven't found any better way, as of yet, for ppc860 xxxP*/
-
-#include <private/mathP.h>
-#define NO_FPE_SIGNALS
-#define erts_get_current_fp_exception() NULL
-#define __ERTS_FP_CHECK_INIT(fpexnp) do {} while (0)
-#define __ERTS_FP_ERROR(fpexnp, f, Action) if (isInf(f) || isNan(f)) { Action; } else {}
-#define __ERTS_FP_ERROR_THOROUGH(fpexnp, f, Action) __ERTS_FP_ERROR(fpexnp, f, Action)
-#define __ERTS_SAVE_FP_EXCEPTION(fpexnp)
-#define __ERTS_RESTORE_FP_EXCEPTION(fpexnp)
-
-#define ERTS_FP_CHECK_INIT(p)		__ERTS_FP_CHECK_INIT(&(p)->fp_exception)
-#define ERTS_FP_ERROR(p, f, A)		__ERTS_FP_ERROR(&(p)->fp_exception, f, A)
-#define ERTS_SAVE_FP_EXCEPTION(p)	__ERTS_SAVE_FP_EXCEPTION(&(p)->fp_exception)
-#define ERTS_RESTORE_FP_EXCEPTION(p)	__ERTS_RESTORE_FP_EXCEPTION(&(p)->fp_exception)
-#define ERTS_FP_ERROR_THOROUGH(p, f, A)	__ERTS_FP_ERROR_THOROUGH(&(p)->fp_exception, f, A)
-
-#define erts_sys_block_fpe() 0
-#define erts_sys_unblock_fpe(x) do{}while(0)
-
-#if (CPU == PPC603)
-/* Need fppLib to change the Floating point registers  
-   (fix_registers in sys.c)*/
-
-#include <fppLib.h>
-
-#endif /* PPC603 */
-
-#else
-
-Unsupported CPU value !
-
-#endif
-
-typedef void *GETENV_STATE;
-
-#define HAVE_GETHRTIME
-
-extern int erts_clock_rate;
-
-#define SYS_CLK_TCK (erts_clock_rate)
-
-#define SYS_CLOCK_RESOLUTION 1
-
-typedef struct _vxworks_tms {
-    clock_t tms_utime;
-    clock_t tms_stime;
-    clock_t tms_cutime;
-    clock_t tms_cstime;
-} SysTimes;
-
-typedef long long SysHrTime;
-
-typedef time_t erts_time_t;
-typedef struct timeval SysTimeval;
-
-extern int sys_init_hrtime(void);
-extern SysHrTime sys_gethrtime(void);
-extern void sys_gettimeofday(SysTimeval *tvp);
-extern clock_t sys_times(SysTimes *t);
-
-#define SIZEOF_SHORT   2
-#define SIZEOF_INT     4
-#define SIZEOF_LONG    4
-#define SIZEOF_VOID_P  4
-#define SIZEOF_SIZE_T  4
-#define SIZEOF_OFF_T   4
-
-/*
- * Temporary buffer *only* used in sys code.
- */
-#define SYS_TMP_BUF_SIZE 65536
-
-/* Need to be able to interrupt erts_poll_wait() from signal handler */
-#define ERTS_POLL_NEED_ASYNC_INTERRUPT_SUPPORT
-
-#endif /* __ERL_VXWORKS_SYS_H__ */
diff --git a/erts/emulator/sys/vxworks/erl_vxworks_sys_ddll.c b/erts/emulator/sys/vxworks/erl_vxworks_sys_ddll.c
deleted file mode 100644
index c56c633b2f..0000000000
--- a/erts/emulator/sys/vxworks/erl_vxworks_sys_ddll.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2006-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-
-/* 
- * Interface functions to the dynamic linker using dl* functions.
- * (As far as I know it works on SunOS 4, 5, Linux and FreeBSD. /Seb) 
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#include <vxWorks.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <a_out.h>
-#include <symLib.h>
-#include <loadLib.h>
-#include <unldLib.h>
-#include <moduleLib.h>
-#include <sysSymTbl.h>
-#include "sys.h"
-#include "global.h"
-#include "erl_alloc.h"
-#include "erl_driver.h"
-
-#define EXT_LEN          4
-#define FILE_EXT         ".eld"
-#define ALT_FILE_EXT     ".o"
-/* ALT_FILE_EXT must not be longer than FILE_EXT */
-#define DRIVER_INIT_SUFFIX "_init"
-
-static MODULE_ID get_mid(char *);
-static FUNCPTR lookup(char *);
-
-typedef enum {
-    NoError,
-    ModuleNotFound,
-    ModuleNotUnloadable,
-    UnknownError
-} FakeSytemError;
-
-static char *errcode_tab[] = {
-    "No error",
-    "Module/file not found",
-    "Module cannot be unloaded",
-    "Unknown error"
-};
-
-void erl_sys_ddll_init(void) {
-    return;
-}
-/* 
- * Open a shared object
- */
-int erts_sys_ddll_open2(char *full_name, void **handle, ErtsSysDdllError* err)
-{
-    int len;
-    
-    if (erts_sys_ddll_open_noext(full_name, handle, err) == ERL_DE_NO_ERROR) {
-	return ERL_DE_NO_ERROR;
-    }
-    if ((len = sys_strlen(full_name)) > PATH_MAX-EXT_LEN) {
-	return ERL_DE_LOAD_ERROR_NAME_TO_LONG;
-    } else {
-	static char dlname[PATH_MAX + 1];
-	
-	sys_strcpy(dlname, full_name);
-	sys_strcpy(dlname+len, FILE_EXT);
-	if (erts_sys_ddll_open_noext(dlname, handle, err) == ERL_DE_NO_ERROR) {
-	    return ERL_DE_NO_ERROR;
-	}
-	sys_strcpy(dlname+len, ALT_FILE_EXT);
-	return erts_sys_ddll_open_noext(dlname, handle, err);
-    }
-}
-int erts_sys_ddll_open_noext(char *dlname, void **handle, ErtsSysDdllError* err)
-{
-    MODULE_ID mid;
-    
-    if((mid = get_mid(dlname)) == NULL) {
-	return ERL_DE_DYNAMIC_ERROR_OFFSET - ((int) ModuleNotFound);
-    }
-    *handle = (void *) mid;
-    return ERL_DE_NO_ERROR;
-}
-
-/* 
- * Find a symbol in the shared object
- */
-#define PREALLOC_BUFFER_SIZE 256
-int erts_sys_ddll_sym2(void *handle, char *func_name, void **function, ErtsSysDdllError* err)
-{
-    FUNCPTR proc;
-    static char statbuf[PREALLOC_BUFFER_SIZE];
-    char *buf = statbuf;
-    int need;
-
-    if ((proc = lookup(func_name)) == NULL) {
-	if ((need = strlen(func_name)+2) > PREALLOC_BUFFER_SIZE) {
-	    buf = erts_alloc(ERTS_ALC_T_DDLL_TMP_BUF,need);
-	}
-	buf[0] = '_';
-	sys_strcpy(buf+1,func_name);
-	proc = lookup(buf);
-	if (buf != statbuf) {
-	    erts_free(ERTS_ALC_T_DDLL_TMP_BUF, buf);
-	}
-	if (proc == NULL) {
-	    return  ERL_DE_LOOKUP_ERROR_NOT_FOUND;
-	}
-    }
-    *function = (void *) proc;
-    return ERL_DE_NO_ERROR;
-}
-
-/* XXX:PaN These two will be changed with new driver interface! */
-
-/* 
- * Load the driver init function, might appear under different names depending on object arch... 
- */
-
-int erts_sys_ddll_load_driver_init(void *handle, void **function)
-{
-    MODULE_ID mid = (MODULE_ID) handle;
-    char *modname;
-    char *cp;
-    static char statbuf[PREALLOC_BUFFER_SIZE];
-    char *fname = statbuf;
-    int len;
-    int res;
-    void *func;
-    int need;
-
-    if((modname = moduleNameGet(mid)) == NULL) {
-	return ERL_DE_DYNAMIC_ERROR_OFFSET - ((int) ModuleNotFound);
-    }
-    
-    if((cp = strrchr(modname, '.')) == NULL) {
-	len = strlen(modname);
-    } else {
-	len = cp - modname;
-    }
-    
-    need =  len + strlen(DRIVER_INIT_SUFFIX) + 1;
-    if (need > PREALLOC_BUFFER_SIZE) {
-	fname = erts_alloc(ERTS_ALC_T_DDLL_TMP_BUF, need); /* erts_alloc exits on failure */
-    }
-    sys_strncpy(fname, modname, len);
-    fname[len] = '\0';
-    sys_strcat(fname, DRIVER_INIT_SUFFIX);
-    res = erts_sys_ddll_sym(handle, fname, &func);
-    if (fname != statbuf) {
-	erts_free(ERTS_ALC_T_DDLL_TMP_BUF, fname);
-    }
-    if ( res != ERL_DE_NO_ERROR) {
-	return res;
-    }
-    *function = func;
-    return ERL_DE_NO_ERROR;
-}
-
-int erts_sys_ddll_load_nif_init(void *handle, void **function, ErtsSysDdllError* err)
-{
-    /* NIFs not implemented for vxworks */
-    return ERL_DE_ERROR_NO_DDLL_FUNCTIONALITY;
-}
-
-/* 
- * Call the driver_init function, whatever it's really called, simple on unix... 
-*/
-void *erts_sys_ddll_call_init(void *function) {
-    void *(*initfn)(void) = function;
-    return (*initfn)();
-}
-void *erts_sys_ddll_call_nif_init(void *function) {
-    return erts_sys_ddll_call_init(function);
-}
-
-
-/* 
- * Close a chared object
- */
-int erts_sys_ddll_close2(void *handle, ErtsSysDdllError* err)
-{
-    MODULE_ID mid = (MODULE_ID) handle;
-    if (unld(mid, 0) < 0) {
-	return  ERL_DE_DYNAMIC_ERROR_OFFSET - ((int) ModuleNotUnloadable);
-    }
-    return  ERL_DE_NO_ERROR;
-}
-
-/*
- * Return string that describes the (current) error
- */
-char *erts_sys_ddll_error(int code)
-{
-    int actual_code;
-    if (code > ERL_DE_DYNAMIC_ERROR_OFFSET) {
-	return "Unspecified error";
-    }
-    actual_code = -1*(code - ERL_DE_DYNAMIC_ERROR_OFFSET);
-    if (actual_code > ((int) UnknownError)) {
-	actual_code = UnknownError;
-    }
-    return  errcode_tab[actual_code];
-}
-
-static FUNCPTR lookup(char *sym)
-{
-    FUNCPTR entry;
-    SYM_TYPE type;
-    
-    if (symFindByNameAndType(sysSymTbl, sym, (char **)&entry,
-			     &type, N_EXT | N_TEXT, N_EXT | N_TEXT) != OK) {
-	return NULL ;
-    }
-    return entry;
-}
-
-static MODULE_ID get_mid(char* name) 
-{ 
-    int fd;
-    MODULE_ID mid = NULL;
-    
-    if((fd = open(name, O_RDONLY, 0664)) >= 0) {
-	mid = loadModule(fd, GLOBAL_SYMBOLS);
-	close(fd);
-    }
-    return mid;
-}
-
-void erts_sys_ddll_free_error(ErtsSysDdllError* err)
-{
-    /* NYI */
-}
-
diff --git a/erts/emulator/sys/vxworks/sys.c b/erts/emulator/sys/vxworks/sys.c
deleted file mode 100644
index 739b026fb1..0000000000
--- a/erts/emulator/sys/vxworks/sys.c
+++ /dev/null
@@ -1,2610 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 1997-2011. All Rights Reserved.
- *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * %CopyrightEnd%
- */
-/*
- * system-dependent functions
- * 
- */
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#include <vxWorks.h>
-#include <version.h>
-#include <string.h>
-#include <types.h>
-#include <sigLib.h>
-#include <ioLib.h>
-#include <iosLib.h>
-#include <envLib.h>
-#include <fioLib.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <symLib.h>
-#include <sysLib.h>
-#include <sysSymTbl.h>
-#include <loadLib.h>
-#include <taskLib.h>
-#include <taskVarLib.h>
-#include <taskHookLib.h>
-#include <tickLib.h>
-#include <time.h>
-#include <rngLib.h>
-#include <semLib.h>
-#include <selectLib.h>
-#include <sockLib.h>
-#include <a_out.h>
-#include <wdLib.h>
-#include <timers.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <stdarg.h>
-
-
-#ifndef WANT_NONBLOCKING
-#define WANT_NONBLOCKING
-#endif
-
-#include "sys.h"
-#include "erl_alloc.h"
-
-/* don't need global.h, but bif_table.h (included by bif.h) won't compile otherwise */
-#include "global.h" 
-#include "bif.h"
-
-#include "erl_sys_driver.h"
-
-#include "elib_stat.h"
-
-#include "reclaim_private.h" /* Some more or less private reclaim facilities */
-
-#ifndef RETSIGTYPE
-#define RETSIGTYPE void
-#endif
-
-EXTERN_FUNCTION(void, erl_start, (int, char**));
-EXTERN_FUNCTION(void, erl_exit, (int n, char*, _DOTS_));
-EXTERN_FUNCTION(void, erl_error, (char*, va_list));
-EXTERN_FUNCTION(int, driver_interrupt, (int, int));
-EXTERN_FUNCTION(void, increment_time, (int));
-EXTERN_FUNCTION(int, erts_next_time, (_VOID_));
-EXTERN_FUNCTION(void, set_reclaim_free_function, (FreeFunction));
-EXTERN_FUNCTION(int, erl_mem_info_get, (MEM_PART_STATS *));
-EXTERN_FUNCTION(void, erl_crash_dump, (char* file, int line, char* fmt, ...));
-
-#define ISREG(st) (((st).st_mode&S_IFMT) == S_IFREG)
-
-/* these are defined in usrLib.c */
-extern int spTaskPriority, spTaskOptions;
-
-/* forward declarations */
-static FUNCTION(FUNCPTR, lookup, (char*));
-static FUNCTION(int, read_fill, (int, char*, int));
-#if (CPU == SPARC)
-static FUNCTION(RETSIGTYPE, fpe_sig_handler, (int)); /*where is this fun? */
-#elif (CPU == PPC603)
-static FUNCTION(void, fix_registers, (void));
-#endif
-static FUNCTION(void, close_pipes, (int*, int*, int));
-static FUNCTION(void, delete_hook, (void));
-static FUNCTION(void, initialize_allocation, (void));
-
-FUNCTION(STATUS, uxPipeDrv, (void));
-FUNCTION(STATUS, pipe, (int*));
-FUNCTION(void, uxPipeShow, (int));
-
-void erl_main(int argc, char **argv);
-void argcall(char *args);
-
-/* Malloc-realted functions called from the VxWorks shell */
-EXTERN_FUNCTION(int, erl_set_memory_block, 
-		(int, int, int, int, int, int, int, int, int, int));
-EXTERN_FUNCTION(int, erl_memory_show, 
-		(int, int, int, int, int, int, int, int, int, int));
-
-#define DEFAULT_PORT_STACK_SIZE  100000 
-static int port_stack_size;
-
-static int erlang_id = 0;	/* Inited at loading, set/reset at each run */
-
-/* interval time reported to emulator */
-static int sys_itime;
-
-/* XXX - This is defined in .../config/all/configAll.h (NUM_FILES),
-   and not easily accessible at compile or run time - however,
-   in VxWorks 5.1 it is stored in the (undocumented?) maxFiles variable;
-   probably shouldn't depend on it, but we try to pick it up... */
-static int max_files = 50;	/* default configAll.h */
-
-int erts_vxworks_max_files;
-
-/* 
- * used by the break handler (set by signal handler on ctl-c)
- */
-volatile int erts_break_requested;
-
-/********************* General functions ****************************/
-
-/*
- * Reset the terminal to the original settings on exit
- * (nothing to do for WxWorks).
- */
-void sys_tty_reset(int exit_code)
-{
-}
-
-Uint
-erts_sys_misc_mem_sz(void)
-{
-    Uint res = erts_check_io_size();
-    /* res += FIXME */
-    return res;
-}
-
-/*
- * XXX This declaration should not be here.
- */
-void erl_sys_schedule_loop(void);
-
-#ifdef SOFTDEBUG
-static void do_trace(int line, char *file, char *format, ...)
-{
-    va_list va;
-    int tid = taskIdSelf();
-    char buff[512];
-
-    va_start(va, format);
-    sprintf(buff,"Trace: Task: 0x%08x, %s:%d - ",
-	    tid, file, line);
-    vsprintf(buff + strlen(buff), format, va);
-    va_end(va);
-    strcat(buff,"\r\n");
-    write(2,buff,strlen(buff));
-}
-
-#define TRACE() do_trace(__LINE__, __FILE__,"")
-#define TRACEF(Args...) do_trace(__LINE__,__FILE__, ## Args)
-#endif
-
-void
-erts_sys_pre_init(void)
-{
-    if (erlang_id != 0) {
-	/* NOTE: This particular case must *not* call erl_exit() */
-	erts_fprintf(stderr, "Sorry, erlang is already running (as task %d)\n",
-		     erlang_id);
-	exit(1);
-    }
-
-    /* This must be done as early as possible... */
-    if(!reclaim_init()) 
-	fprintf(stderr, "Warning : reclaim facility should be initiated before "
-		"erlang is started!\n");
-    erts_vxworks_max_files = max_files = reclaim_max_files();
-
-    /* Floating point exceptions */
-#if (CPU == SPARC)
-    sys_sigset(SIGFPE, fpe_sig_handler);
-#elif (CPU == PPC603)
-    fix_registers();
-#endif
-
-    /* register the private delete hook in reclaim */
-    save_delete_hook((FUNCPTR)delete_hook, (caddr_t)0);
-    erlang_id = taskIdSelf();
-#ifdef DEBUG
-    printf("emulator task id = 0x%x\n", erlang_id);
-#endif
-}
-
-void erts_sys_alloc_init(void)
-{
-    initialize_allocation();
-}
-
-void
-erl_sys_init(void)
-{
-    setvbuf(stdout, (char *)NULL, _IOLBF, BUFSIZ);
-    /* XXX Bug in VxWorks stdio loses fputch()'ed output after the
-       setvbuf() but before a *printf(), and possibly worse (malloc
-       errors, crash?) - so let's give it a *printf().... */
-    fprintf(stdout, "%s","");
-}
-
-void
-erl_sys_args(int* argc, char** argv)
-{
-    erts_init_check_io();
-    max_files = erts_check_io_max_files();
-    ASSERT(max_files <= erts_vxworks_max_files);
-}
-
-void
-erts_sys_schedule_interrupt(int set)
-{
-    erts_check_io_interrupt(set);
-}
-
-/*
- * Called from schedule() when it runs out of runnable processes,
- * or when Erlang code has performed INPUT_REDUCTIONS reduction
- * steps. runnable == 0 iff there are no runnable Erlang processes.
- */
-void
-erl_sys_schedule(int runnable)
-{	
-    erts_check_io(!runnable);
-}
-
-void erts_do_break_handling(void)
-{
-    SET_BLOCKING(0);
-    /* call the break handling function, reset the flag */
-    do_break();
-    erts_break_requested = 0;
-    SET_NONBLOCKING(0);
-}
-
-/* signal handling */
-RETSIGTYPE (*sys_sigset(sig, func))()
-     int sig;
-     RETSIGTYPE (*func)();
-{
-  struct sigaction act, oact;
-
-  sigemptyset(&act.sa_mask);
-  act.sa_flags = 0;
-  act.sa_handler = func;
-  sigaction(sig, &act, &oact);
-  return(oact.sa_handler);
-}
-
-void sys_sigblock(int sig)
-{
-  sigset_t mask;
-
-  sigemptyset(&mask);
-  sigaddset(&mask, sig);
-  sigprocmask(SIG_BLOCK, &mask, (sigset_t *)NULL);
-}
-
-void sys_sigrelease(int sig)
-{
-  sigset_t mask;
-
-  sigemptyset(&mask);
-  sigaddset(&mask, sig);
-  sigprocmask(SIG_UNBLOCK, &mask, (sigset_t *)NULL);
-}
-
-void
-erts_sys_prepare_crash_dump(void)
-{
-    
-}
-
-/* register signal handlers XXX - they don't work, need to find out why... */
-/* set up signal handlers for break and quit */
-static void request_break(void)
-{
-  /* just set a flag - checked for and handled 
-   * in main thread (not signal handler).
-   * see check_io() 
-   */
-#ifdef DEBUG
-  fprintf(stderr,"break!\n");
-#endif
-  erts_break_requested = 1;
-  erts_check_io_async_sig_interrupt(1); /* Make sure we don't sleep in erts_poll_wait */
-}
-
-static void do_quit(void)
-{
-    halt_0(0);
-}
-
-void erts_set_ignore_break(void) {
-}
-
-void init_break_handler(void)
-{
-  sys_sigset(SIGINT, request_break);
-  sys_sigset(SIGQUIT, do_quit);
-}
-
-void erts_replace_intr(void) {
-}
-
-int sys_max_files(void) 
-{
-  return(max_files);
-}
-
-/******************* Routines for time measurement *********************/
-
-int sys_init_time(void) 
-{
-    erts_clock_rate =  sysClkRateGet();
-    /*
-    ** One could imagine that it would be better returning 
-    ** a resolution more near the clock rate, like in:
-    ** return 1000 / erts_clock_rate; 
-    ** but tests show that such isn't the case (rounding errors?)
-    ** Well, we go for the Unix variant of returning 1 
-    ** as a constant virtual clock rate.
-    */
-    return SYS_CLOCK_RESOLUTION;
-}
-
-int erts_clock_rate;
-static volatile int ticks_inuse;
-static volatile unsigned long ticks_collected; /* will wrap */
-static WDOG_ID watchdog_id;
-static ULONG user_time;
-static int this_task_id, sys_itime;
-static SysHrTime hrtime_wrap;
-static unsigned long last_tick_count;
-
-static void tolerant_time_clockint(int count)
-{
-  if (watchdog_id != NULL) {
-    if (taskIsReady(this_task_id))
-      user_time += 1;
-    ++count;
-    if (!ticks_inuse) {
-      ticks_collected += count;
-      count = 0;
-    }
-    wdStart(watchdog_id, 1, (FUNCPTR)tolerant_time_clockint, count);
-  }
-}
-
-int sys_init_hrtime(void)
-{
-    this_task_id = taskIdSelf(); /* OK, this only works for one single task
-				    in the system... */
-    user_time = 0;
-
-    ticks_inuse = 0;
-    ticks_collected = 0;
-    hrtime_wrap = 0;
-    last_tick_count = 0;
-
-    sys_itime = 1000 / erts_clock_rate;
-    watchdog_id = wdCreate();
-    wdStart(watchdog_id, 1, (FUNCPTR) tolerant_time_clockint, 0);
-    return 0;
-}
-
-SysHrTime sys_gethrtime(void) 
-{
-    SysHrTime ticks;
-
-    ++ticks_inuse;
-    ticks = (SysHrTime) (ticks_collected & 0x7FFFFFFF);
-    ticks_inuse = 0;
-    if (ticks < (SysHrTime) last_tick_count) {
-	hrtime_wrap += 1UL << 31;
-    }
-    last_tick_count = ticks;
-    return (ticks + hrtime_wrap) * ((SysHrTime) (1000000000UL / 
-						 erts_clock_rate));
-}
-    
-void sys_gettimeofday(SysTimeval *tvp)
-{
-    struct timespec now;
-    
-    clock_gettime(CLOCK_REALTIME, &now);
-    tvp->tv_sec = now.tv_sec;
-    tvp->tv_usec = now.tv_nsec / 1000;
-}
-
-clock_t sys_times(SysTimes *t)
-{
-    t->tms_stime = t->tms_cutime = t->tms_cstime = 0;
-    ++ticks_inuse;
-    t->tms_utime = user_time;
-    ticks_inuse = 0;
-    return tickGet(); /* The best we can do... */
-}
-
-/* This is called when *this task* is deleted */
-static void delete_hook(void)
-{
-  if (watchdog_id != NULL) {
-    wdDelete(watchdog_id);
-    watchdog_id = NULL;
-  }
-  erlang_id = 0;
-  this_task_id = 0;
-}
-
-/************************** OS info *******************************/
-
-/* Used by erlang:info/1. */
-/* (This code was formerly in drv.XXX/XXX_os_drv.c) */
-
-#define MAX_VER_STR 9           /* Number of characters to
-                                   consider in version string */                              
-
-static FUNCTION(int, get_number, (char** str_ptr));
-
-char os_type[] = "vxworks";
-
-static int
-get_number(char **str_ptr)
-{
-    char* s = *str_ptr;		/* Pointer to beginning of string. */
-    char* dot;			/* Pointer to dot in string or NULL. */
-
-    if (!isdigit(*s))
-	return 0;
-    if ((dot = strchr(s, '.')) == NULL) {
-	*str_ptr = s+strlen(s);
-	return atoi(s);
-    } else {
-	*dot = '\0';
-	*str_ptr = dot+1;
-	return atoi(s);
-    }
-}
-
-/* namebuf;     Where to return the name. */
-/* size;	Size of name buffer. */
-void
-os_flavor(char *namebuf, unsigned size)
-{
-    strcpy(namebuf, "-");
-}
-
-/* int* pMajor;			Pointer to major version. */
-/* int* pMinor;			Pointer to minor version. */
-/* int* pBuild;			Pointer to build number. */
-void
-os_version(int *pMajor, int *pMinor, int *pBuild)
-{
-    char os_ver[MAX_VER_STR+2];
-    char* release;		/* Pointer to the release string:
-				 * X.Y or X.Y.Z.
-				 */
-    strncpy(os_ver, vxWorksVersion, MAX_VER_STR);
-    release = os_ver;
-    *pMajor = get_number(&release);
-    *pMinor = get_number(&release);
-    *pBuild = get_number(&release);
-}
-
-void init_getenv_state(GETENV_STATE *state)
-{
-   *state = NULL;
-}
-
-char *getenv_string(GETENV_STATE *state0)
-{
-   return NULL;
-}
-
-void fini_getenv_state(GETENV_STATE *state)
-{
-   *state = NULL;
-}
-
-/************************** Port I/O *******************************/
-
-
-/* I. Common stuff */
-
-#define TMP_BUF_MAX (tmp_buf_size - 1024)
-static byte *tmp_buf;
-static Uint tmp_buf_size;
-
-/* II. The spawn/fd/vanilla drivers */
-
-/* This data is shared by these drivers - initialized by spawn_init() */
-static struct driver_data {
-    int port_num, ofd, packet_bytes, report_exit;
-    int exitcode, exit_reported; /* For returning of exit codes. */
-} *driver_data;			/* indexed by fd */
-
-/* 
- * Locking only for exitcodes and exit_reported, one global sem for all
- * spawn ports as this is rare.
- */
-static SEM_ID driver_data_sem = NULL;
-/*
- * Also locking when looking up entries in the load table
- */
-static SEM_ID entry_data_sem = NULL;
-
-/* We maintain a linked fifo queue of these structs in order */
-/* to manage unfinnished reads/and writes on differenet fd's */
-
-typedef struct pend {
-    char *cpos;
-    int fd;
-    int remain;
-    struct pend *next;
-    char buf[1];   /* this is a trick to be able to malloc one chunk */
-} Pend;
-
-static struct fd_data {
-    int inport, outport;
-    char *buf, *cpos;
-    int sz, remain;  /* for input on fd */
-    Pend* pending;   /* pending outputs */
-
-} *fd_data;			/* indexed by fd */
-    
-
-/* Driver interfaces */
-static ErlDrvData spawn_start(ErlDrvPort port_num, char *name, SysDriverOpts* opts);
-static ErlDrvData fd_start(ErlDrvPort port_num, char *name, SysDriverOpts* opts);
-static ErlDrvData vanilla_start(ErlDrvPort port_num, char *name, SysDriverOpts* opts);
-static int spawn_init(void);
-static void fd_stop(ErlDrvData);
-static void stop(ErlDrvData);
-static void ready_input(ErlDrvData fd, ErlDrvEvent ready_fd);
-static void ready_output(ErlDrvData fd, ErlDrvEvent ready_fd);
-static void output(ErlDrvData fd, char *buf, ErlDrvSizeT len);
-static void stop_select(ErlDrvEvent, void*);
-
-struct erl_drv_entry spawn_driver_entry = {
-    spawn_init,
-    spawn_start,
-    stop,
-    output,
-    ready_input,
-    ready_output,
-    "spawn",
-    NULL, /* finish */
-    NULL, /* handle */
-    NULL, /* control */
-    NULL, /* timeout */
-    NULL, /* outputv */
-    NULL, /* ready_async */
-    NULL, /* flush */
-    NULL, /* call */
-    NULL, /* event */
-    ERL_DRV_EXTENDED_MARKER,
-    ERL_DRV_EXTENDED_MAJOR_VERSION,
-    ERL_DRV_EXTENDED_MINOR_VERSION,
-    0, /* ERL_DRV_FLAGs */
-    NULL, /* handle2 */
-    NULL, /* process_exit */
-    stop_select
-
-};
-struct erl_drv_entry fd_driver_entry = {
-    NULL,
-    fd_start,
-    fd_stop,
-    output,
-    ready_input,
-    ready_output,
-    "fd",
-    NULL, /* finish */
-    NULL, /* handle */
-    NULL, /* control */
-    NULL, /* timeout */
-    NULL, /* outputv */
-    NULL, /* ready_async */
-    NULL, /* flush */
-    NULL, /* call */
-    NULL, /* event */
-    ERL_DRV_EXTENDED_MARKER,
-    ERL_DRV_EXTENDED_MAJOR_VERSION,
-    ERL_DRV_EXTENDED_MINOR_VERSION,
-    0, /* ERL_DRV_FLAGs */
-    NULL, /* handle2 */
-    NULL, /* process_exit */
-    stop_select
-};
-struct erl_drv_entry vanilla_driver_entry = {
-    NULL,
-    vanilla_start,
-    stop,
-    output,
-    ready_input,
-    ready_output,
-    "vanilla",
-    NULL, /* finish */
-    NULL, /* handle */
-    NULL, /* control */
-    NULL, /* timeout */
-    NULL, /* outputv */
-    NULL, /* ready_async */
-    NULL, /* flush */
-    NULL, /* call */
-    NULL, /* event */
-    ERL_DRV_EXTENDED_MARKER,
-    ERL_DRV_EXTENDED_MAJOR_VERSION,
-    ERL_DRV_EXTENDED_MINOR_VERSION,
-    0, /* ERL_DRV_FLAGs */
-    NULL, /* handle2 */
-    NULL, /* process_exit */
-    stop_select
-};
-
-/*
-** Set up enough of the driver_data structure to be able to report exit status.
-** Some things may be initiated again, but that is no real problem.
-*/
-static int pre_set_driver_data(int ifd, int ofd, 
-			       int read_write, int report_exit) {
-  if (read_write & DO_READ) {
-    driver_data[ifd].report_exit = report_exit;
-    driver_data[ifd].exitcode = 0;
-    driver_data[ifd].exit_reported = 0;
-    if (read_write & DO_WRITE) {
-      driver_data[ifd].ofd = ofd;
-      if (ifd != ofd) {
-	driver_data[ofd] = driver_data[ifd];
-	driver_data[ofd].report_exit = 0;
-      }
-    } else {			/* DO_READ only */
-      driver_data[ifd].ofd = -1;
-    }
-    return(ifd);
-  } else {			/* DO_WRITE only */
-    driver_data[ofd].report_exit = 0;
-    driver_data[ofd].exitcode = 0;
-    driver_data[ofd].exit_reported = 0;
-    driver_data[ofd].ofd = ofd;
-    return(ofd);
-  }
-}
-    
-/*
-** Set up the driver_data structure, it may have been initiated
-** partly by the function above, but we dont care. 
-*/
-static int set_driver_data(int port_num, int ifd, int ofd, 
-			   int packet_bytes, int read_write,
-			   int report_exit)
-{
-  if (read_write & DO_READ) {
-    driver_data[ifd].packet_bytes = packet_bytes;
-    driver_data[ifd].port_num = port_num;
-    driver_data[ifd].report_exit = report_exit;
-    if (read_write & DO_WRITE) {
-      driver_data[ifd].ofd = ofd;
-      if (ifd != ofd) {
-	driver_data[ofd] = driver_data[ifd];
-	driver_data[ofd].report_exit = 0;
-      }
-    } else {			/* DO_READ only */
-      driver_data[ifd].ofd = -1;
-    }
-    (void) driver_select(port_num, ifd, ERL_DRV_READ|ERL_DRV_USE, 1);
-    return(ifd);
-  } else {			/* DO_WRITE only */
-    driver_data[ofd].packet_bytes = packet_bytes;
-    driver_data[ofd].port_num = port_num;
-    driver_data[ofd].report_exit = 0;
-    driver_data[ofd].ofd = ofd;
-    return(ofd);
-  }
-}
-
-static int need_new_sems = 1;
-
-static int spawn_init(void)
-{
-  char *stackenv;
-  int size;
-  driver_data = (struct driver_data *)
-      erts_alloc(ERTS_ALC_T_DRV_TAB, max_files * sizeof(struct driver_data));
-  if (need_new_sems) {
-      driver_data_sem = semMCreate
-	  (SEM_Q_PRIORITY | SEM_DELETE_SAFE | SEM_INVERSION_SAFE);
-      entry_data_sem = semMCreate
-	  (SEM_Q_PRIORITY | SEM_DELETE_SAFE | SEM_INVERSION_SAFE);
-  }
-  if (driver_data_sem == NULL || entry_data_sem == NULL) {
-      erl_exit(1,"Could not allocate driver locking semaphore.");
-  }
-  need_new_sems = 0;
-
-  (void)uxPipeDrv();		/* Install pipe driver */
-
-  if ((stackenv = getenv("ERLPORTSTACKSIZE")) != NULL &&
-      (size = atoi(stackenv)) > 0)
-    port_stack_size = size;
-  else
-    port_stack_size = DEFAULT_PORT_STACK_SIZE;
-  return 0;
-}
-
-/* Argv has to be built vith the save_xxx routines, not with whathever 
-   sys_xxx2 has in mind... */
-#define argv_alloc save_malloc
-#define argv_realloc save_realloc
-#define argv_free save_free
-/* Build argv, return argc or -1 on failure */
-static int build_argv(char *name, char ***argvp)
-{
-  int argvsize = 10, argc = 0;
-  char *args, *arglast = NULL, *argp;
-  char **argv;
-
-#ifdef DEBUG
-  fdprintf(2, "Building argv, %s =>\n", name);
-#endif
-  if ((argv = (char **)argv_alloc(argvsize * sizeof(char *))) == NULL)
-    return(-1);
-  if ((args = argv_alloc(strlen(name) + 1)) == NULL)
-    return(-1);
-  strcpy(args, name);
-  argp = strtok_r(args, " \t", &arglast);
-  while (argp != NULL) {
-    if (argc + 1 >= argvsize) {
-      argvsize += 10;
-      argv = (char **)argv_realloc((char *)argv, argvsize*sizeof(char *));
-      if (argv == NULL) {
-	argv_free(args);
-	return(-1);
-      }
-    }
-#ifdef DEBUG
-  fdprintf(2, "%s\n", argp);
-#endif
-    argv[argc++] = argp;
-    argp = strtok_r((char *)NULL, " \t", &arglast);
-  }
-  argv[argc] = NULL;
-  *argvp = argv;
-  return(argc);
-}
-#undef argv_alloc
-#undef argv_realloc
-#undef argv_free
-
-
-/* Lookup and return global text symbol or NULL on failure
-   Symbol name is null-terminated and without the leading '_' */
-static FUNCPTR
-lookup(char *sym)
-{
-  char buf[256];
-  char *symname = buf;
-  int len;
-  FUNCPTR entry;
-  SYM_TYPE type;
-
-  len = strlen(sym);
-  if (len > 254 && (symname = malloc(len+2)) == NULL)
-    return(NULL);
-#if defined _ARCH_PPC || defined SIMSPARCSOLARIS
-  /* GCC for PPC and SIMSPARC doesn't add a leading _ to symbols */
-  strcpy(symname, sym);
-#else
-  sprintf(symname, "_%s", sym);
-#endif
-  if (symFindByNameAndType(sysSymTbl, symname, (char **)&entry,
-			   &type, N_EXT | N_TEXT, N_EXT | N_TEXT) != OK)
-    entry = NULL;
-  if (symname != buf)
-    free(symname);
-  return(entry);
-}
-
-/* This function is spawned to build argc, argv, lookup the symbol to call,
-   connect and set up file descriptors, and make the actual call.
-   N.B. 'name' was allocated by the Erlang task (through plain_malloc) and
-   is freed by this port program task.
-   Note: 'name' may be a path containing '/'. */
-
-static void call_proc(char *name, int ifd, int ofd, int read_write, 
-		      int redir_stderr, int driver_index, 
-		      int p6, int p7, int p8, int p9)
-{
-  int argc;
-  char **argv, *bname;
-  FUNCPTR entry;
-  int ret = -1;
-
-  /* Must consume 'name' */
-  argc = build_argv(name, &argv);
-  plain_free(name);
-  /* Find basename of path */
-  if ((bname = strrchr(argv[0], '/')) != NULL) {
-    bname++;
-  } else {
-    bname = argv[0];
-  }
-#ifdef DEBUG
-  fdprintf(2, "Port program name: %s\n", bname);
-#endif
-  semTake(entry_data_sem, WAIT_FOREVER);
-
-  if (argc > 0) {
-    if ((entry = lookup(bname)) == NULL) {
-      int fd;
-      char *fn;
-      /* NOTE: We don't check the return value of loadModule,
-	 since that was incompatibly changed from 5.0.2b to 5.1,
-	 but rather do a repeated lookup().   */
-      if ((fd = open(argv[0], O_RDONLY)) > 0) {
-	(void) loadModule(fd, GLOBAL_SYMBOLS);
-	close(fd);
-	entry = lookup(bname);
-      }
-      if (entry == NULL) {
-	/* filename == func failed, try func.o */
-	if ((fn = malloc(strlen(argv[0]) + 3)) != NULL) { /* ".o\0" */
-	  strcpy(fn, argv[0]);
-	  strcat(fn, ".o");
-	  if ((fd = open(fn, O_RDONLY)) > 0) {
-	    (void) loadModule(fd, GLOBAL_SYMBOLS);
-	    close(fd);
-	    entry = lookup(bname);
-	  }
-	  free(fn);
-	}
-      }
-    }
-  } else {
-    entry = NULL;
-  }
-  semGive(entry_data_sem);
-    
-  if (read_write & DO_READ) {	/* emulator read */
-    save_fd(ofd);
-    ioTaskStdSet(0, 1, ofd);	/* stdout for process */
-    if(redir_stderr)
-	ioTaskStdSet(0, 2, ofd);/* stderr for process */
-  }
-  if (read_write & DO_WRITE) { /* emulator write */
-    save_fd(ifd);
-    ioTaskStdSet(0, 0, ifd);	/* stdin for process */
-  }
-  if (entry != NULL) {
-    ret = (*entry)(argc, argv, (char **)NULL); /* NULL for envp */
-  } else {
-    fdprintf(2, "Could not exec \"%s\"\n", argv[0]);
-    ret = -1;
-  }
-  if (driver_data[driver_index].report_exit) {
-      semTake(driver_data_sem, WAIT_FOREVER);
-      driver_data[driver_index].exitcode = ret;
-      driver_data[driver_index].exit_reported = 1;
-      semGive(driver_data_sem);
-  }
-  /* We *don't* want to close the pipes here, but let the delete
-     hook take care of it - it might want to flush stdout and there'd
-     better be an open descriptor to flush to...   */
-  exit(ret);
-}
-
-static void close_pipes(int ifd[2], int ofd[2], int read_write)
-{
-  if (read_write & DO_READ) {
-    (void) close(ifd[0]);
-    (void) close(ifd[1]);
-  }
-  if (read_write & DO_WRITE) {
-    (void) close(ofd[0]);
-    (void) close(ofd[1]);
-  }
-}
-
-static void init_fd_data(int fd, int port_unused_argument)
-{
-  SET_NONBLOCKING(fd);
-  fd_data[fd].pending = NULL;
-  fd_data[fd].buf = fd_data[fd].cpos = NULL;
-  fd_data[fd].remain = fd_data[fd].sz = 0;
-}
-
-static ErlDrvData spawn_start(ErlDrvPort port_num, char *name,SysDriverOpts* opts)
-{
-    int ifd[2], ofd[2], len, nl, id;
-    char taskname[11], *progname, *bname;
-    char *space_in_command;
-    int packet_bytes = opts->packet_bytes;
-    int read_write = opts->read_write;
-    int use_stdio = opts->use_stdio;
-    int redir_stderr = opts->redir_stderr;
-    int driver_index;
-
-    if (!use_stdio){
-	return (ErlDrvData) -3;
-  }
-
-    /* Create pipes and set the Erlang task as owner of its 
-     * read and write ends (through save_fd()).
-     */
-    switch (read_write) {
-    case DO_READ:
-	if (pipe(ifd) < 0){
-	    return (ErlDrvData) -2;
-	}
-	if (ifd[0] >= max_files) {
-	    close_pipes(ifd, ofd, read_write);
-	    errno = ENFILE;
-	    return (ErlDrvData) -2;
-	}
-	save_fd(ifd[0]);
-	break;
-    case DO_WRITE:
-	if (pipe(ofd) < 0) {
-	    return (ErlDrvData) -2;
-	}
-	if (ofd[1] >= max_files) {
-	    close_pipes(ifd, ofd, read_write);
-	    errno = ENFILE;
-	    return (ErlDrvData) -2;
-	}
-	save_fd(ofd[1]);
-	break;
-    case DO_READ|DO_WRITE:
-	if (pipe(ifd) < 0){
-	    return (ErlDrvData) -2;
-	}
-	if (ifd[0] >= max_files || pipe(ofd) < 0) {
-	    close_pipes(ifd, ofd, DO_READ);
-	    errno = ENFILE;
-	    return (ErlDrvData) -2;
-	}
-	if (ofd[1] >= max_files) {
-	    close_pipes(ifd, ofd, read_write);
-	    errno = ENFILE;
-	    return (ErlDrvData) -2;
-	}
-	save_fd(ifd[0]);
-	save_fd(ofd[1]);
-	break;
-    default:
-	return (ErlDrvData) -1;
-    }
-
-    /* Allocate space for program name to be freed by the
-     * spawned task. We use plain_malloc so that the allocated
-     * space is not owned by the Erlang task.
-     */
-
-    if ((progname = plain_malloc(strlen(name) + 1)) == NULL) {
-	close_pipes(ifd, ofd, read_write);
-	errno = ENOMEM;
-	return (ErlDrvData) -2;
-    }
-    strcpy(progname, name);
-
-    /* Check if name contains a space 
-     *  (e.g "port_test -o/home/gandalf/tornado/wind/target/erlang")
-     */
-    if ((space_in_command = strrchr(progname, ' ')) != NULL) {
-	*space_in_command = '\0';
-    }
-
-    /* resulting in "port_test" */
-    if ((bname = strrchr(progname, '/')) != NULL)
-	bname++;
-    else
-	bname = progname;
-
-    /* resulting in "port_test" */
-    len = strlen(bname);
-    nl = len > 10 ? 10 : len;
-    strncpy(taskname, bname, nl);
-    taskname[nl] = '\0';
-    if (space_in_command != NULL) 
-	*space_in_command = ' ';
-    driver_index = pre_set_driver_data(ifd[0], ofd[1], 
-				       read_write, opts->exit_status);
-
-  /* resetting to "port_test -o/home/gandalf/tornado/wind/target/erlang" */
-    if ((id = taskSpawn(taskname, spTaskPriority, spTaskOptions,
-			port_stack_size, (FUNCPTR)call_proc, (int)progname,
-			ofd[0], ifd[1], read_write, redir_stderr, driver_index,
-			0,0,0,0))
-	== ERROR) {
-	close_pipes(ifd, ofd, read_write);
-	plain_free(progname);	/* only when spawn fails */
-	errno = ENOMEM;
-	return (ErlDrvData) -2;
-    }    
-#ifdef DEBUG
-    fdprintf(2, "Spawned %s as %s[0x%x]\n", name, taskname, id);
-#endif
-    if (read_write & DO_READ) 
-	init_fd_data(ifd[0], port_num);
-    if (read_write & DO_WRITE) 
-	init_fd_data(ofd[1], port_num);
-    return (ErlDrvData) (set_driver_data(port_num, ifd[0], ofd[1],
-					 packet_bytes,read_write,
-					 opts->exit_status));
-}
-
-static ErlDrvData fd_start(ErlDrvPort port_num, char *name, SysDriverOpts* opts)
-{
-    if (((opts->read_write & DO_READ) && opts->ifd >= max_files) ||
-	((opts->read_write & DO_WRITE) && opts->ofd >= max_files)) {
-	return (ErlDrvData) -1;
-    }
-
-    if (opts->read_write & DO_READ) 
-	init_fd_data(opts->ifd, port_num);
-    if (opts->read_write & DO_WRITE) 
-	init_fd_data(opts->ofd, port_num);
-    return (ErlDrvData) (set_driver_data(port_num, opts->ifd, opts->ofd,
-					 opts->packet_bytes, opts->read_write, 0));
-}
-
-static void clear_fd_data(int fd) 
-{
-    
-  if (fd_data[fd].sz > 0) 
-    erts_free(ERTS_ALC_T_FD_ENTRY_BUF, (void *) fd_data[fd].buf);
-  fd_data[fd].buf = NULL;
-  fd_data[fd].sz = 0;
-  fd_data[fd].remain = 0;
-  fd_data[fd].cpos = NULL;
-}
-
-static void nbio_stop_fd(int port_num, int fd)
-{
-  Pend *p, *p1;
-    
-  driver_select(port_num, fd, ERL_DRV_READ|ERL_DRV_WRITE, 0);
-  clear_fd_data(fd);
-  p = fd_data[fd].pending;
-  SET_BLOCKING(fd);
-  while (p) {
-    p1 = p->next;
-    free(p);
-    p = p1;
-  }
-  fd_data[fd].pending = NULL;
-}
-
-static void fd_stop(ErlDrvData drv_data)
-{
-    int ofd;
-    int fd = (int) drv_data;
-
-    nbio_stop_fd(driver_data[fd].port_num, (int)fd);
-    ofd = driver_data[fd].ofd;
-    if (ofd != fd && ofd != -1) 
-	nbio_stop_fd(driver_data[fd].port_num, (int)ofd); /* XXX fd = ofd? */
-}
-
-static ErlDrvData
-vanilla_start(ErlDrvPort port_num, char *name, SysDriverOpts* opts)
-{
-    int flags, fd;
-    struct stat statbuf;
-
-    DEBUGF(("vanilla_start, name: %s [r=%1i w=%1i]\n", name, 
-	    opts->read_write & DO_READ, 
-	    opts->read_write & DO_WRITE));
-  
-    flags = (opts->read_write == DO_READ ? O_RDONLY :
-	     opts->read_write == DO_WRITE ? O_WRONLY|O_CREAT|O_TRUNC :
-	     O_RDWR|O_CREAT);
-    if ((fd = open(name, flags, 0666)) < 0){
-	errno = ENFILE;
-	return (ErlDrvData) -2;
-    }
-    if (fd >= max_files) {
-	close(fd);
-	errno = ENFILE;
-	return (ErlDrvData) -2;
-    }
-    if (fstat(fd, &statbuf) < 0) {
-	close(fd);
-	errno = ENFILE;
-	return (ErlDrvData) -2;
-    }
-
-    /* Return error for reading regular files (doesn't work) */
-    if (ISREG(statbuf) && ((opts->read_write) & DO_READ)) {
-	close(fd);
-	return (ErlDrvData) -3;
-    }
-    init_fd_data(fd, port_num);
-    return (ErlDrvData) (set_driver_data(port_num, fd, fd,
-					 opts->packet_bytes, opts->read_write, 0));
-}
-
-/* Note that driver_data[fd].ifd == fd if the port was opened for reading, */
-/* otherwise (i.e. write only) driver_data[fd].ofd = fd.  */
-
-static void stop(ErlDrvData drv_data)
-{
-    int port_num, ofd;
-    int fd = (int) drv_data;
-
-    port_num = driver_data[fd].port_num;
-    nbio_stop_fd(port_num, fd);
-    driver_select(port_num, fd, ERL_DRV_USE, 0); /* close(fd) */
-
-    ofd = driver_data[fd].ofd;
-    if (ofd != fd && ofd != -1) {
-	nbio_stop_fd(port_num, ofd);
-	driver_select(port_num, ofd, ERL_DRV_USE, 0); /* close(fd) */
-    }
-}
-
-static int sched_write(int port_num,int fd, char *buf, int len, int pb)
-{
-  Pend *p, *p2, *p3;
-  int p_bytes = len;
-
-  p = (Pend*) erts_alloc_fnf(ERTS_ALC_T_PEND_DATA, pb + len + sizeof(Pend));
-  if (!p) {
-    driver_failure(port_num, -1);
-    return(-1);
-  }
-
-  switch(pb) {
-  case 4: put_int32(len, p->buf); break;
-  case 2: put_int16(len, p->buf); break;
-  case 1: put_int8(len, p->buf); break;
-  case 0: break;		/* Handles this case too */
-  }
-  sys_memcpy(p->buf + pb, buf, len);
-  driver_select(port_num, fd, ERL_DRV_WRITE|ERL_DRV_USE, 1);
-  p->cpos = p->buf;
-  p->fd = fd;
-  p->next = NULL;
-  p->remain = len + pb;
-  p2 = fd_data[fd].pending;
-  if (p2 == NULL) 
-    fd_data[fd].pending = p;
-  else {
-    p3 = p2->next;
-    while(p3) {
-      p_bytes += p2->remain;
-      p2 = p2->next;
-      p3 = p3->next;
-    }
-    p2->next = p;
-  }
-  if (p_bytes > (1 << 13))	/* More than 8 k pending */
-    set_busy_port(port_num, 1);
-  return(0);
-}
-
-/* Fd is the value returned as drv_data by the start func */
-static void output(ErlDrvData drv_data, char *buf, ErlDrvSizeT len)
-{
-    int buf_done, port_num, wval, pb, ofd;
-    byte lb[4];
-    struct iovec iv[2];
-    int fd = (int) drv_data;
-
-    pb = driver_data[fd].packet_bytes;
-    port_num = driver_data[fd].port_num;
-
-    if ((ofd = driver_data[fd].ofd) == -1) {
-	return;
-    }
-
-    if (fd_data[ofd].pending) {
-	sched_write(port_num, ofd, buf, len, pb);
-	return;
-    }
-    
-    if ((pb == 2 && len > 65535) || (pb == 1 && len > 255)) {
-	driver_failure_posix(port_num, EINVAL);
-	return;
-    }
-    if (pb == 0) {
-	wval = write(ofd, buf, len);
-    } else {
-	lb[0] = (len >> 24) & 255;	/* MSB */
-	lb[1] = (len >> 16) & 255;
-	lb[2] = (len >> 8) & 255;
-	lb[3] = len & 255;		/* LSB */
-	iv[0].iov_base = (char*) lb + (4 - pb);
-	iv[0].iov_len = pb;
-	iv[1].iov_base = buf;
-	iv[1].iov_len = len;
-	wval = writev(ofd, iv, 2);
-    }
-    if (wval == pb + len ) {
-	return;
-    }
-    if (wval < 0) {
-	if ((errno == EINTR) || (errno == ERRNO_BLOCK)) {
-	    if (pb) {
-		sched_write(port_num, ofd, buf ,len, pb);
-	    } else if (pb == 0) {
-		sched_write(port_num, ofd, buf ,len, 0);
-	    }
-	    return;
-	}
-	driver_failure_posix(driver_data[fd].port_num, EINVAL);
-	return;
-    }
-    if (wval < pb) {
-	sched_write(port_num, ofd, (lb +4 -pb)  + wval, pb-wval, 0);
-	sched_write(port_num, ofd, buf ,len, 0);
-	return;
-    }
-
-    /* we now know that  wval < (pb + len) */
-    buf_done = wval - pb;
-    sched_write(port_num, ofd, buf + buf_done, len - buf_done,0);
-}
-
-static void stop_select(ErlDrvEvent fd, void* _)
-{
-    close((int)fd);
-}
-
-static int ensure_header(int fd,char *buf,int packet_size, int sofar)
-{
-  int res = 0;
-  int remaining = packet_size - sofar;
-
-  SET_BLOCKING(fd);
-  if (read_fill(fd, buf+sofar, remaining) != remaining)
-    return -1;
-  switch (packet_size) {
-  case 1: res = get_int8(buf); break;
-  case 2: res = get_int16(buf); break;
-  case 4: res = get_int32(buf); break;
-  }
-  SET_NONBLOCKING(fd);
-  return(res);
-}
-
-static int port_inp_failure(int port_num, int ready_fd, int res)
-{
-    (void) driver_select(port_num, ready_fd, ERL_DRV_READ|ERL_DRV_WRITE, 0); 
-    clear_fd_data(ready_fd);
-    if (res == 0) {
-	if (driver_data[ready_fd].report_exit) {
-	    int tmpexit = 0;
-	    int reported;
-	    /* Lock the driver_data structure */
-	    semTake(driver_data_sem, WAIT_FOREVER);
-	    if ((reported = driver_data[ready_fd].exit_reported))
-		tmpexit = driver_data[ready_fd].exitcode;
-	    semGive(driver_data_sem);
-	    if (reported) {
-		erts_fprintf(stderr,"Exitcode %d reported\r\n", tmpexit);
-		driver_report_exit(port_num, tmpexit);
-	    }
-	}
-	driver_failure_eof(port_num);
-    } else {
-	driver_failure(port_num, res);
-    }
-    return 0;
-}
-
-/* fd is the drv_data that is returned from the */
-/* initial start routine                        */
-/* ready_fd is the descriptor that is ready to read */
-
-static void ready_input(ErlDrvData drv_data, ErlDrvEvent drv_event)
-{
-  int port_num, packet_bytes, res;
-  Uint h = 0;
-  char *buf;
-  int fd = (int) drv_data;
-  int ready_fd = (int) drv_event;
-
-  port_num = driver_data[fd].port_num;
-  packet_bytes = driver_data[fd].packet_bytes;
-
-  if (packet_bytes == 0) {
-    if ((res = read(ready_fd, tmp_buf, tmp_buf_size)) > 0) {
-      driver_output(port_num, (char*)tmp_buf, res);
-      return;
-    }
-    port_inp_failure(port_num, ready_fd, res);
-    return;
-  }
-
-  if (fd_data[ready_fd].remain > 0) { /* We try to read the remainder */
-    /* space is allocated in buf */
-    res = read(ready_fd, fd_data[ready_fd].cpos, 
-	       fd_data[ready_fd].remain);
-    if (res < 0) {
-      if ((errno == EINTR) || (errno == ERRNO_BLOCK)) {
-	  ;
-      } else {
-	  port_inp_failure(port_num, ready_fd, res);
-      }
-    } else if (res == 0) { 
-	port_inp_failure(port_num, ready_fd, res);
-    } else if (res == fd_data[ready_fd].remain) { /* we're done  */
-	driver_output(port_num, fd_data[ready_fd].buf, 
-		      fd_data[ready_fd].sz);
-	clear_fd_data(ready_fd);
-    } else {			/*  if (res < fd_data[ready_fd].remain) */
-	fd_data[ready_fd].cpos += res;
-	fd_data[ready_fd].remain -= res;
-    }
-    return;
-  }
-
-
-  if (fd_data[ready_fd].remain == 0) { /* clean fd */
-    /* We make one read attempt and see what happens */
-    res = read(ready_fd, tmp_buf, tmp_buf_size);
-    if (res < 0) {  
-      if ((errno == EINTR) || (errno == ERRNO_BLOCK))
-	return;
-      port_inp_failure(port_num, ready_fd, res);
-      return;
-    }
-    else if (res == 0) {		/* eof */
-      port_inp_failure(port_num, ready_fd, res);
-      return;
-    }
-    else if (res < packet_bytes) { /* Ugly case... get at least */
-      if ((h = ensure_header(ready_fd, tmp_buf, packet_bytes, res))==-1) {
-	port_inp_failure(port_num, ready_fd, -1);
-	return;
-      }
-      buf = erts_alloc_fnf(ERTS_ALC_T_FD_ENTRY_BUF, h);
-      if (!buf) {
-	port_inp_failure(port_num, ready_fd, -1);
-	return;
-      }
-      fd_data[ready_fd].buf = buf;
-      fd_data[ready_fd].sz = h;
-      fd_data[ready_fd].remain = h;
-      fd_data[ready_fd].cpos = buf;
-      return;
-    }
-    else  {			/* if (res >= packet_bytes) */
-      unsigned char* cpos = tmp_buf;
-      int bytes_left = res;
-      while (1) {		/* driver_output as many as possible */
-	  if (bytes_left == 0) {
-	      clear_fd_data(ready_fd);
-	      return;
-	  }
-	  if (bytes_left < packet_bytes) { /* Yet an ugly case */
-	      if((h=ensure_header(ready_fd, cpos, 
-				  packet_bytes, bytes_left))==-1) {
-		  port_inp_failure(port_num, ready_fd, -1);
-		  return;
-	      }
-	      buf = erts_alloc_fnf(ERTS_ALC_T_FD_ENTRY_BUF, h);
-	      if (!buf) 
-		  port_inp_failure(port_num, ready_fd, -1);
-	      fd_data[ready_fd].buf = buf;
-	      fd_data[ready_fd].sz = h;
-	      fd_data[ready_fd].remain = h;
-	      fd_data[ready_fd].cpos = buf;
-	      return;
-	  }
-	  switch (packet_bytes) {
-	  case 1: h = get_int8(cpos); cpos += 1; break;
-	  case 2: h = get_int16(cpos); cpos += 2; break;
-	  case 4: h = get_int32(cpos); cpos += 4; break;
-	  }
-	  bytes_left -= packet_bytes;
-	  /* we've got the header, now check if we've got the data */
-	  if (h <= (bytes_left)) {
-	      driver_output(port_num, (char*) cpos, h);
-	      cpos += h;
-	      bytes_left -= h;
-	      continue;
-	  }
-	  else {			/* The last message we got was split */
-	      buf = erts_alloc_fnf(ERTS_ALC_T_FD_ENTRY_BUF, h);
-	      if (!buf) {
-		  port_inp_failure(port_num, ready_fd, -1);
-	      }
-	      sys_memcpy(buf, cpos, bytes_left);
-	      fd_data[ready_fd].buf = buf;
-	      fd_data[ready_fd].sz = h;
-	      fd_data[ready_fd].remain = h - bytes_left;
-	      fd_data[ready_fd].cpos = buf + bytes_left;
-	      return;
-	  }
-      }
-      return;
-    }
-  }
-  fprintf(stderr, "remain %d \n", fd_data[ready_fd].remain);
-  port_inp_failure(port_num, ready_fd, -1);
-}
-
-
-/* fd is the drv_data that is returned from the */
-/* initial start routine                        */
-/* ready_fd is the descriptor that is ready to read */
-
-static void ready_output(ErlDrvData drv_data, ErlDrvEvent drv_event)
-{
-  Pend *p;
-  int wval;
-
-  int fd = (int) drv_data;
-  int ready_fd = (int) drv_event;
-
-  while(1) {
-    if ((p = fd_data[ready_fd].pending) == NULL) {
-      driver_select(driver_data[fd].port_num, ready_fd, 
-		    ERL_DRV_WRITE, 0);
-      return;
-    }
-    wval = write(p->fd, p->cpos, p->remain);
-    if (wval == p->remain) {
-      fd_data[ready_fd].pending = p->next;
-      erts_free(ERTS_ALC_T_PEND_DATA, p);
-      if (fd_data[ready_fd].pending == NULL) {
-	driver_select(driver_data[fd].port_num, ready_fd, 
-		      ERL_DRV_WRITE, 0);
-	set_busy_port(driver_data[fd].port_num, 0);
-	return;
-      }
-      else
-	continue;
-    }
-    else if (wval < 0) {
-      if (errno == ERRNO_BLOCK || errno == EINTR)
-	return;
-      else {
-	driver_select(driver_data[fd].port_num, ready_fd, 
-		      ERL_DRV_WRITE, 0);
-	driver_failure(driver_data[fd].port_num, -1);
-	return;
-      }
-    }
-    else if (wval < p->remain) {
-      p->cpos += wval;
-      p->remain -= wval;
-      return;
-    }
-  }
-}
-
-/* Fills in the systems representation of the jam/beam process identifier.
-** The Pid is put in STRING representation in the supplied buffer,
-** no interpretatione of this should be done by the rest of the
-** emulator. The buffer should be at least 21 bytes long.
-*/
-void sys_get_pid(char *buffer){
-    int p = taskIdSelf(); /* Hmm, may be negative??? requires some GB of
-			     memory to make the TCB address convert to a
-			     negative value. */
-    sprintf(buffer,"%d", p);
-}
-
-int
-erts_sys_putenv(char *buffer, int sep_ix)
-{
-    return putenv(buffer);
-}
-
-int
-erts_sys_getenv(char *key, char *value, size_t *size)
-{
-    char *orig_value;
-    int res;
-    orig_value = getenv(key);
-    if (!orig_value)
-	res = -1;
-    else {
-	size_t len = sys_strlen(orig_value);
-	if (len >= *size) {
-	    *size = len + 1;
-	    res = 1;
-	}
-	else {
-	    *size = len;
-	    sys_memcpy((void *) value, (void *) orig_value, len+1);
-	    res = 0;
-	}
-    }
-    return res;
-}
-
-int
-erts_sys_getenv__(char *key, char *value, size_t *size)
-{
-    return erts_sys_getenv(key, value, size);
-}
-
-void
-sys_init_io(void)
-{
-  tmp_buf = (byte *) erts_alloc(ERTS_ALC_T_SYS_TMP_BUF, SYS_TMP_BUF_SIZE);
-  tmp_buf_size = SYS_TMP_BUF_SIZE;
-  fd_data = (struct fd_data *)
-      erts_alloc(ERTS_ALC_T_FD_TAB, max_files * sizeof(struct fd_data));
-}
-
-
-/* Fill buffer, return buffer length, 0 for EOF, < 0 for error. */
-
-static int read_fill(int fd, char *buf, int len)
-{
-  int i, got = 0;
-  do {
-    if ((i = read(fd, buf+got, len-got)) <= 0) {
-      return i;
-    }
-    got += i;
-  } while (got < len);
-  return (len);
-}	
-
-
-/************************** Misc... *******************************/
-
-extern const char pre_loaded_code[];
-extern char* const pre_loaded[];
-
-
-/* Float conversion */
-
-int sys_chars_to_double(char *buf, double *fp)
-{
-  char *s = buf;
-
-  /* The following check is incorporated from the Vee machine */
-    
-#define ISDIGIT(d) ((d) >= '0' && (d) <= '9')
-
-  /* Robert says that something like this is what he really wanted:
-   *
-   * 7 == sscanf(Tbuf, "%[+-]%[0-9].%[0-9]%[eE]%[+-]%[0-9]%s", ....);
-   * if (*s2 == 0 || *s3 == 0 || *s4 == 0 || *s6 == 0 || *s7)
-   *   break;
-   */
-
-  /* Scan string to check syntax. */
-  if (*s == '+' || *s == '-')
-    s++;
-	    
-  if (!ISDIGIT(*s))		/* Leading digits. */
-    return -1;
-  while (ISDIGIT(*s)) s++;
-  if (*s++ != '.')		/* Decimal part. */
-    return -1;
-  if (!ISDIGIT(*s))
-    return -1;
-  while (ISDIGIT(*s)) s++;
-  if (*s == 'e' || *s == 'E') {
-    /* There is an exponent. */
-    s++;
-    if (*s == '+' || *s == '-')
-      s++;
-    if (!ISDIGIT(*s))
-      return -1;
-    while (ISDIGIT(*s)) s++;
-  }
-  if (*s)			/* That should be it */
-    return -1;
-    
-  if (sscanf(buf, "%lf", fp) != 1)
-    return -1;
-  return 0;
-}
-
-/* 
- ** Convert a double to ascii format 0.dddde[+|-]ddd
- ** return number of characters converted
- */
-
-int sys_double_to_chars(double fp, char *buf)
-{
-  (void) sprintf(buf, "%.20e", fp);
-  return strlen(buf);
-}
-
-
-/* Floating point exceptions */
-
-#if (CPU == SPARC)
-jmp_buf fpe_jmp;
-
-RETSIGTYPE fpe_sig_handler(int sig)
-{
-  longjmp(fpe_jmp, 1);
-}
-
-#elif (CPU == PPC603)
-static void fix_registers(void){
-    FP_CONTEXT fpcontext;
-    fppSave(&fpcontext);
-    fpcontext.fpcsr &= ~(_PPC_FPSCR_INIT);
-    fppRestore(&fpcontext);
-}
-#endif
-
-
-/* Return a pointer to a vector of names of preloaded modules */
-
-Preload* sys_preloaded(void)
-{
-    return (Preload *) pre_loaded;
-}
-
-/* Return a pointer to preloaded code for module "module" */
-unsigned char* sys_preload_begin(Preload *pp)
-{
-    return pp->code;
-}
-
-/* Clean up if allocated */
-void sys_preload_end(Preload *pp)
-{
-    /* Nothing */
-}
-
-/* Read a key from console (?) */
-
-int sys_get_key(int fd)
-{
-  int c;
-  unsigned char rbuf[64];
-
-  fflush(stdout);		/* Flush query ??? */
-
-  if ((c = read(fd,rbuf,64)) <= 0)
-    return c;
-  return rbuf[0];
-}
-
-
-/* A real printf that does the equivalent of fprintf(stdout, ...) */
-
-/* ARGSUSED */
-static STATUS
-stdio_write(char *buf, int nchars, int fp)
-{
-  if (fwrite(buf, sizeof(char), nchars, (FILE *)fp) == 0)
-    return(ERROR);
-  return(OK);
-}
-
-int real_printf(const char *fmt, ...)
-{
-  va_list ap;
-  int err;
-  
-  va_start(ap, fmt);
-  err = fioFormatV(fmt, ap, stdio_write, (int)stdout);
-  va_end(ap);
-  return(err);
-}
-	
-	
-/* 
- * Little function to do argc, argv calls from (e.g.) VxWorks shell
- *  The arguments should be in the form of a single ""-enclosed string
- *  NOTE: This isn't really part of the emulator, just included here
- *  so we can use the handy functions and memory reclamation.
- */
-void argcall(char *args)
-{
-  int argc;
-  char **argv;
-  FUNCPTR entry;
-
-  if (args != NULL) {
-    if ((argc = build_argv(args, &argv)) > 0) {
-      if ((entry = lookup(argv[0])) != NULL)
-	(*entry)(argc, argv, (char **)NULL); /* NULL for envp */
-      else
-	fprintf(stderr, "Couldn't find %s\n", argv[0]);
-    } else
-      fprintf(stderr, "Failed to build argv!\n");
-  } else
-    fprintf(stderr, "No argument list!\n");
-}
-
-
-/* That concludes the Erlang stuff - now we just need to implement an OS...
-   - Just kidding, but resource reclamation isn't the strength of VxWorks */
-#undef calloc
-#undef free
-#undef cfree
-#undef malloc
-#undef realloc
-#undef open
-#undef creat
-#undef socket
-#undef accept
-#undef close
-#undef fopen
-#undef fdopen
-#undef freopen
-#undef fclose
-
-/********************* Using elib_malloc ****************************/
-/* This gives us yet another level of malloc wrappers. The purpouse */
-/* is to be able to select between different varieties of memory    */
-/* allocation without recompiling.                                  */
-/* Maybe the performance is somewhat degraded by this, but          */
-/* on the other hand, performance may be much better if the most    */
-/* suiting malloc is used (not to mention the much lower            */
-/* fragmentation).                                                  */
-/* /Patrik N                                                        */
-/********************************************************************/
-
-/* 
- * I don't want to include the whole elib header, especially
- * as it uses char * for generic pointers. Let's fool ANSI C instead.
- */
-extern void *elib_malloc(size_t);
-extern void *elib_realloc(void *, size_t);
-extern void elib_free(void *);
-extern void elib_init(void *, int);
-extern void elib_force_init(void *, int);
-extern size_t elib_sizeof(void *);
-
-/* Flags */
-#define USING_ELIB_MALLOC         1   /* We are using the elib_malloc */
-#define WARN_MALLOC_MIX           2   /* Warn if plain malloc or save_malloc
-					 is mixed with sys_free2 or 
-					 sys_realloc2 */
-#define REALLOC_MOVES             4   /* Always move on realloc 
-					 (less fragmentation) */
-#define USER_POOL                 8   /* The user supplied the memory
-					 pool, it was not save_alloced. */
-#define RECLAIM_USER_POOL        16   /* Use the reclaim mechanism in the
-					 user pool. */
-#define NEW_USER_POOL            32   /* The user pool is newly suppllied,
-					 any old pool should be discarded */
-
-
-#define ELIB_LOCK \
-if(alloc_flags & USING_ELIB_MALLOC) \
-    semTake(elib_malloc_sem, WAIT_FOREVER)
-
-#define ELIB_UNLOCK \
-if(alloc_flags & USING_ELIB_MALLOC) \
-    semGive(elib_malloc_sem)
-
-#define USER_RECLAIM() ((alloc_flags & USING_ELIB_MALLOC) && \
-			(alloc_flags & USER_POOL) && \
-			(alloc_flags & RECLAIM_USER_POOL))
-
-/*
- * Global state
- * The use of function pointers for the malloc/realloc/free functions
- * is actually only useful in the malloc case, we must know what kind of
- * realloc/free we are going to use, so we could call elib_xxx directly.
- * However, as the overhead is small and this construction makes it 
- * fairly easy to add another malloc algorithm, the function pointers
- * are used in realloc/free to.
- */
-static MallocFunction actual_alloc = &save_malloc;
-static ReallocFunction actual_realloc = &save_realloc;
-static FreeFunction actual_free = &save_free;
-static int alloc_flags = 0;
-static int alloc_pool_size = 0;
-static void *alloc_pool_ptr = NULL;
-static SEM_ID elib_malloc_sem = NULL; 
-
-/*
- * Descide if we should use the save_free instead of elib_free or, 
- * in the case of the free used in a delete hook, if we should
- * use plain free instead of elib_free.
- */
-static int use_save_free(void *ptr){
-    register int diff = ((char *) ptr) - ((char *) alloc_pool_ptr);
-    /* 
-     * Hmmm... should it be save_free even if diff is exactly 0? 
-     * The answer is Yes if the whole area is save_alloced and No if not,
-     * so reclaim_free_hook is NOT run in the case of one save_alloced area. 
-     */
-    return (!(alloc_flags & USING_ELIB_MALLOC) ||
-	    (diff < 0 || diff >= alloc_pool_size));
-}
-
-/*
- * A free function used by the task deletion hook for the save_xxx functions.
- * Set with the set_reclaim_free_function function.
- */
-static void reclaim_free_hook(void *ptr){
-    if(use_save_free(ptr)){
-	free(ptr);
-    } else {
-	ELIB_LOCK;
-	(*actual_free)(ptr);
-	ELIB_UNLOCK;
-    }
-}
-    
-
-/*
- * Initialize, sets the values of pointers based on
- * either nothing (the default) or what's set previously by the
- * erl_set_memory_block function.
- */
-static void initialize_allocation(void){
-    set_reclaim_free_function(NULL);
-    if(alloc_pool_size == 0){
-	actual_alloc = (void *(*)(size_t))&save_malloc;
-	actual_realloc = (void *(*)(void *, size_t))&save_realloc;
-	actual_free = &save_free;
-	alloc_flags &= ~(USING_ELIB_MALLOC | USER_POOL | RECLAIM_USER_POOL);
-    } else {
-	if(elib_malloc_sem == NULL)
-	    elib_malloc_sem = semMCreate
-		(SEM_Q_PRIORITY | SEM_DELETE_SAFE | SEM_INVERSION_SAFE);
-	if(elib_malloc_sem == NULL)
-	    erl_exit(1,"Could not create mutex semaphore for elib_malloc");
-	if(!(alloc_flags & USER_POOL)){
-	    if((alloc_pool_ptr = save_malloc(alloc_pool_size)) == NULL)
-		erl_exit(1,"Erlang set to allocate a %d byte block initially;"
-			 " not enough memory available.", alloc_pool_size);
-	    elib_force_init(alloc_pool_ptr, alloc_pool_size);
-	} else if(alloc_flags & NEW_USER_POOL){
-	    elib_force_init(alloc_pool_ptr, alloc_pool_size);
-	}
-	actual_alloc=&elib_malloc;
-	actual_realloc=&elib_realloc;
-	actual_free=&elib_free;
-	alloc_flags |= USING_ELIB_MALLOC;
-	/* We MUST see to that the right free function is used
-	   otherwise we'll get a very nasty crash! */
-	if(USER_RECLAIM())
-	    set_reclaim_free_function(&reclaim_free_hook);
-    }
-    alloc_flags &= ~(NEW_USER_POOL); /* It's never new after initialization*/
-}
-
-/* This does not exist on other platforms, we just use it in sys.c 
-   and the BSD resolver */
-void *sys_calloc2(Uint nelem, Uint elsize){
-    void *ptr = erts_alloc_fnf(ERTS_ALC_T_UNDEF, nelem*elsize);
-    if(ptr != NULL)
-	memset(ptr,0,nelem*elsize);
-    return ptr;
-}
-
-/*
- * The malloc wrapper
- */
-void *
-erts_sys_alloc(ErtsAlcType_t type, void *extra, Uint size)
-{
-    register void *ret;
-    ELIB_LOCK;
-    if(USER_RECLAIM())
-	ret = save_malloc2((size_t)size,actual_alloc);
-    else
-	ret = (*actual_alloc)((size_t)size);
-    ELIB_UNLOCK;
-    return ret;
-}
-
-/*
- * The realloc wrapper, may respond to the "realloc-always-moves" flag
- * if the area is initially allocated with elib_malloc.
- */
-void *
-erts_sys_realloc(ErtsAlcType_t type, void *extra, void *ptr, Uint size)
-{
-    register void *ret;
-    if(use_save_free(ptr)){
-	if((alloc_flags & WARN_MALLOC_MIX) && 
-	   (alloc_flags & USING_ELIB_MALLOC))
-	    erts_fprintf(stderr,"Warning, save_malloced data realloced "
-		       "by sys_realloc2\n");
-	return save_realloc(ptr, (size_t) size);
-    } else {	
-	ELIB_LOCK;
-	if((alloc_flags & REALLOC_MOVES) && 
-	   (alloc_flags & USING_ELIB_MALLOC)){
-	    size_t osz = elib_sizeof(ptr);
-	    if(USER_RECLAIM())
-		ret = save_malloc2((size_t) size, actual_alloc);
-	    else
-		ret = (*actual_alloc)((size_t) size);
-	    if(ret != NULL){
-		memcpy(ret,ptr,(((size_t)size) < osz) ? ((size_t)size) : osz);
-		if(USER_RECLAIM())
-		    save_free2(ptr,actual_free);
-		else
-		    (*actual_free)(ptr);
-	    }
-	} else {
-	    if(USER_RECLAIM())
-		ret = save_realloc2(ptr,(size_t)size,actual_realloc);
-	    else
-		ret = (*actual_realloc)(ptr,(size_t)size);
-	}
-	ELIB_UNLOCK;
-	return ret;
-    }
-}
-
-/*
- * Wrapped free().
- */
-void
-erts_sys_free(ErtsAlcType_t type, void *extra, void *ptr)
-{
-    if(use_save_free(ptr)){
-	/* 
-	 * This might happen when linked in drivers use save_malloc etc 
-	 * directly. 
-	 */
-	if((alloc_flags & WARN_MALLOC_MIX) && 
-	   (alloc_flags & USING_ELIB_MALLOC))
-	    erts_fprintf(stderr,"Warning, save_malloced data freed by "
-		       "sys_free2\n");
-	save_free(ptr);
-    } else {
-	ELIB_LOCK;
-	if(USER_RECLAIM())
-	    save_free2(ptr,actual_free);
-	else
-	    (*actual_free)(ptr);
-	ELIB_UNLOCK;
-    }
-}
-
-/* 
- * External interface to be called before erlang is started 
- * Parameters:
- * isize: The size of the memory block where erlang should malloc().
- * iptr: (optional) A pointer to a user supplied memory block of 
- *       size isize.
- * warn_save: Instructs sys_free2 and sys_realloc2 to warn if
- *            memory allocation/reallocation/freeing is mixed between
- *            pure malloc/save_malloc/sys_alloc2 routines (only
- *            warns if elib is actually used in the sys_alloc2 routines).
- * realloc_moves: Always allocate a fresh memory block on reallocation 
- *                (less fragmentation).
- * reclaim_in_supplied: Use memory reclaim mechanisms inside the user
- *                      supplied area, this makes one area reusable between
- *                      starts of erlang and might be nice for drivers etc.
- */
-
-int erl_set_memory_block(int isize, int iptr, int warn_save, 
-			 int realloc_moves, int reclaim_in_supplied, int p5,
-			 int p6, int p7, int p8, int p9){
-    if(erlang_id != 0){
-	erts_fprintf(stderr,"Error, cannot set erlang memory block while an "
-		     "erlang task is running!\n");
-	return 1;
-    }
-    if(isize < 8 * 1024 *1024)
-	erts_fprintf(stderr,
-		     "Warning, the memory pool of %dMb may be to small to "
-		     "run erlang in!\n", isize / (1024 * 1024));
-    alloc_pool_size = (size_t) isize;
-    alloc_pool_ptr = (void *) iptr;
-    alloc_flags = 0;
-    /* USING_ELIB_MALLOC gets set by the initialization routine */
-    if((void *)iptr != NULL)
-	alloc_flags |= (USER_POOL | NEW_USER_POOL);
-    if(realloc_moves)
-	alloc_flags |= REALLOC_MOVES;
-    if(warn_save)
-	alloc_flags |= WARN_MALLOC_MIX;
-    if((void *)iptr != NULL && reclaim_in_supplied)
-	alloc_flags |= RECLAIM_USER_POOL;
-    return 0;
-}
-
-/* External statistics interface */
-int erl_memory_show(int p0, int p1, int p2, int p3, int p4, int p5,
-		    int p6, int p7, int p8, int p9){
-    struct elib_stat statistics;
-    if(!(alloc_flags & USING_ELIB_MALLOC) && erlang_id != 0){
-	erts_printf("Using plain save_alloc, use memShow instead.\n");
-	return 1;
-    }
-    if(erlang_id == 0 && !((alloc_flags & USER_POOL) && 
-			   !(alloc_flags & NEW_USER_POOL))){
-	erts_printf("Sorry, no allocation statistics until erlang "
-		   "is started.\n");
-	return 1;
-    }
-    erts_printf("Allocation settings:\n");
-    erts_printf("Using elib_malloc with memory pool size of %lu bytes.\n",
-	       (unsigned long) alloc_pool_size);
-    erts_printf("Realloc-always-moves is %s\n", 
-	       (alloc_flags & REALLOC_MOVES) ? "on" : "off");
-    erts_printf("Warnings about mixed malloc/free's are %s\n", 
-	       (alloc_flags & WARN_MALLOC_MIX) ? "on" : "off");
-    if(alloc_flags & USER_POOL){
-	erts_printf("The memory block used by elib is user supplied "
-		   "at 0x%08x.\n", (unsigned int) alloc_pool_ptr);
-	if(alloc_flags & RECLAIM_USER_POOL)
-	    erts_printf("Allocated memory within the user supplied pool\n"
-		       "  will be automatically reclaimed at task exit.\n");
-    } else {
-	erts_printf("The memory block used by elib is save_malloc'ed "
-		   "at 0x%08x.\n", (unsigned int) alloc_pool_ptr);
-    }
-    erts_printf("Statistics from elib_malloc:\n");
-    ELIB_LOCK;
-
-    elib_stat(&statistics);
-    ELIB_UNLOCK;
-    erts_printf("Type          Size (bytes) Number of blocks\n");
-    erts_printf("============= ============ ================\n");
-    erts_printf("Total:        %12lu %16lu\n",
-	       (unsigned long) statistics.mem_total*4,
-	       (unsigned long) statistics.mem_blocks);
-    erts_printf("Allocated:    %12lu %16lu\n",
-	       (unsigned long) statistics.mem_alloc*4,
-	       (unsigned long) statistics.mem_blocks-statistics.free_blocks);
-    erts_printf("Free:         %12lu %16lu\n",
-	       (unsigned long) statistics.mem_free*4,
-	       (unsigned long) statistics.free_blocks);
-    erts_printf("Largest free: %12lu                -\n\n",
-	       (unsigned long) statistics.max_free*4);
-    return 0;
-}
-
-
-/*
-** More programmer friendly (as opposed to user friendly ;-) interface
-** to the memory statistics. Resembles the VxWorks memPartInfoGet but
-** does not take a partition id as parameter...
-*/    
-int erl_mem_info_get(MEM_PART_STATS *stats){
-    struct elib_stat statistics;
-    if(!(alloc_flags & USING_ELIB_MALLOC))
-	return -1;
-    ELIB_LOCK;
-    elib_stat(&statistics);
-    ELIB_UNLOCK;
-    stats->numBytesFree = statistics.mem_free*4;
-    stats->numBlocksFree = statistics.free_blocks;
-    stats->maxBlockSizeFree = statistics.max_free*4;
-    stats->numBytesAlloc = statistics.mem_alloc*4;
-    stats->numBlocksAlloc = statistics.mem_blocks-statistics.free_blocks;
-    return 0;
-}
-
-/********************* Pipe driver **********************************/
-/*
- * Purpose:  Pipe driver with Unix (unnamed) pipe semantics.
- * Author:   Peter Hogfeldt ([email protected]) from an outline
- *           by Per Hedeland ([email protected]).
- *
- * Note: This driver must *not* use the reclaim facilities, hence it 
- * is placed here. (after the #undef's of open,malloc etc)
- *
- * This driver supports select() and non-blocking I/O via 
- * ioctl(fd, FIONBIO, val).
- * 
- * 1997-03-21 Peter Hogfeldt
- *            Added non-blocking I/O.
- *
- */
-
-/* 
- *  SEMAPHORES
- *
- *  Each end of a pipe has two semaphores: semExcl for serialising access to 
- *  the pipe end, and semBlock for blocking I/O.
- *
- *  reader->semBlock         is available (full) if and only if the pipe is
- *                           not empty, or the write end is closed. Otherwise
- *                           it is unavailable (empty). It is initially
- *                           unavailable.
- *
- *  writer->semBlock         is available (full) if and only if the pipe is
- *                           not full, or if the reader end is closed. 
- *                           Otherwise it is unavailable. It is initially
- *                           available.
- */
-
-#define UXPIPE_SIZE 4096
-
-/* Forward declaration */
-typedef struct uxPipeDev UXPIPE_DEV;
-
-/*
- * Pipe descriptor (one for each open pipe).
- */
-typedef struct {
-  int drvNum;
-  UXPIPE_DEV *reader, *writer;
-  RING_ID ringId;
-}     UXPIPE;
-
-/*
- * Device descriptor (one for each of the read and write
-		      * ends of an open pipe).
-		      */
-struct uxPipeDev {
-  UXPIPE *pipe;
-  int blocking;
-  SEL_WAKEUP_LIST wakeupList;
-  SEM_ID semExcl;
-  SEM_ID semBlock;
-};
-
-int uxPipeDrvNum = 0; /* driver number of pipe driver */
-
-#define PIPE_NAME 	"/uxpipe" /* only used internally */
-#define PIPE_READ 	"/r"	/* ditto */
-#define PIPE_WRITE 	"/w"	/* ditto */
-
-LOCAL char pipeRead[64], pipeWrite[64];
-LOCAL DEV_HDR devHdr;
-LOCAL UXPIPE *newPipe; /* communicate btwn open()s in pipe() */
-LOCAL SEM_ID pipeSem; /* mutual exclusion in pipe() */
-
-/* forward declarations */
-LOCAL int uxPipeOpen(DEV_HDR *pDv, char *name, int mode);
-LOCAL int uxPipeClose(UXPIPE_DEV *pDev);
-LOCAL int uxPipeRead(UXPIPE_DEV *pDev, char *buffer, int maxbytes);
-LOCAL int uxPipeWrite(UXPIPE_DEV *pDev, char *buffer, int nbytes);
-LOCAL STATUS uxPipeIoctl(FAST UXPIPE_DEV *pDev, FAST int function, int arg);
-
-
-/***************************************************************************
- *
- * uxPipeDrv - install Unix pipe driver
- *
- * This routine initializes the Unix pipe driver.  It must be called
- * before any other routine in this driver.
- *
- * RETURNS:
- *    OK, or ERROR if I/O system is unable to install driver.
- */
-
-STATUS
-uxPipeDrv(void)
-{
-  if (uxPipeDrvNum > 0)
-    return (OK);		/* driver already installed */
-  if ((uxPipeDrvNum = iosDrvInstall((FUNCPTR) NULL, (FUNCPTR) NULL,
-				    uxPipeOpen, uxPipeClose, uxPipeRead,
-				    uxPipeWrite, uxPipeIoctl)) == ERROR)
-    return (ERROR);
-  if (iosDevAdd(&devHdr, PIPE_NAME, uxPipeDrvNum) == ERROR)
-    return (ERROR);
-  strcpy(pipeRead, PIPE_NAME);
-  strcat(pipeRead, PIPE_READ);
-  strcpy(pipeWrite, PIPE_NAME);
-  strcat(pipeWrite, PIPE_WRITE);
-  if ((pipeSem = semMCreate(SEM_Q_PRIORITY | SEM_DELETE_SAFE)) == NULL)
-    return (ERROR);
-  return (OK);
-}
-
-/***************************************************************************
- *
- * uxPipeOpen - open a pipe
- *
- * RETURNS: Pointer to device descriptor, or ERROR if memory cannot be
- * allocated (errno = ENOMEM),  or invalid argument (errno = EINVAL).
- */
-
-/*
- * DEV_HDR *pDv;  pointer to device header (dummy) 
- * char *name;  name of pipe to open ("/r" or "/w") 
- * int   mode;  access mode (O_RDONLY or O_WRONLY)
- */		      
-LOCAL int
-uxPipeOpen(DEV_HDR *pDv, char *name, int mode)
-{
-  UXPIPE_DEV *reader, *writer;
-
-  if (mode == O_RDONLY && strcmp(name, PIPE_READ) == 0) {
-    /* reader open */
-    if ((newPipe = (UXPIPE *) malloc(sizeof(UXPIPE))) != NULL) {
-      if ((newPipe->ringId = rngCreate(UXPIPE_SIZE)) != NULL) {
-	if ((reader = (UXPIPE_DEV *) malloc(sizeof(UXPIPE_DEV))) != NULL) {
-	  if ((reader->semExcl = semBCreate(SEM_Q_FIFO, SEM_FULL)) != NULL) {
-	    if ((reader->semBlock = semBCreate(SEM_Q_FIFO, SEM_EMPTY)) != NULL) {
-	      reader->pipe = newPipe;
-	      reader->blocking = 1;
-	      selWakeupListInit(&reader->wakeupList);
-	      newPipe->reader = reader;
-	      newPipe->writer = NULL;
-	      newPipe->drvNum = uxPipeDrvNum;
-	      return ((int) reader);
-	    }
-	    semDelete(reader->semExcl);
-	  }
-	  free(reader);
-	}
-	rngDelete(newPipe->ringId);
-      }
-      free(newPipe);
-      newPipe = NULL;
-      errno = ENOMEM;
-    }
-  } else if (mode == O_WRONLY && strcmp(name, PIPE_WRITE) == 0) {
-    /* writer open */
-    if (newPipe != NULL &&
-	(writer = (UXPIPE_DEV *) malloc(sizeof(UXPIPE_DEV))) != NULL) {
-      if ((writer->semExcl = semBCreate(SEM_Q_FIFO, SEM_FULL)) != NULL) {
-	if ((writer->semBlock = semBCreate(SEM_Q_FIFO, SEM_FULL)) != NULL) {
-	  writer->blocking = 1;
-	  writer->pipe = newPipe;
-	  selWakeupListInit(&writer->wakeupList);
-	  newPipe->writer = writer;
-	  newPipe = NULL;
-	  return ((int) writer);
-	}
-	semDelete(writer->semExcl);
-      }
-      free(writer);
-    }
-    if (newPipe != NULL)
-      free(newPipe);
-    newPipe = NULL;
-    errno = ENOMEM;
-  } else {
-    errno = EINVAL;
-  }
-  return (ERROR);
-}
-
-/***************************************************************************
- *
- * uxPipeClose - close read or write end of a pipe.
- *
- * RETURNS:
- *    OK, or ERROR if device descriptor does not refer to an open read or
- write end of a pipe (errno = EBADF).
- */
-
-LOCAL int
-uxPipeClose(UXPIPE_DEV *pDev)
-{
-  UXPIPE *pajp = pDev->pipe;
-
-  taskLock();
-  if (pDev == pajp->reader) {
-    /* Close this end */
-    semDelete(pDev->semExcl);
-    semDelete(pDev->semBlock);
-    free(pDev);
-    pajp->reader = NULL;
-    /* Inform the other end */
-    if (pajp->writer != NULL) {
-      selWakeupAll(&pajp->writer->wakeupList, SELWRITE);
-      semGive(pajp->writer->semBlock);
-    }
-  } else if (pDev == pajp->writer) {
-    /* Close this end */
-    semDelete(pDev->semExcl);
-    semDelete(pDev->semBlock);
-    free(pDev);
-    pajp->writer = NULL;
-    /* Inform the other end */
-    if (pajp->reader != NULL) {
-      selWakeupAll(&pajp->reader->wakeupList, SELREAD);
-      semGive(pajp->reader->semBlock);
-    }
-  } else {
-    errno = EBADF;
-    taskUnlock();
-    return (ERROR);
-  }
-  if (pajp->reader == NULL && pajp->writer == NULL) {
-    rngDelete(pajp->ringId);
-    pajp->drvNum = 0;
-    free(pajp);
-  }
-  taskUnlock();
-  return (OK);
-}
-/***************************************************************************
- *
- * uxPipeRead - read from a pipe.
- *
- * Reads at most maxbytes bytes from the pipe. Blocks if blocking mode is
- * set and the pipe is empty.
- *
- * RETURNS:
- *    number of bytes read, 0 on EOF, or ERROR if device descriptor does
- *    not refer to an open read end of a pipe (errno = EBADF), or if 
- *    non-blocking mode is set and the pipe is empty (errno = EWOULDBLOCK).
- */
-
-LOCAL int
-uxPipeRead(UXPIPE_DEV *pDev, char *buffer, int maxbytes)
-{
-  UXPIPE *pajp = pDev->pipe;
-  int   nbytes = 0;
-
-  if (pDev != pajp->reader) {
-    errno = EBADF;
-    return (ERROR);
-  }
-  if (maxbytes == 0)
-    return (0);
-  semTake(pDev->semExcl, WAIT_FOREVER);
-  /* 
-   * Note that semBlock may be full, although there is nothing to read.
-   * This happens e.g. after the following sequence of operations: a 
-   * reader task blocks, a writer task writes two times (the first 
-   * write unblocks the reader task, the second write makes semBlock
-   * full).
-   */
-  while (nbytes == 0) {
-    if (pDev->blocking) 
-      semTake(pDev->semBlock, WAIT_FOREVER);
-    /* 
-     * Reading and updating of the write end must not be interleaved
-     * with a write from another task - hence we lock this task.
-     */
-    taskLock();
-    nbytes = rngBufGet(pajp->ringId, buffer, maxbytes);
-    if (nbytes > 0) {
-      /* Give own semaphore if bytes remain or if write end is closed */
-      if ((!rngIsEmpty(pajp->ringId) || pajp->writer == NULL) &&
-	  pDev->blocking)
-	semGive(pDev->semBlock);
-      /* Inform write end */
-      if (pajp->writer != NULL) {
-	if (pajp->writer->blocking) 
-	  semGive(pajp->writer->semBlock);
-	selWakeupAll(&pajp->writer->wakeupList, SELWRITE);
-      }
-    } else if (pajp->writer == NULL) {
-      nbytes = 0;		/* EOF */
-      /* Give semaphore when write end is closed */
-      if (pDev->blocking) 
-	semGive(pDev->semBlock);
-      taskUnlock();
-      semGive(pDev->semExcl);
-      return (nbytes);
-    } else if (!pDev->blocking) {
-      taskUnlock();
-      semGive(pDev->semExcl);
-      errno = EWOULDBLOCK;
-      return (ERROR);
-    }      
-    taskUnlock();
-  }
-  semGive(pDev->semExcl);
-  return (nbytes);
-}
-
-/***************************************************************************
- *
- * uxPipeWrite - write to a pipe.
- *
- * Writes nbytes bytes to the pipe. Blocks if blocking mode is set, and if 
- * the pipe is full.
- *
- * RETURNS:
- * number of bytes written, or ERROR if the device descriptor does not
- * refer to an open write end of a pipe (errno = EBADF); or if the read end
- * of the pipe is closed (errno = EPIPE); or if non-blocking mode is set
- * and the pipe is full (errno = EWOULDBLOCK).
- *
- */
-
-LOCAL int
-uxPipeWrite(UXPIPE_DEV *pDev, char *buffer, int nbytes)
-{
-
-  UXPIPE *pajp = pDev->pipe;
-  int   sofar = 0, written;
-
-  if (pDev != pajp->writer) {
-    errno = EBADF;
-    return (ERROR);
-  }
-  if (pajp->reader == NULL) {
-    errno = EPIPE;
-    return (ERROR);
-  }
-  if (nbytes == 0)
-    return (0);
-  semTake(pDev->semExcl, WAIT_FOREVER);
-  while (sofar < nbytes) {
-    if (pDev->blocking)
-      semTake(pDev->semBlock, WAIT_FOREVER);
-    if (pajp->reader == NULL) {
-      errno = EPIPE;
-      semGive(pDev->semBlock);
-      semGive(pDev->semExcl);
-      return (ERROR);
-    }
-    /* Writing and updating of the read end must not be interleaved
-     * with a read from another task - hence we lock this task.
-     */
-    taskLock();
-    written = rngBufPut(pajp->ringId, buffer + sofar, nbytes - sofar);
-    sofar += written;
-    /* Inform the read end if we really wrote something */
-    if (written > 0 && pajp->reader != NULL) {
-      selWakeupAll(&pajp->reader->wakeupList, SELREAD);
-      if (pajp->reader->blocking)
-	semGive(pajp->reader->semBlock);
-    }
-    taskUnlock();
-    if (!pDev->blocking) {
-      if (sofar == 0) {
-      errno = EWOULDBLOCK;
-      sofar = ERROR;
-      }
-      break;
-    }
-  }
-  /* Give own semaphore if space remains */
-  if (!rngIsFull(pajp->ringId) && pDev->blocking)
-    semGive(pDev->semBlock);
-  semGive(pDev->semExcl);
-  return (sofar);
-}
-
-/***************************************************************************
- *
- * uxPipeIoctl - do device specific I/O control
- *
- * RETURNS:
- *    OK or ERROR.
- */
-
-LOCAL STATUS
-uxPipeIoctl(FAST UXPIPE_DEV *pDev, FAST int function, int arg)
-     
-{
-  UXPIPE *pajp = pDev->pipe;
-  int   status = OK;
-
-  switch (function) {
-  case FIONBIO:
-    pDev->blocking = (*(int *)arg) ? 0 : 1;
-    break;
-  case FIOSELECT:
-    taskLock();
-    selNodeAdd(&pDev->wakeupList, (SEL_WAKEUP_NODE *) arg);
-    if (selWakeupType((SEL_WAKEUP_NODE *) arg) == SELREAD &&
-	pDev == pajp->reader &&
-	(!rngIsEmpty(pajp->ringId) || pajp->writer == NULL))
-      selWakeup((SEL_WAKEUP_NODE *) arg);
-    if (selWakeupType((SEL_WAKEUP_NODE *) arg) == SELWRITE &&
-	pDev == pajp->writer &&
-	(!rngIsFull(pajp->ringId) || pajp->reader == NULL))
-      selWakeup((SEL_WAKEUP_NODE *) arg);
-    taskUnlock();
-    break;
-  case FIOUNSELECT:
-    selNodeDelete(&pDev->wakeupList, (SEL_WAKEUP_NODE *) arg);
-    break;
-  default:
-    status = ERROR;
-    break;
-  }
-  return (status);
-}
-
-/***************************************************************************
- *
- * pipe - create an intertask channel
- *
- * Creates a pipe. fd[0] (fd[1]) is the read (write) file descriptor.
- *
- * RETURNS:
- *    OK or ERROR, if the pipe could not be created.
- */
-
-STATUS
-pipe(int fd[2])
-{
-  semTake(pipeSem, WAIT_FOREVER);
-  if ((fd[0] = open(pipeRead, O_RDONLY, 0)) != ERROR) {
-    if ((fd[1] = open(pipeWrite, O_WRONLY, 0)) != ERROR) {
-      semGive(pipeSem);
-      return (OK);
-    }
-    (void) close(fd[0]);
-  }
-  errno &= 0xFFFF;
-  if((errno & 0xFFFF) == EINTR) /* Why on earth EINTR??? */
-      errno = ENFILE;           /* It means we are out of file descriptors...*/
-  semGive(pipeSem);
-  return (ERROR);
-}
-
-/***************************************************************************
- *
- * uxPipeShow - display pipe information
- *
- * RETURNS:
- *    N/A.
- */
-
-void
-uxPipeShow(int fd)
-{
-  UXPIPE_DEV *pDev;
-  UXPIPE *pajp;
-  int drvValue;
-
-  if ((drvValue = iosFdValue(fd)) == ERROR) {
-    erts_fprintf(stderr, "Error: file descriptor invalid\n");
-    return;
-  }
-  pDev = (UXPIPE_DEV *)drvValue;
-  pajp = pDev->pipe;
-  if (pajp->drvNum != uxPipeDrvNum) {
-    erts_fprintf(stderr, "Error: Not a ux pipe device\n");
-    return;
-  }
-  erts_fprintf(stderr, "Device              : 0x%x\n", (int) pDev);
-  erts_fprintf(stderr, "Buffer size         : %d\n", UXPIPE_SIZE);
-  erts_fprintf(stderr, "Bytes in buffer     : %d\n\n", rngNBytes(pajp->ringId));
-  erts_fprintf(stderr, "READ END\n\n");
-  if (pajp->reader != NULL) {
-    erts_fprintf(stderr, "Mode                : ");
-    erts_fprintf(stderr, "%s\n", 
-	       (pajp->reader->blocking) ? "blocking" : "non-blocking");
-  }
-  erts_fprintf(stderr, "Status              : ");
-  if (pajp->reader != NULL) {
-    erts_fprintf(stderr, "OPEN\n");
-    erts_fprintf(stderr, "Wake-up list        : %d\n\n", 
-	       selWakeupListLen(&pajp->reader->wakeupList));
-    erts_fprintf(stderr, "Exclusion Semaphore\n");
-    semShow(pajp->reader->semExcl, 1);
-    erts_fprintf(stderr, "Blocking Semaphore\n");
-    semShow(pajp->reader->semBlock, 1);
-  } else 
-    erts_fprintf(stderr, "CLOSED\n\n");
-  erts_fprintf(stderr, "WRITE END\n\n");
-  if (pajp->writer != NULL) {
-    erts_fprintf(stderr, "Mode                : ");
-    erts_fprintf(stderr, "%s\n", 
-	       (pajp->writer->blocking) ? "blocking" : "non-blocking");
-  }
-  erts_fprintf(stderr, "Status              : ");
-  if (pajp->writer != NULL) {
-    erts_fprintf(stderr, "OPEN\n");
-    erts_fprintf(stderr, "Wake-up list        : %d\n\n", 
-	       selWakeupListLen(&pajp->writer->wakeupList));
-    erts_fprintf(stderr, "Exclusion Semaphore\n");
-    semShow(pajp->writer->semExcl, 1);
-    erts_fprintf(stderr, "Blocking Semaphore\n");
-    semShow(pajp->writer->semBlock, 1);
-  } else 
-    erts_fprintf(stderr, "CLOSED\n\n");
-}
-
-#ifdef DEBUG
-void
-erl_assert_error(char* expr, char* file, int line)
-{   
-    fflush(stdout);
-    fprintf(stderr, "Assertion failed: %s in %s, line %d\n",
-	    expr, file, line);
-    fflush(stderr);
-    erl_crash_dump(file, line, "Assertion failed: %s\n", expr);
-    abort();
-}
-void
-erl_debug(char* fmt, ...)
-{
-    char sbuf[1024];		/* Temporary buffer. */
-    va_list va;
-    
-    va_start(va, fmt);
-    vsprintf(sbuf, fmt, va);
-    va_end(va);
-    fprintf(stderr, "%s\n", sbuf);
-}
-#endif
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile
index 506df251e8..7af7e48bbd 100644
--- a/erts/emulator/test/Makefile
+++ b/erts/emulator/test/Makefile
@@ -138,7 +138,10 @@ TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 EMAKEFILE=Emakefile
 
-TEST_SPEC_FILES =	emulator.spec emulator_bench.spec
+TEST_SPEC_FILES= emulator.spec \
+		 emulator.spec.win \
+		 emulator_bench.spec
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index 2ddb4d76d9..c88218c176 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -98,19 +98,6 @@ end_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
-%%% Don't be too hard on vxworks, the cross server gets nodedown
-%%% cause the card is too busy if we don't sleep a little between pings.
-sleep() ->
-    case os:type() of
-	vxworks ->
-	    receive
-	    after 10 ->
-		    ok
-	    end;
-	_ ->
-	    ok
-    end.
-
 ping(doc) ->
     ["Tests pinging a node in different ways."];
 ping(Config) when is_list(Config) ->
@@ -122,23 +109,21 @@ ping(Config) when is_list(Config) ->
     ?line Host = hostname(),
     ?line BadName = list_to_atom("__pucko__@" ++ Host),
     ?line io:format("Pinging ~s (assumed to not exist)", [BadName]),
-    ?line test_server:do_times(Times, 
-			       fun() -> pang = net_adm:ping(BadName),
-					sleep() 
+    ?line test_server:do_times(Times, fun() -> pang = net_adm:ping(BadName)
 			       end),
 
     %% Pings another node.
 
     ?line {ok, OtherNode} = start_node(distribution_SUITE_other),
     ?line io:format("Pinging ~s (assumed to exist)", [OtherNode]),
-    ?line test_server:do_times(Times, fun() -> pong = net_adm:ping(OtherNode),sleep() end),
+    ?line test_server:do_times(Times, fun() -> pong = net_adm:ping(OtherNode) end),
     ?line stop_node(OtherNode),
 
     %% Pings our own node many times.
 
     ?line Node = node(),
     ?line io:format("Pinging ~s (the same node)", [Node]),
-    ?line test_server:do_times(Times, fun() -> pong = net_adm:ping(Node),sleep() end),
+    ?line test_server:do_times(Times, fun() -> pong = net_adm:ping(Node) end),
 
     ok.
 
diff --git a/erts/emulator/test/driver_SUITE_data/chkio_drv.c b/erts/emulator/test/driver_SUITE_data/chkio_drv.c
index 40f1ad4fea..faf1040276 100644
--- a/erts/emulator/test/driver_SUITE_data/chkio_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/chkio_drv.c
@@ -17,7 +17,7 @@
  */
 
 #ifndef UNIX
-#if !defined(__WIN32__) && !defined(VXWORKS)
+#if !defined(__WIN32__)
 #define UNIX 1
 #endif
 #endif
diff --git a/erts/emulator/test/driver_SUITE_data/io_ready_exit_drv.c b/erts/emulator/test/driver_SUITE_data/io_ready_exit_drv.c
index e6a3edcd74..1e107309df 100644
--- a/erts/emulator/test/driver_SUITE_data/io_ready_exit_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/io_ready_exit_drv.c
@@ -17,7 +17,7 @@
  */
 
 #ifndef UNIX
-#if !defined(__WIN32__) && !defined(VXWORKS)
+#if !defined(__WIN32__)
 #define UNIX 1
 #endif
 #endif
diff --git a/erts/emulator/test/driver_SUITE_data/ioq_exit_drv.c b/erts/emulator/test/driver_SUITE_data/ioq_exit_drv.c
index b2cc1e785a..d174771629 100644
--- a/erts/emulator/test/driver_SUITE_data/ioq_exit_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/ioq_exit_drv.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef UNIX
-#if !defined(__WIN32__) && !defined(VXWORKS)
+#if !defined(__WIN32__)
 #define UNIX 1
 #endif
 #endif
diff --git a/erts/emulator/test/driver_SUITE_data/missing_callback_drv.c b/erts/emulator/test/driver_SUITE_data/missing_callback_drv.c
index e7d9a294fa..851f2c745b 100644
--- a/erts/emulator/test/driver_SUITE_data/missing_callback_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/missing_callback_drv.c
@@ -17,7 +17,7 @@
  */
 
 #ifndef UNIX
-#if !defined(__WIN32__) && !defined(VXWORKS)
+#if !defined(__WIN32__)
 #define UNIX 1
 #endif
 #endif
diff --git a/erts/emulator/test/driver_SUITE_data/peek_non_existing_queue_drv.c b/erts/emulator/test/driver_SUITE_data/peek_non_existing_queue_drv.c
index 8e203f74ec..0c86a26604 100644
--- a/erts/emulator/test/driver_SUITE_data/peek_non_existing_queue_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/peek_non_existing_queue_drv.c
@@ -28,7 +28,7 @@
  */
 
 #ifndef UNIX
-#if !defined(__WIN32__) && !defined(VXWORKS)
+#if !defined(__WIN32__)
 #define UNIX 1
 #endif
 #endif
diff --git a/erts/emulator/test/driver_SUITE_data/timer_drv.c b/erts/emulator/test/driver_SUITE_data/timer_drv.c
index 8c3f203a64..57538e0d57 100644
--- a/erts/emulator/test/driver_SUITE_data/timer_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/timer_drv.c
@@ -1,11 +1,3 @@
-#ifdef VXWORKS
-#include <vxWorks.h>
-#include <taskVarLib.h>
-#include <taskLib.h>
-#include <sysLib.h>
-#include <string.h>
-#include <ioLib.h>
-#endif
 #include <stdio.h>
 #include "erl_driver.h"
 
@@ -84,12 +76,8 @@ static void timer_read(ErlDrvData p, char *buf, ErlDrvSizeT len)
 	driver_output(port, reply, 1);
     } else if (buf[0] == DELAY_START_TIMER) {
 #ifndef __WIN32__
-#ifdef VXWORKS
-	taskDelay(sysClkRateGet());
-#else
 	sleep(1);
 #endif
-#endif
 	driver_set_timer(port, get_int32(buf + 1));
     }
 }
diff --git a/erts/emulator/test/emulator.spec.vxworks b/erts/emulator/test/emulator.spec.vxworks
deleted file mode 100644
index 55675bdc29..0000000000
--- a/erts/emulator/test/emulator.spec.vxworks
+++ /dev/null
@@ -1,26 +0,0 @@
-{topcase, {dir, "../emulator_test"}}.
-
-% Added since R11
-{skip,{distribution_SUITE,link_to_dead_new_node,"Does not work in distributed test environments"}}.
-{skip,{binary_SUITE,terms_float,"Floats, VxWorks, PPC = Floating points never equal..."}}.
-{skip,{system_info_SUITE,process_count,"Fix-allocs starving VxWorks cards"}}.
-{skip,{monitor_SUITE,mixer,"Fix-allocs starving VxWorks cards"}}.
-
-{skip,{node_container_SUITE,"Too memory consuming..."}}.
-
-{skip,{trace_SUITE,system_monitor_long_gc_1,"Too memory consuming..."}}.
-{skip,{trace_SUITE,system_monitor_long_gc_2,"Too memory consuming..."}}.
-{skip,{trace_SUITE,system_monitor_large_heap_1,"Too memory consuming..."}}.
-{skip,{trace_SUITE,system_monitor_large_heap_2,"Too memory consuming..."}}.
-% End added since R11
-
-{skip, {distribution_SUITE,stop_dist,"Not written to work on VxWorks."}}.
-{skip, {distribution_SUITE,dist_auto_connect_never,
-	"Not written to work on VxWorks."}}.
-{skip, {distribution_SUITE,dist_auto_connect_once,
-	"Not written to work on VxWorks."}}.
-{skip, {trace_SUITE,system_monitor_long_gc,
-	"Too memory consuming for VxWorks cards."}}.
-{skip, {trace_meta_SUITE,stack_grow,
-        "Too memory consuming for VxWorks cards."}}.
-{skip, {obsolete_SUITE, "Not on vxworks"}}.
diff --git a/erts/emulator/test/estone_SUITE_data/estone_cat.c b/erts/emulator/test/estone_SUITE_data/estone_cat.c
index 8ed9f8375b..a34bda4384 100644
--- a/erts/emulator/test/estone_SUITE_data/estone_cat.c
+++ b/erts/emulator/test/estone_SUITE_data/estone_cat.c
@@ -12,11 +12,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#ifdef VXWORKS
-estone_cat(argc, argv)
-#else
 main(argc, argv)
-#endif
 int argc;
 char *argv[];
 {
diff --git a/erts/emulator/test/gc_SUITE.erl b/erts/emulator/test/gc_SUITE.erl
index 771d2c9a7a..19fa433a53 100644
--- a/erts/emulator/test/gc_SUITE.erl
+++ b/erts/emulator/test/gc_SUITE.erl
@@ -54,17 +54,12 @@ grow_heap(doc) -> ["Produce a growing list of elements, ",
 		   "for X calls, then drop one item per call",
 		   "until the list is empty."];
 grow_heap(Config) when is_list(Config) ->
-    ?line Dog=test_server:timetrap(test_server:minutes(40)),
-    ?line ok=grow_heap1(256),
-    case os:type() of 
-	vxworks ->
-	    stop_here;
-	_ ->
-	    ?line ok=grow_heap1(512),
-	    ?line ok=grow_heap1(1024),
-	    ?line ok=grow_heap1(2048)
-    end,
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:minutes(40)),
+    ok  = grow_heap1(256),
+    ok  = grow_heap1(512),
+    ok  = grow_heap1(1024),
+    ok  = grow_heap1(2048),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 grow_heap1(Len) ->
@@ -82,10 +77,10 @@ grow_heap1(List, MaxLen, CurLen, up) ->
 grow_heap1([], _MaxLen, _, down) ->
     ok;
 grow_heap1([_|List], MaxLen, CurLen, down) ->
-    ?line {_,_,C}=erlang:now(),
-    ?line Num=C rem (length(List))+1,
-    ?line Elem=lists:nth(Num, List),
-    ?line NewList=lists:delete(Elem, List),
+    {_,_,C} = erlang:now(),
+    Num     = C rem (length(List))+1,
+    Elem    = lists:nth(Num, List),
+    NewList = lists:delete(Elem, List),
     grow_heap1(NewList, MaxLen, CurLen-1, down).
 
 
@@ -93,16 +88,11 @@ grow_heap1([_|List], MaxLen, CurLen, down) ->
 grow_stack(doc) -> ["Increase and decrease stack size, and ",
 		    "drop off some garbage from time to time."];
 grow_stack(Config) when is_list(Config) ->
-    ?line Dog=test_server:timetrap(test_server:minutes(80)),
+    Dog = test_server:timetrap(test_server:minutes(80)),
     show_heap("before:"),
-    case os:type() of
-	vxworks ->
-	    ?line grow_stack1(25, 0);
-	_ ->
-	    ?line grow_stack1(200, 0)
-    end,
+    grow_stack1(200, 0),
     show_heap("after:"),
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 grow_stack1(0, _) ->
@@ -123,16 +113,11 @@ grow_stack_heap(doc) -> ["While growing the heap, bounces the size ",
 			 "of the stack, and while reducing the heap",
 			 "bounces the stack usage."];
 grow_stack_heap(Config) when is_list(Config) ->
-    case os:type() of 
-	vxworks ->
-	    {comment, "Takes too long to run on VxWorks/cpu32"};
-	_ ->
-	    ?line Dog=test_server:timetrap(test_server:minutes(40)),
-	    ?line grow_stack_heap1(16),
-	    ?line grow_stack_heap1(32),
-	    ?line test_server:timetrap_cancel(Dog),
-	    ok
-    end.
+    Dog = test_server:timetrap(test_server:minutes(40)),
+    grow_stack_heap1(16),
+    grow_stack_heap1(32),
+    test_server:timetrap_cancel(Dog),
+    ok.
 
 grow_stack_heap1(MaxLen) ->
     io:format("~ngrow_stack_heap with ~p items.",[MaxLen]),
@@ -151,10 +136,10 @@ grow_stack_heap1(List, MaxLen, CurLen, up) ->
 grow_stack_heap1([], _MaxLen, _, down) -> ok;
 grow_stack_heap1([_|List], MaxLen, CurLen, down) ->
     grow_stack1(CurLen*2,0),
-    ?line {_,_,C}=erlang:now(),
-    ?line Num=C rem (length(List))+1,
-    ?line Elem=lists:nth(Num, List),
-    ?line NewList=lists:delete(Elem, List),
+    {_,_,C}=erlang:now(),
+    Num=C rem (length(List))+1,
+    Elem=lists:nth(Num, List),
+    NewList=lists:delete(Elem, List),
     grow_stack_heap1(NewList, MaxLen, CurLen-1, down),
     ok.
 
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index 0b99b3438a..4b555777d7 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -157,16 +157,16 @@ win_massive(Config) when is_list(Config) ->
     end.
 
 do_win_massive() ->
-    ?line Dog = test_server:timetrap(test_server:seconds(360)),
-    ?line SuiteDir = filename:dirname(code:which(?MODULE)),
-    ?line Env = " -env ERL_MAX_PORTS 8192",
-    ?line {ok, Node} = 
+    Dog = test_server:timetrap(test_server:seconds(360)),
+    SuiteDir = filename:dirname(code:which(?MODULE)),
+    Env = " -env ERL_MAX_PORTS 8192",
+    {ok, Node} = 
 	test_server:start_node(win_massive,
 			       slave,
 			       [{args, " -pa " ++ SuiteDir ++ Env}]),
-    ?line ok = rpc:call(Node,?MODULE,win_massive_client,[3000]),
-    ?line test_server:stop_node(Node),
-    ?line test_server:timetrap_cancel(Dog),
+    ok = rpc:call(Node,?MODULE,win_massive_client,[3000]),
+    test_server:stop_node(Node),
+    test_server:timetrap_cancel(Dog),
     ok.
     
 win_massive_client(N) ->
@@ -208,11 +208,11 @@ win_massive_loop(P,N) ->
 %% We will send only a small amount of data, to avoid deadlock.
 
 stream_small(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line stream_ping(Config, 512, "", []),
-    ?line stream_ping(Config, 1777, "", []),
-    ?line stream_ping(Config, 1777, "-s512", []),
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    stream_ping(Config, 512, "", []),
+    stream_ping(Config, 1777, "", []),
+    stream_ping(Config, 1777, "-s512", []),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Send big amounts of data (much bigger than the buffer size in port test).
@@ -220,30 +220,22 @@ stream_small(Config) when is_list(Config) ->
 %% non-blocking reads and writes.
 
 stream_big(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(180)),
-    case os:type() of 
-	vxworks ->
-	    %% Don't stress VxWorks too much
-	    ?line stream_ping(Config, 43755, "", []),
-	    ?line stream_ping(Config, 51255, "", []),
-	    ?line stream_ping(Config, 52345, " -s40000", []);
-	_ ->
-	    ?line stream_ping(Config, 43755, "", []),
-	    ?line stream_ping(Config, 100000, "", []),
-	    ?line stream_ping(Config, 77777, " -s40000", [])
-    end,
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(180)),
+    stream_ping(Config, 43755, "", []),
+    stream_ping(Config, 100000, "", []),
+    stream_ping(Config, 77777, " -s40000", []),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Sends packet with header size of 1, 2, and 4, with packets of various
 %% sizes.
 
 basic_ping(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(120)),
-    ?line ping(Config, sizes(1), 1, "", []),
-    ?line ping(Config, sizes(2), 2, "", []),
-    ?line ping(Config, sizes(4), 4, "", []),
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(120)),
+    ping(Config, sizes(1), 1, "", []),
+    ping(Config, sizes(2), 2, "", []),
+    ping(Config, sizes(4), 4, "", []),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Let the port program insert delays between characters sent back to
@@ -251,30 +243,29 @@ basic_ping(Config) when is_list(Config) ->
 %% small chunks rather than all at once.
 
 slow_writes(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(20)),
-    ?line ping(Config, [8], 4, "-s1", []),
-    ?line ping(Config, [10], 2, "-s2", []),
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(20)),
+    ping(Config, [8], 4, "-s1", []),
+    ping(Config, [10], 2, "-s2", []),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 bad_packet(doc) ->
     ["Test that we get {'EXIT', Port, einval} if we try to send a bigger "
      "packet than the packet header allows."];
 bad_packet(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line PortTest = port_test(Config),
-    ?line process_flag(trap_exit, true),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    PortTest = port_test(Config),
+    process_flag(trap_exit, true),
 
-    ?line bad_packet(PortTest, 1, 256),
-    ?line bad_packet(PortTest, 1, 257),
-    ?line bad_packet(PortTest, 2, 65536),
-    ?line bad_packet(PortTest, 2, 65537),
+    bad_packet(PortTest, 1, 256),
+    bad_packet(PortTest, 1, 257),
+    bad_packet(PortTest, 2, 65536),
+    bad_packet(PortTest, 2, 65537),
 
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 bad_packet(PortTest, HeaderSize, PacketSize) ->
-    %% Intentionally no ?line macros.
     P = open_port({spawn, PortTest}, [{packet, HeaderSize}]),
     P ! {self(), {command, make_zero_packet(PacketSize)}},
     receive
@@ -292,16 +283,16 @@ make_zero_packet(N) ->
 
 %% Test sending bad messages to a port.
 bad_port_messages(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line PortTest = port_test(Config),
-    ?line process_flag(trap_exit, true),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    PortTest = port_test(Config),
+    process_flag(trap_exit, true),
 
-    ?line bad_message(PortTest, {a,b}),
-    ?line bad_message(PortTest, {a}),
-    ?line bad_message(PortTest, {self(),{command,bad_command}}),
-    ?line bad_message(PortTest, {self(),{connect,no_pid}}),
+    bad_message(PortTest, {a,b}),
+    bad_message(PortTest, {a}),
+    bad_message(PortTest, {self(),{command,bad_command}}),
+    bad_message(PortTest, {self(),{connect,no_pid}}),
 
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 bad_message(PortTest, Message) ->    
@@ -319,108 +310,97 @@ bad_message(PortTest, Message) ->
 %% Tests the 'binary' option for a port.
 
 t_binary(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(300)),
+    Dog = test_server:timetrap(test_server:seconds(300)),
 
     %% Packet mode.
-    ?line ping(Config, sizes(1), 1, "", [binary]),
-    ?line ping(Config, sizes(2), 2, "", [binary]),
-    ?line ping(Config, sizes(4), 4, "", [binary]),
+    ping(Config, sizes(1), 1, "", [binary]),
+    ping(Config, sizes(2), 2, "", [binary]),
+    ping(Config, sizes(4), 4, "", [binary]),
 
     %% Stream mode.
-    case os:type() of
-	vxworks ->
-	    %% don't stress VxWorks too much
-	    ?line stream_ping(Config, 435, "", [binary]),
-	    ?line stream_ping(Config, 43755, "", [binary]),
-	    ?line stream_ping(Config, 50000, "", [binary]);
-	_ ->
-	    ?line stream_ping(Config, 435, "", [binary]),
-	    ?line stream_ping(Config, 43755, "", [binary]),
-	    ?line stream_ping(Config, 100000, "", [binary])
-    end,
+    stream_ping(Config, 435, "", [binary]),
+    stream_ping(Config, 43755, "", [binary]),
+    stream_ping(Config, 100000, "", [binary]),
 
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 name1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(100)),
-    ?line PortTest = port_test(Config),
-    ?line Command = lists:concat([PortTest, " "]),
-    ?line P = open_port({spawn, Command}, []),
-    ?line register(myport, P),
-    ?line P = whereis(myport),
+    Dog = test_server:timetrap(test_server:seconds(100)),
+    PortTest = port_test(Config),
+    Command = lists:concat([PortTest, " "]),
+    P = open_port({spawn, Command}, []),
+    register(myport, P),
+    P = whereis(myport),
     Text = "hej",
-    ?line myport ! {self(), {command, Text}},
-    ?line receive
-	      {P, {data, Text}} ->
-		  ok
-	  end,
-    ?line myport ! {self(), close},
-    ?line receive
-	      {P, closed} -> ok
-	  end,
-    ?line undefined = whereis(myport),
-    ?line test_server:timetrap_cancel(Dog),
+    myport ! {self(), {command, Text}},
+    receive
+        {P, {data, Text}} ->
+            ok
+    end,
+    myport ! {self(), close},
+    receive
+        {P, closed} -> ok
+    end,
+    undefined = whereis(myport),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Test that the 'eof' option works.
 
 eof(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(100)),
-    ?line PortTest = port_test(Config),
-    ?line Command = lists:concat([PortTest, " -h0 -q"]),
-    ?line P = open_port({spawn, Command}, [eof]),
-    ?line receive
-	      {P, eof} ->
-		  ok
-	  end,
-    ?line P ! {self(), close},
-    ?line receive
-	      {P, closed} -> ok
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(100)),
+    PortTest = port_test(Config),
+    Command = lists:concat([PortTest, " -h0 -q"]),
+    P = open_port({spawn, Command}, [eof]),
+    receive
+        {P, eof} ->
+            ok
+    end,
+    P ! {self(), close},
+    receive
+        {P, closed} -> ok
+    end,
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Tests that the 'in' option for a port works.
 
 input_only(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(300)),
-    ?line expect_input(Config, [0, 1, 10, 13, 127, 128, 255], 1, "", [in]),
-    ?line expect_input(Config, [0, 1, 255, 2048], 2, "", [in]),
-    ?line expect_input(Config, [0, 1, 255, 2048], 4, "", [in]),
-    ?line expect_input(Config, [0, 1, 10, 13, 127, 128, 255],
-		       1, "", [in, binary]),
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(300)),
+    expect_input(Config, [0, 1, 10, 13, 127, 128, 255], 1, "", [in]),
+    expect_input(Config, [0, 1, 255, 2048], 2, "", [in]),
+    expect_input(Config, [0, 1, 255, 2048], 4, "", [in]),
+    expect_input(Config, [0, 1, 10, 13, 127, 128, 255],
+                 1, "", [in, binary]),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Tests that the 'out' option for a port works.
 
 output_only(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(100)),
-    ?line Dir = ?config(priv_dir, Config),
-    ?line Filename = filename:join(Dir, "output_only_stream"),
-    ?line output_and_verify(Config, Filename, "-h0",
-			    random_packet(35777, "echo")),
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(100)),
+    Dir = ?config(priv_dir, Config),
+    Filename = filename:join(Dir, "output_only_stream"),
+    output_and_verify(Config, Filename, "-h0",
+          	    random_packet(35777, "echo")),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 output_and_verify(Config, Filename, Options, Data) ->
-    ?line PortTest = port_test(Config),
-    ?line Command = lists:concat([PortTest, " ",
-				  Options, " -o", Filename]),
-    ?line Port = open_port({spawn, Command}, [out]),
-    ?line Port ! {self(), {command, Data}},
-    ?line Port ! {self(), close},
-    ?line receive
-	      {Port, closed} -> ok
-	  end,
-    Wait_time = case os:type() of
-		    vxworks -> 5000;
-		    _ -> 500
-		end,
-    ?line test_server:sleep(Wait_time),
-    ?line {ok, Written} = file:read_file(Filename),
-    ?line Data = binary_to_list(Written),
+    PortTest = port_test(Config),
+    Command = lists:concat([PortTest, " ",
+          		  Options, " -o", Filename]),
+    Port = open_port({spawn, Command}, [out]),
+    Port ! {self(), {command, Data}},
+    Port ! {self(), close},
+    receive
+        {Port, closed} -> ok
+    end,
+    Wait_time = 500,
+    test_server:sleep(Wait_time),
+    {ok, Written} = file:read_file(Filename),
+    Data = binary_to_list(Written),
     ok.
 
 %% Test that receiving several packages written in the same
@@ -430,19 +410,11 @@ output_and_verify(Config, Filename, Options, Data) ->
 %% Basic test of receiving multiple packages, written in
 %% one operation by the other end.
 mul_basic(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(600)),
-    case os:type() of
-	vxworks ->
-	    %% don't stress vxworks too much
-	    ?line expect_input(Config, [0, 1, 255, 10, 13], 1, "", []),
-	    ?line expect_input(Config, [0, 10, 13, 1600, 8191, 16383], 2, "", []),
-	    ?line expect_input(Config, [10, 35000], 4, "", []);
-	_ ->
-	    ?line expect_input(Config, [0, 1, 255, 10, 13], 1, "", []),
-	    ?line expect_input(Config, [0, 10, 13, 1600, 32767, 65535], 2, "", []),
-	    ?line expect_input(Config, [10, 70000], 4, "", [])
-    end,
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(600)),
+    expect_input(Config, [0, 1, 255, 10, 13], 1, "", []),
+    expect_input(Config, [0, 10, 13, 1600, 32767, 65535], 2, "", []),
+    expect_input(Config, [10, 70000], 4, "", []),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Test reading a buffer consisting of several packets, some
@@ -451,9 +423,9 @@ mul_basic(Config) when is_list(Config) ->
 %% delays in between.)
 
 mul_slow_writes(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(250)),
-    ?line expect_input(Config, [0, 20, 255, 10, 1], 1, "-s64", []),
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(250)),
+    expect_input(Config, [0, 20, 255, 10, 1], 1, "-s64", []),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Runs several port tests in parallell.  Each individual test
@@ -461,27 +433,27 @@ mul_slow_writes(Config) when is_list(Config) ->
 %% should also finish in about 5 seconds.
 
 parallell(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(300)),
-    ?line Testers =
-	[fun() -> stream_ping(Config, 1007, "-s100", []) end,
-	 fun() -> stream_ping(Config, 10007, "-s1000", []) end,
-	 fun() -> stream_ping(Config, 10007, "-s1000", []) end,
-
-	 fun() -> expect_input(Config, [21, 22, 23, 24, 25], 1,
-			       "-s10", [in]) end,
-
-	 fun() -> ping(Config, [10], 1, "-d", []) end,
-	 fun() -> ping(Config, [20000], 2, "-d", []) end,
-	 fun() -> ping(Config, [101], 1, "-s10", []) end,
-	 fun() -> ping(Config, [1001], 2, "-s100", []) end,
-	 fun() -> ping(Config, [10001], 4, "-s1000", []) end,
-
-	 fun() -> ping(Config, [501, 501], 2, "-s100", []) end,
-	 fun() -> ping(Config, [11, 12, 13, 14, 11], 1, "-s5", []) end],
-    ?line process_flag(trap_exit, true),
-    ?line Pids = lists:map(fun fun_spawn/1, Testers),
-    ?line wait_for(Pids),
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(300)),
+    Testers = [
+	fun() -> stream_ping(Config, 1007, "-s100", []) end,
+	fun() -> stream_ping(Config, 10007, "-s1000", []) end,
+	fun() -> stream_ping(Config, 10007, "-s1000", []) end,
+
+	fun() -> expect_input(Config, [21, 22, 23, 24, 25], 1,
+		    "-s10", [in]) end,
+
+	fun() -> ping(Config, [10], 1, "-d", []) end,
+	fun() -> ping(Config, [20000], 2, "-d", []) end,
+	fun() -> ping(Config, [101], 1, "-s10", []) end,
+	fun() -> ping(Config, [1001], 2, "-s100", []) end,
+	fun() -> ping(Config, [10001], 4, "-s1000", []) end,
+
+	fun() -> ping(Config, [501, 501], 2, "-s100", []) end,
+	fun() -> ping(Config, [11, 12, 13, 14, 11], 1, "-s5", []) end],
+    process_flag(trap_exit, true),
+    Pids = lists:map(fun fun_spawn/1, Testers),
+    wait_for(Pids),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 wait_for([]) ->
@@ -500,29 +472,29 @@ wait_for(Pids) ->
 
 dying_port(suite) -> [];
 dying_port(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(150)),
-    ?line process_flag(trap_exit, true),
+    Dog = test_server:timetrap(test_server:seconds(150)),
+    process_flag(trap_exit, true),
 
-    ?line P1 = make_dying_port(Config),
-    ?line P2 = make_dying_port(Config),
-    ?line P3 = make_dying_port(Config),
-    ?line P4 = make_dying_port(Config),
-    ?line P5 = make_dying_port(Config),
+    P1 = make_dying_port(Config),
+    P2 = make_dying_port(Config),
+    P3 = make_dying_port(Config),
+    P4 = make_dying_port(Config),
+    P5 = make_dying_port(Config),
 
     %% This should be big enough to be sure to block in the write.
-    ?line Garbage = random_packet(16384),
+    Garbage = random_packet(16384),
 
-    ?line P1 ! {self(), {command, Garbage}},
-    ?line P3 ! {self(), {command, Garbage}},
-    ?line P5 ! {self(), {command, Garbage}},
+    P1 ! {self(), {command, Garbage}},
+    P3 ! {self(), {command, Garbage}},
+    P5 ! {self(), {command, Garbage}},
 
-    ?line wait_for_port_exit(P1),
-    ?line wait_for_port_exit(P2),
-    ?line wait_for_port_exit(P3),
-    ?line wait_for_port_exit(P4),
-    ?line wait_for_port_exit(P5),
+    wait_for_port_exit(P1),
+    wait_for_port_exit(P2),
+    wait_for_port_exit(P3),
+    wait_for_port_exit(P4),
+    wait_for_port_exit(P5),
 
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 wait_for_port_exit(Port) ->
@@ -549,9 +521,9 @@ make_dying_port(Config) when is_list(Config) ->
 
 port_program_with_path(suite) -> [];
 port_program_with_path(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(100)),
-    ?line DataDir = ?config(data_dir, Config),
-    ?line PrivDir = ?config(priv_dir, Config),
+    Dog = test_server:timetrap(test_server:seconds(100)),
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
     
     %% Create a copy of the port test program in a directory not
     %% included in PATH (i.e. in priv_dir), with the name 'my_port_test.exe'.
@@ -560,36 +532,31 @@ port_program_with_path(Config) when is_list(Config) ->
     %% (On Unix, there will be a single file created, which will be
     %% a copy of the port program.)
     
-    ?line PortTest = os:find_executable("port_test", DataDir),
+    PortTest = os:find_executable("port_test", DataDir),
     io:format("os:find_executable(~p, ~p) returned ~p",
 	      ["port_test", DataDir, PortTest]),
-    ?line {ok, PortTestPgm} = file:read_file(PortTest),
-    ?line NewName = filename:join(PrivDir, filename:basename(PortTest)),
-    ?line RedHerring = filename:rootname(NewName),
-    ?line ok = file:write_file(RedHerring, "I'm just here to confuse.\n"),
-    ?line ok = file:write_file(NewName, PortTestPgm),
-    ?line ok = file:write_file_info(NewName, #file_info{mode=8#111}),
-    ?line PgmWithPathAndNoExt = filename:rootname(NewName),
+    {ok, PortTestPgm} = file:read_file(PortTest),
+    NewName = filename:join(PrivDir, filename:basename(PortTest)),
+    RedHerring = filename:rootname(NewName),
+    ok = file:write_file(RedHerring, "I'm just here to confuse.\n"),
+    ok = file:write_file(NewName, PortTestPgm),
+    ok = file:write_file_info(NewName, #file_info{mode=8#111}),
+    PgmWithPathAndNoExt = filename:rootname(NewName),
     
     %% Open the port using the path to the copied port test program,
     %% but without the .exe extension, and verified that it was started.
     %%
     %% If the bug is present the open_port call will fail with badarg.
     
-    ?line Command = lists:concat([PgmWithPathAndNoExt, " -h2"]),
-    %% allow VxWorks time to write file
-    case os:type() of	
-	vxworks -> test_server:sleep(2500);
-	_ -> time
+    Command = lists:concat([PgmWithPathAndNoExt, " -h2"]),
+    P = open_port({spawn, Command}, [{packet, 2}]),
+    Message = "echo back to me",
+    P ! {self(), {command, Message}},
+    receive
+        {P, {data, Message}} ->
+            ok
     end,
-    ?line P = open_port({spawn, Command}, [{packet, 2}]),
-    ?line Message = "echo back to me",
-    ?line P ! {self(), {command, Message}},
-    ?line receive
-	      {P, {data, Message}} ->
-		  ok
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 
@@ -597,56 +564,46 @@ port_program_with_path(Config) when is_list(Config) ->
 %% This used to fail on Windows.
 open_input_file_port(suite) -> [];
 open_input_file_port(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line PrivDir = ?config(priv_dir, Config),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    PrivDir = ?config(priv_dir, Config),
     
     %% Create a file with the file driver and read it back using
     %% open_port/2.
 
-    ?line MyFile1 = filename:join(PrivDir, "my_input_file"),
-    ?line FileData1 = "An input file",
-    ?line ok = file:write_file(MyFile1, FileData1),
-    case os:type() of
-	vxworks ->
-	    %% Can't open input file with vanilla driver on VxWorks
-	    ?line process_flag(trap_exit, true),
-	    ?line case catch open_port(MyFile1, [in]) of
-		      {'EXIT', {badarg, _}} ->
-			  ok
-		  end;
-	_ ->
-	    ?line case open_port(MyFile1, [in]) of
-		      InputPort when is_port(InputPort) ->
-			  ?line receive
-				    {InputPort, {data, FileData1}} ->
-					ok
-				end
-		  end
+    MyFile1 = filename:join(PrivDir, "my_input_file"),
+    FileData1 = "An input file",
+    ok = file:write_file(MyFile1, FileData1),
+    case open_port(MyFile1, [in]) of
+	InputPort when is_port(InputPort) ->
+	    receive
+		{InputPort, {data, FileData1}} ->
+		    ok
+	    end
     end,
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Tests that files can be written using open_port(Filename, [out]).
 open_output_file_port(suite) -> [];
 open_output_file_port(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(100)),
-    ?line PrivDir = ?config(priv_dir, Config),
+    Dog = test_server:timetrap(test_server:seconds(100)),
+    PrivDir = ?config(priv_dir, Config),
 
     %% Create a file with open_port/2 and read it back with
     %% the file driver.
 
-    ?line MyFile2 = filename:join(PrivDir, "my_output_file"),
-    ?line FileData2_0 = "A file created ",
-    ?line FileData2_1 = "with open_port/2.\n",
-    ?line FileData2 = FileData2_0 ++ FileData2_1,
-    ?line OutputPort = open_port(MyFile2, [out]),
-    ?line OutputPort ! {self(), {command, FileData2_0}},
-    ?line OutputPort ! {self(), {command, FileData2_1}},
-    ?line OutputPort ! {self(), close},
-    ?line {ok, Bin} = file:read_file(MyFile2),
-    ?line FileData2 = binary_to_list(Bin),
-
-    ?line test_server:timetrap_cancel(Dog),
+    MyFile2 = filename:join(PrivDir, "my_output_file"),
+    FileData2_0 = "A file created ",
+    FileData2_1 = "with open_port/2.\n",
+    FileData2 = FileData2_0 ++ FileData2_1,
+    OutputPort = open_port(MyFile2, [out]),
+    OutputPort ! {self(), {command, FileData2_0}},
+    OutputPort ! {self(), {command, FileData2_1}},
+    OutputPort ! {self(), close},
+    {ok, Bin} = file:read_file(MyFile2),
+    FileData2 = binary_to_list(Bin),
+
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %%
@@ -670,17 +627,17 @@ iter_max_ports(Config) when is_list(Config) ->
     
     
 iter_max_ports_test(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(20)),
-    ?line PortTest = port_test(Config),
-    ?line Command = lists:concat([PortTest, " -h0 -q"]),
-    ?line Iters = case os:type() of
+    Dog = test_server:timetrap(test_server:minutes(20)),
+    PortTest = port_test(Config),
+    Command = lists:concat([PortTest, " -h0 -q"]),
+    Iters = case os:type() of
 		      {win32,_} -> 4;
 		      _ -> 10
 		  end,
-    ?line L = do_iter_max_ports(Iters, Command),
+    L = do_iter_max_ports(Iters, Command),
     io:format("Result: ~p",[L]),
-    ?line all_equal(L),
-    ?line test_server:timetrap_cancel(Dog),
+    all_equal(L),
+    test_server:timetrap_cancel(Dog),
     {comment, "Max ports: " ++ integer_to_list(hd(L))}.
 
 do_iter_max_ports(N, Command) when N > 0 ->
@@ -695,9 +652,9 @@ all_equal([]) -> ok.
 
 max_ports(Command) ->
     test_server:sleep(500),
-    ?line Ps = open_ports({spawn, Command}, [eof]),
-    ?line N = length(Ps),
-    ?line close_ports(Ps),
+    Ps = open_ports({spawn, Command}, [eof]),
+    N = length(Ps),
+    close_ports(Ps),
     io:format("Got ~p ports\n",[N]),
     N.
 
@@ -727,105 +684,105 @@ open_ports(Name, Settings) ->
 		enomem ->
 		    [];
 		Other ->
-		    ?line test_server:fail({open_ports, Other})
+		    test_server:fail({open_ports, Other})
 	    end;
 	Other ->
-	    ?line test_server:fail({open_ports, Other})
+	    test_server:fail({open_ports, Other})
     end.
 
 %% Tests that exit(Port, Term) works (has been known to crash the emulator).
 
 t_exit(suite) -> [];
 t_exit(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line Pid = fun_spawn(fun suicide_port/1, [Config]),
-    ?line receive
-	      {'EXIT', Pid, die} ->
-		  ok;
-	      Other ->
-		  test_server:fail({bad_message, Other})
-	  end.
+    process_flag(trap_exit, true),
+    Pid = fun_spawn(fun suicide_port/1, [Config]),
+    receive
+	{'EXIT', Pid, die} ->
+	    ok;
+	Other ->
+	    test_server:fail({bad_message, Other})
+    end.
 
 suicide_port(Config) when is_list(Config) ->
-    ?line Port = port_expect(Config, [], 0, "", []),
-    ?line exit(Port, die),
-    ?line receive after infinity -> ok end.
+    Port = port_expect(Config, [], 0, "", []),
+    exit(Port, die),
+    receive after infinity -> ok end.
 
 
 tps_16_bytes(doc) -> "";
 tps_16_bytes(suite) -> [];
 tps_16_bytes(Config) when is_list(Config) ->
-    ?line tps(16, Config).
+    tps(16, Config).
 
 tps_1K(doc) -> "";
 tps_1K(suite) -> [];
 tps_1K(Config) when is_list(Config) ->
-    ?line tps(1024, Config).
+    tps(1024, Config).
 
 tps(Size, Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(300)),
-    ?line PortTest = port_test(Config),
-    ?line Packet = list_to_binary(random_packet(Size, "e")),
-    ?line Port = open_port({spawn, PortTest}, [binary, {packet, 2}]),
-    ?line Transactions = 10000,
-    ?line {Elapsed, ok} = test_server:timecall(?MODULE, tps,
+    Dog = test_server:timetrap(test_server:seconds(300)),
+    PortTest = port_test(Config),
+    Packet = list_to_binary(random_packet(Size, "e")),
+    Port = open_port({spawn, PortTest}, [binary, {packet, 2}]),
+    Transactions = 10000,
+    {Elapsed, ok} = test_server:timecall(?MODULE, tps,
 					       [Port, Packet, Transactions]),
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     {comment, integer_to_list(trunc(Transactions/Elapsed+0.5)) ++ " transactions/s"}.
 
 tps(_Port, _Packet, 0) -> ok;
 tps(Port, Packet, N) ->
-    ?line port_command(Port, Packet),
-    ?line receive
-	      {Port, {data, Packet}} ->
-		  ?line tps(Port, Packet, N-1);
-	      Other ->
-		  ?line test_server:fail({bad_message, Other})
-	  end.
+    port_command(Port, Packet),
+    receive
+	{Port, {data, Packet}} ->
+	    tps(Port, Packet, N-1);
+	Other ->
+	    test_server:fail({bad_message, Other})
+    end.
 
 %% Line I/O test
 line(Config) when is_list(Config) ->
-    ?line Siz = 110,
-    ?line Dog = test_server:timetrap(test_server:seconds(300)),
-    ?line Packet1 = random_packet(Siz),
-    ?line Packet2 = random_packet(Siz div 2),
+    Siz = 110,
+    Dog = test_server:timetrap(test_server:seconds(300)),
+    Packet1 = random_packet(Siz),
+    Packet2 = random_packet(Siz div 2),
     %% Test that packets are split into lines
-    ?line port_expect(Config,[{lists:append([Packet1, io_lib:nl(), Packet2,
+    port_expect(Config,[{lists:append([Packet1, io_lib:nl(), Packet2,
 					     io_lib:nl()]),
 			       [{eol, Packet1}, {eol, Packet2}]}],
 		      0, "", [{line,Siz}]),
     %% Test the same for binaries
-    ?line port_expect(Config,[{lists:append([Packet1, io_lib:nl(), Packet2,
+    port_expect(Config,[{lists:append([Packet1, io_lib:nl(), Packet2,
 					     io_lib:nl()]),
 			       [{eol, Packet1}, {eol, Packet2}]}],
 		      0, "", [{line,Siz},binary]),
     %% Test that too long lines get split
-    ?line port_expect(Config,[{lists:append([Packet1, io_lib:nl(), Packet1,
+    port_expect(Config,[{lists:append([Packet1, io_lib:nl(), Packet1,
 					     Packet2, io_lib:nl()]),
 			       [{eol, Packet1}, {noeol, Packet1},
 				{eol, Packet2}]}], 0, "", [{line,Siz}]),
     %% Test that last output from closing port program gets received.
-    ?line L1 = lists:append([Packet1, io_lib:nl(), Packet2]),
-    ?line S1 = lists:flatten(io_lib:format("-l~w", [length(L1)])),
+    L1 = lists:append([Packet1, io_lib:nl(), Packet2]),
+    S1 = lists:flatten(io_lib:format("-l~w", [length(L1)])),
     io:format("S1 = ~w, L1 = ~w~n", [S1,L1]),
-    ?line port_expect(Config,[{L1,
+    port_expect(Config,[{L1,
 			       [{eol, Packet1}, {noeol, Packet2}, eof]}], 0, 
 		      S1, [{line,Siz},eof]),
     %% Test that lonely <CR> Don't get treated as newlines
-    ?line port_expect(Config,[{lists:append([Packet1, [13], Packet2,
+    port_expect(Config,[{lists:append([Packet1, [13], Packet2,
 					     io_lib:nl()]),
 			       [{noeol, Packet1}, {eol, [13 |Packet2]}]}],
 		      0, "", [{line,Siz}]),
     %% Test that packets get built up to lines (delayed output from
     %% port program)
-    ?line port_expect(Config,[{Packet2,[]},
+    port_expect(Config,[{Packet2,[]},
 			      {lists:append([Packet2, io_lib:nl(),
 					     Packet1, io_lib:nl()]),
 			       [{eol, lists:append(Packet2, Packet2)},
 				{eol, Packet1}]}], 0, "-d", [{line,Siz}]),
     %% Test that we get badarg if trying both packet and line
-    ?line bad_argument(Config, [{packet, 5}, {line, 5}]),
-    ?line test_server:timetrap_cancel(Dog),
+    bad_argument(Config, [{packet, 5}, {line, 5}]),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %%% Redirection of stderr test
@@ -834,15 +791,15 @@ stderr_to_stdout(suite) ->
 stderr_to_stdout(doc) ->
     "Test that redirection of standard error to standard output works.";
 stderr_to_stdout(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
+    Dog = test_server:timetrap(test_server:seconds(60)),
     %% See that it works
-    ?line Packet = random_packet(10),
-    ?line port_expect(Config,[{Packet,[Packet]}], 0, "-e -l10",
+    Packet = random_packet(10),
+    port_expect(Config,[{Packet,[Packet]}], 0, "-e -l10",
 		      [stderr_to_stdout]),
-    %% ?line stream_ping(Config, 10, "-e", [stderr_to_stdout]),
+    %% stream_ping(Config, 10, "-e", [stderr_to_stdout]),
     %% See that it doesn't always happen (will generate garbage on stderr)
-    ?line port_expect(Config,[{Packet,[eof]}], 0, "-e -l10", [line,eof]),
-    ?line test_server:timetrap_cancel(Dog),
+    port_expect(Config,[{Packet,[eof]}], 0, "-e -l10", [line,eof]),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 
@@ -862,47 +819,39 @@ env(suite) ->
 env(doc) ->
     ["Test that the 'env' option works"];
 env(Config)  when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skipped,"Environments not implemented on VxWorks (could be...)"};
-	_ ->
-	    env2(Config)
-    end.
-
-env2(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
-    ?line Priv = ?config(priv_dir, Config),
-    ?line Temp = filename:join(Priv, "env_fun.bin"),
+    Dog = test_server:timetrap(test_server:seconds(60)),
+    Priv = ?config(priv_dir, Config),
+    Temp = filename:join(Priv, "env_fun.bin"),
 
     PluppVal = "dirty monkey",
-    ?line env_slave(Temp, [{"plupp",PluppVal}]),
+    env_slave(Temp, [{"plupp",PluppVal}]),
 
     Long = "LongAndBoringEnvName",
-    ?line os:putenv(Long, "nisse"),
-    
-    ?line env_slave(Temp, [{"plupp",PluppVal},
-			   {"DIR_PLUPP","###glurfrik"}],
-		    fun() ->
-			    PluppVal = os:getenv("plupp"),
-			    "###glurfrik" = os:getenv("DIR_PLUPP"),
-			    "nisse" = os:getenv(Long)
-		    end),
+    os:putenv(Long, "nisse"),
+
+    env_slave(Temp, [{"plupp",PluppVal},
+	    {"DIR_PLUPP","###glurfrik"}],
+	fun() ->
+		PluppVal = os:getenv("plupp"),
+		"###glurfrik" = os:getenv("DIR_PLUPP"),
+		"nisse" = os:getenv(Long)
+	end),
 
-    
-    ?line env_slave(Temp, [{"must_define_something","some_value"},
-			    {"certainly_not_existing",false},
-                           {"ends_with_equal", "value="},
-			   {Long,false},
-			   {"glurf","a glorfy string"}]),
+
+    env_slave(Temp, [{"must_define_something","some_value"},
+	    {"certainly_not_existing",false},
+	    {"ends_with_equal", "value="},
+	    {Long,false},
+	    {"glurf","a glorfy string"}]),
 
     %% A lot of non existing variables (mingled with existing)
     NotExistingList = [{lists:flatten(io_lib:format("V~p_not_existing",[X])),false} 
                         ||  X <- lists:seq(1,150)],
     ExistingList = [{lists:flatten(io_lib:format("V~p_existing",[X])),"a_value"} 
                         ||  X <- lists:seq(1,150)],
-    ?line env_slave(Temp, lists:sort(ExistingList ++ NotExistingList)),
+    env_slave(Temp, lists:sort(ExistingList ++ NotExistingList)),
 
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 env_slave(File, Env) ->
@@ -946,23 +895,15 @@ env_slave_main([File]) ->
 %% 'env' option
 %%   Test bad environments.
 bad_env(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skipped,"Environments not implemented on VxWorks"};
-	_ ->
-	    bad_env_1()
-    end.
-
-bad_env_1() ->
-    ?line try_bad_env([abbb]),
-    ?line try_bad_env([{"key","value"}|{"another","value"}]),
-    ?line try_bad_env([{"key","value","value2"}]),
-    ?line try_bad_env([{"key",[a,b,c]}]),
-    ?line try_bad_env([{"key",value}]),
-    ?line try_bad_env({a,tuple}),
-    ?line try_bad_env(42),
-    ?line try_bad_env([a|b]),
-    ?line try_bad_env(self()),
+    try_bad_env([abbb]),
+    try_bad_env([{"key","value"}|{"another","value"}]),
+    try_bad_env([{"key","value","value2"}]),
+    try_bad_env([{"key",[a,b,c]}]),
+    try_bad_env([{"key",value}]),
+    try_bad_env({a,tuple}),
+    try_bad_env(42),
+    try_bad_env([a|b]),
+    try_bad_env(self()),
     ok.
 
 try_bad_env(Env) ->
@@ -979,36 +920,29 @@ cd(suite) ->
 cd(doc) ->
     ["Test that the 'cd' option works"];
 cd(Config)  when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skipped,"Task specific directories does not exist on VxWorks"};
-	_ ->
-	    cd2(Config)
-    end.
-cd2(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
-
-    ?line Program = atom_to_list(lib:progname()),
-    ?line DataDir = ?config(data_dir, Config),
-    ?line TestDir = filename:join(DataDir, "dir"),
-    ?line Cmd = Program ++ " -pz " ++ DataDir ++
-	" -noshell -s port_test pwd -s erlang halt",
-    ?line _ = open_port({spawn, Cmd},
-			[{cd, TestDir},
-			 {line, 256}]),
-    ?line receive
-	      {_, {data, {eol, String}}} ->
-		  case filename_equal(String, TestDir) of
-		      true ->
-			  ok;
-		      false ->
-			  ?line test_server:fail({cd, String})
-		  end;
-	      Other2 ->
-		  ?line test_server:fail({env, Other2})
-	  end,
+    Dog = test_server:timetrap(test_server:seconds(60)),
 
-    ?line test_server:timetrap_cancel(Dog),
+    Program = atom_to_list(lib:progname()),
+    DataDir = ?config(data_dir, Config),
+    TestDir = filename:join(DataDir, "dir"),
+    Cmd = Program ++ " -pz " ++ DataDir ++
+        " -noshell -s port_test pwd -s erlang halt",
+    _ = open_port({spawn, Cmd},
+	[{cd, TestDir},
+	    {line, 256}]),
+    receive
+	{_, {data, {eol, String}}} ->
+	    case filename_equal(String, TestDir) of
+		true ->
+		    ok;
+		false ->
+		    test_server:fail({cd, String})
+	    end;
+	Other2 ->
+	    test_server:fail({env, Other2})
+    end,
+
+    test_server:timetrap_cancel(Dog),
     ok.
 
 filename_equal(A, B) ->
@@ -1059,8 +993,8 @@ otp_3906(Config)  when is_list(Config) ->
 -define(OTP_3906_MAX_CONC_OSP, 50).
 
 otp_3906(Config, OSName) ->
-    ?line DataDir = filename:dirname(proplists:get_value(data_dir,Config)),
-    ?line {ok, Variables} = file:consult(
+    DataDir = filename:dirname(proplists:get_value(data_dir,Config)),
+    {ok, Variables} = file:consult(
 			      filename:join([DataDir,"..","..",
 					     "test_server","variables"])),
     case lists:keysearch('CC', 1, Variables) of
@@ -1105,7 +1039,7 @@ otp_3906(Config, OSName) ->
 		succeded ->
 		    ok;
 		_ ->
-		    ?line test_server:fail(Result)
+		    test_server:fail(Result)
 	    end;
 	_ ->
 	    {skipped, "No C compiler found"}
@@ -1246,15 +1180,15 @@ otp_4389(doc) -> [];
 otp_4389(Config)  when is_list(Config) ->
     case os:type() of
 	{unix, _} ->
-	    ?line Dog = test_server:timetrap(test_server:seconds(240)),
-	    ?line TCR = self(),
+	    Dog = test_server:timetrap(test_server:seconds(240)),
+	    TCR = self(),
 	    case get_true_cmd() of
 		True when is_list(True) ->
-		    ?line lists:foreach(
+		    lists:foreach(
 			    fun (P) ->
-				    ?line receive
-					      {P, ok} ->  ?line ok;
-					      {P, Err} -> ?line ?t:fail(Err)
+				    receive
+					      {P, ok} ->  ok;
+					      {P, Err} -> ?t:fail(Err)
 					  end
 			    end,
 			    lists:map(
@@ -1283,14 +1217,14 @@ otp_4389(Config)  when is_list(Config) ->
 					end)
 			      end,
 			      lists:duplicate(1000,[]))),
-		    ?line test_server:timetrap_cancel(Dog),
+		    test_server:timetrap_cancel(Dog),
 		    {comment,
 		     "This test case doesn't always fail when the bug that "
 		     "it tests for is present (it is most likely to fail on"
 		     " a multi processor machine). If the test case fails it"
 		     " will fail by deadlocking the emulator."};
 		_ ->
-		    ?line {skipped, "\"true\" command not found"}
+		    {skipped, "\"true\" command not found"}
 	    end;
 	_ ->
 	    {skip,"Only run on Unix"}
@@ -1320,11 +1254,11 @@ exit_status(suite) ->
 exit_status(doc) ->
     ["Test that the 'exit_status' option works"];
 exit_status(Config)  when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
-    ?line port_expect(Config,[{"x",
+    Dog = test_server:timetrap(test_server:seconds(60)),
+    port_expect(Config,[{"x",
 			       [{exit_status, 5}]}],
 		      1, "", [exit_status]),
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 spawn_driver(suite) ->
@@ -1332,36 +1266,36 @@ spawn_driver(suite) ->
 spawn_driver(doc) ->
     ["Test spawning a driver specifically"];
 spawn_driver(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line ok = load_driver(Path, "echo_drv"),
-    ?line Port = erlang:open_port({spawn_driver, "echo_drv"}, []),
-    ?line Port ! {self(), {command, "Hello port!"}},
-    ?line receive 
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    Path = ?config(data_dir, Config),
+    ok = load_driver(Path, "echo_drv"),
+    Port = erlang:open_port({spawn_driver, "echo_drv"}, []),
+    Port ! {self(), {command, "Hello port!"}},
+    receive 
 	      {Port, {data, "Hello port!"}} = Msg1 -> 
 		  io:format("~p~n", [Msg1]),
 		  ok; 
 	      Other ->
 		  test_server:fail({unexpected, Other})
 	  end,
-    ?line Port ! {self(), close},
-    ?line receive {Port, closed} -> ok end,
+    Port ! {self(), close},
+    receive {Port, closed} -> ok end,
 
-    ?line Port2 = erlang:open_port({spawn_driver, "echo_drv -Hello port?"}, 
+    Port2 = erlang:open_port({spawn_driver, "echo_drv -Hello port?"}, 
 				   []),
-    ?line receive 
+    receive 
 	      {Port2, {data, "Hello port?"}} = Msg2 -> 
 		  io:format("~p~n", [Msg2]),
 		  ok; 
 	      Other2 ->
 		  test_server:fail({unexpected2, Other2})
 	  end,
-    ?line Port2 ! {self(), close},
-    ?line receive {Port2, closed} -> ok end,
-    ?line {'EXIT',{badarg,_}} = (catch erlang:open_port({spawn_driver, "ls"}, [])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:open_port({spawn_driver, "cmd"}, [])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:open_port({spawn_driver, os:find_executable("erl")}, [])),
-    ?line test_server:timetrap_cancel(Dog),
+    Port2 ! {self(), close},
+    receive {Port2, closed} -> ok end,
+    {'EXIT',{badarg,_}} = (catch erlang:open_port({spawn_driver, "ls"}, [])),
+    {'EXIT',{badarg,_}} = (catch erlang:open_port({spawn_driver, "cmd"}, [])),
+    {'EXIT',{badarg,_}} = (catch erlang:open_port({spawn_driver, os:find_executable("erl")}, [])),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 spawn_executable(suite) ->
@@ -1369,48 +1303,48 @@ spawn_executable(suite) ->
 spawn_executable(doc) ->
     ["Test spawning an executable specifically"];
 spawn_executable(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line DataDir = ?config(data_dir, Config),
-    ?line EchoArgs1 = filename:join([DataDir,"echo_args"]),
-    ?line ExactFile1 = filename:nativename(os:find_executable(EchoArgs1)),
-    ?line [ExactFile1] = run_echo_args(DataDir,[]),
-    ?line ["echo_args"] = run_echo_args(DataDir,["echo_args"]),
-    ?line ["echo_arguments"] = run_echo_args(DataDir,["echo_arguments"]),
-    ?line [ExactFile1,"hello world","dlrow olleh"] = 
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    DataDir = ?config(data_dir, Config),
+    EchoArgs1 = filename:join([DataDir,"echo_args"]),
+    ExactFile1 = filename:nativename(os:find_executable(EchoArgs1)),
+    [ExactFile1] = run_echo_args(DataDir,[]),
+    ["echo_args"] = run_echo_args(DataDir,["echo_args"]),
+    ["echo_arguments"] = run_echo_args(DataDir,["echo_arguments"]),
+    [ExactFile1,"hello world","dlrow olleh"] = 
 	run_echo_args(DataDir,[ExactFile1,"hello world","dlrow olleh"]),
-    ?line [ExactFile1] = run_echo_args(DataDir,[default]),
-    ?line [ExactFile1,"hello world","dlrow olleh"] = 
+    [ExactFile1] = run_echo_args(DataDir,[default]),
+    [ExactFile1,"hello world","dlrow olleh"] = 
 	run_echo_args(DataDir,[switch_order,ExactFile1,"hello world",
 			       "dlrow olleh"]),
-    ?line [ExactFile1,"hello world","dlrow olleh"] = 
+    [ExactFile1,"hello world","dlrow olleh"] = 
 	run_echo_args(DataDir,[default,"hello world","dlrow olleh"]),
 
-    ?line [ExactFile1,"hello world","dlrow olleh"] = 
+    [ExactFile1,"hello world","dlrow olleh"] = 
 	run_echo_args_2("\""++ExactFile1++"\" "++"\"hello world\" \"dlrow olleh\""),
 
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line SpaceDir =filename:join([PrivDir,"With Spaces"]),
-    ?line file:make_dir(SpaceDir),
-    ?line Executable = filename:basename(ExactFile1),
-    ?line file:copy(ExactFile1,filename:join([SpaceDir,Executable])),
-    ?line ExactFile2 = filename:nativename(filename:join([SpaceDir,Executable])),
-    ?line chmodplusx(ExactFile2),
+    PrivDir = ?config(priv_dir, Config),
+    SpaceDir =filename:join([PrivDir,"With Spaces"]),
+    file:make_dir(SpaceDir),
+    Executable = filename:basename(ExactFile1),
+    file:copy(ExactFile1,filename:join([SpaceDir,Executable])),
+    ExactFile2 = filename:nativename(filename:join([SpaceDir,Executable])),
+    chmodplusx(ExactFile2),
     io:format("|~s|~n",[ExactFile2]),
-    ?line [ExactFile2] = run_echo_args(SpaceDir,[]),
-    ?line ["echo_args"] = run_echo_args(SpaceDir,["echo_args"]),
-    ?line ["echo_arguments"] = run_echo_args(SpaceDir,["echo_arguments"]),
-    ?line [ExactFile2,"hello world","dlrow olleh"] = 
+    [ExactFile2] = run_echo_args(SpaceDir,[]),
+    ["echo_args"] = run_echo_args(SpaceDir,["echo_args"]),
+    ["echo_arguments"] = run_echo_args(SpaceDir,["echo_arguments"]),
+    [ExactFile2,"hello world","dlrow olleh"] = 
 	run_echo_args(SpaceDir,[ExactFile2,"hello world","dlrow olleh"]),
-    ?line [ExactFile2] = run_echo_args(SpaceDir,[default]),
-    ?line [ExactFile2,"hello world","dlrow olleh"] = 
+    [ExactFile2] = run_echo_args(SpaceDir,[default]),
+    [ExactFile2,"hello world","dlrow olleh"] = 
 	run_echo_args(SpaceDir,[switch_order,ExactFile2,"hello world",
 			       "dlrow olleh"]),
-    ?line [ExactFile2,"hello world","dlrow olleh"] = 
+    [ExactFile2,"hello world","dlrow olleh"] = 
 	run_echo_args(SpaceDir,[default,"hello world","dlrow olleh"]),
-    ?line [ExactFile2,"hello world","dlrow olleh"] = 
+    [ExactFile2,"hello world","dlrow olleh"] = 
 	run_echo_args_2("\""++ExactFile2++"\" "++"\"hello world\" \"dlrow olleh\""),
 
-    ?line ExeExt = 
+    ExeExt = 
 	case string:to_lower(lists:last(string:tokens(ExactFile2,"."))) of
 	    "exe" ->
 		".exe";
@@ -1418,47 +1352,47 @@ spawn_executable(Config) when is_list(Config) ->
 		""
 	end,
     Executable2 = "spoky name"++ExeExt,
-    ?line file:copy(ExactFile1,filename:join([SpaceDir,Executable2])),
-    ?line ExactFile3 = filename:nativename(filename:join([SpaceDir,Executable2])),
-    ?line chmodplusx(ExactFile3),
-    ?line [ExactFile3] = run_echo_args(SpaceDir,Executable2,[]),
-    ?line ["echo_args"] = run_echo_args(SpaceDir,Executable2,["echo_args"]),
-    ?line ["echo_arguments"] = run_echo_args(SpaceDir,Executable2,["echo_arguments"]),
-    ?line [ExactFile3,"hello world","dlrow olleh"] = 
+    file:copy(ExactFile1,filename:join([SpaceDir,Executable2])),
+    ExactFile3 = filename:nativename(filename:join([SpaceDir,Executable2])),
+    chmodplusx(ExactFile3),
+    [ExactFile3] = run_echo_args(SpaceDir,Executable2,[]),
+    ["echo_args"] = run_echo_args(SpaceDir,Executable2,["echo_args"]),
+    ["echo_arguments"] = run_echo_args(SpaceDir,Executable2,["echo_arguments"]),
+    [ExactFile3,"hello world","dlrow olleh"] = 
 	run_echo_args(SpaceDir,Executable2,[ExactFile3,"hello world","dlrow olleh"]),
-    ?line [ExactFile3] = run_echo_args(SpaceDir,Executable2,[default]),
-    ?line [ExactFile3,"hello world","dlrow olleh"] = 
+    [ExactFile3] = run_echo_args(SpaceDir,Executable2,[default]),
+    [ExactFile3,"hello world","dlrow olleh"] = 
 	run_echo_args(SpaceDir,Executable2,
 		      [switch_order,ExactFile3,"hello world",
 		       "dlrow olleh"]),
-    ?line [ExactFile3,"hello world","dlrow olleh"] = 
+    [ExactFile3,"hello world","dlrow olleh"] = 
 	run_echo_args(SpaceDir,Executable2,
 		      [default,"hello world","dlrow olleh"]),
-    ?line [ExactFile3,"hello world","dlrow olleh"] = 
+    [ExactFile3,"hello world","dlrow olleh"] = 
 	run_echo_args_2("\""++ExactFile3++"\" "++"\"hello world\" \"dlrow olleh\""),
-    ?line {'EXIT',{enoent,_}} = (catch run_echo_args(SpaceDir,"fnurflmonfi",
+    {'EXIT',{enoent,_}} = (catch run_echo_args(SpaceDir,"fnurflmonfi",
 						     [default,"hello world",
 						      "dlrow olleh"])),
     NonExec = "kronxfrt"++ExeExt,
-    ?line file:write_file(filename:join([SpaceDir,NonExec]),
+    file:write_file(filename:join([SpaceDir,NonExec]),
 			  <<"Not an executable">>),
-    ?line {'EXIT',{eacces,_}} = (catch run_echo_args(SpaceDir,NonExec,
+    {'EXIT',{eacces,_}} = (catch run_echo_args(SpaceDir,NonExec,
 						     [default,"hello world",
 						      "dlrow olleh"])),
-    ?line {'EXIT',{enoent,_}} = (catch open_port({spawn_executable,"cmd"},[])),
-    ?line {'EXIT',{enoent,_}} = (catch open_port({spawn_executable,"sh"},[])),
+    {'EXIT',{enoent,_}} = (catch open_port({spawn_executable,"cmd"},[])),
+    {'EXIT',{enoent,_}} = (catch open_port({spawn_executable,"sh"},[])),
     case os:type() of
 	{win32,_} ->
 	    test_bat_file(SpaceDir);
 	{unix,_} ->
 	    test_sh_file(SpaceDir)
     end,
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 unregister_name(Config) when is_list(Config) ->
-    ?line true = register(crash, open_port({spawn, "sleep 100"}, [])),
-    ?line true = unregister(crash).
+    true = register(crash, open_port({spawn, "sleep 100"}, [])),
+    true = unregister(crash).
 
 test_bat_file(Dir) ->
     FN = "tf.bat",
@@ -1478,16 +1412,16 @@ test_bat_file(Dir) ->
 	 <<"\r\n">>,
 	 <<":done\r\n">>,
 	 <<"\r\n">>],
-    ?line file:write_file(Full,list_to_binary(D)),
-    ?line EF = filename:basename(FN),
-    ?line [DN,"hello","world"] = 
+    file:write_file(Full,list_to_binary(D)),
+    EF = filename:basename(FN),
+    [DN,"hello","world"] = 
 	run_echo_args(Dir,FN,
 		      [default,"hello","world"]),
     %% The arg0 argumant should be ignored when running batch files
-    ?line [DN,"hello","world"] = 
+    [DN,"hello","world"] = 
 	run_echo_args(Dir,FN,
 		      ["knaskurt","hello","world"]),
-    ?line EF = filename:basename(DN),
+    EF = filename:basename(DN),
     ok.
 
 test_sh_file(Dir) ->
@@ -1501,20 +1435,20 @@ test_sh_file(Dir) ->
 	 <<"    shift\n">>,
 	 <<"    i=`expr $i + 1`\n">>,
 	 <<"done\n">>],
-    ?line file:write_file(Full,list_to_binary(D)),
-    ?line chmodplusx(Full),
-    ?line [Full,"hello","world"] = 
+    file:write_file(Full,list_to_binary(D)),
+    chmodplusx(Full),
+    [Full,"hello","world"] = 
 	run_echo_args(Dir,FN,
 		      [default,"hello","world"]),
-    ?line [Full,"hello","world of spaces"] = 
+    [Full,"hello","world of spaces"] = 
 	run_echo_args(Dir,FN,
 		      [default,"hello","world of spaces"]),
-    ?line file:write_file(filename:join([Dir,"testfile1"]),<<"testdata1">>),
-    ?line file:write_file(filename:join([Dir,"testfile2"]),<<"testdata2">>),
-    ?line Pattern = filename:join([Dir,"testfile*"]),
-    ?line L = filelib:wildcard(Pattern),
-    ?line 2 = length(L),
-    ?line [Full,"hello",Pattern] = 
+    file:write_file(filename:join([Dir,"testfile1"]),<<"testdata1">>),
+    file:write_file(filename:join([Dir,"testfile2"]),<<"testdata2">>),
+    Pattern = filename:join([Dir,"testfile*"]),
+    L = filelib:wildcard(Pattern),
+    2 = length(L),
+    [Full,"hello",Pattern] = 
 	run_echo_args(Dir,FN,
 		      [default,"hello",Pattern]),
      ok.
@@ -1574,25 +1508,25 @@ mix_up_ports(suite) ->
 mix_up_ports(doc) ->
     ["Test that the emulator does not mix up ports when the port table wraps"];
 mix_up_ports(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line ok = load_driver(Path, "echo_drv"),
-    ?line Port = erlang:open_port({spawn, "echo_drv"}, []),
-    ?line Port ! {self(), {command, "Hello port!"}},
-    ?line receive 
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    Path = ?config(data_dir, Config),
+    ok = load_driver(Path, "echo_drv"),
+    Port = erlang:open_port({spawn, "echo_drv"}, []),
+    Port ! {self(), {command, "Hello port!"}},
+    receive 
 	      {Port, {data, "Hello port!"}} = Msg1 -> 
 		  io:format("~p~n", [Msg1]),
 		  ok; 
 	      Other ->
 		  test_server:fail({unexpected, Other})
 	  end,
-    ?line Port ! {self(), close},
-    ?line receive {Port, closed} -> ok end,
-    ?line loop(start, done,
+    Port ! {self(), close},
+    receive {Port, closed} -> ok end,
+    loop(start, done,
 	       fun(P) ->
-		       ?line Q = 
+		       Q = 
 			   (catch erlang:open_port({spawn, "echo_drv"}, [])),
-%%		       ?line io:format("~p ", [Q]),
+%%		       io:format("~p ", [Q]),
 		       if is_port(Q) ->
 			       Q;
 			  true ->
@@ -1600,14 +1534,14 @@ mix_up_ports(Config) when is_list(Config) ->
 			       done
 		       end
 	       end),
-    ?line Port ! {self(), {command, "Hello again port!"}},
-    ?line receive 
+    Port ! {self(), {command, "Hello again port!"}},
+    receive 
 	      Msg2 ->
 		  test_server:fail({unexpected, Msg2})
 	  after 1000 ->
 		  ok
 	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 loop(Stop, Stop, Fun) when is_function(Fun) ->
@@ -1622,45 +1556,45 @@ otp_5112(doc) ->
     ["Test that link to connected process is taken away when port calls",
      "driver_exit() also when the port index has wrapped"];
 otp_5112(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line ok = load_driver(Path, "exit_drv"),
-    ?line Port = otp_5112_get_wrapped_port(),
-    ?line ?t:format("Max ports: ~p~n",[max_ports()]),
-    ?line ?t:format("Port: ~p~n",[Port]),
-    ?line {links, Links1} = process_info(self(),links),
-    ?line ?t:format("Links1: ~p~n",[Links1]),
-    ?line true = lists:member(Port, Links1),
-    ?line Port ! {self(), {command, ""}},
-    ?line {links, Links2} = process_info(self(),links),
-    ?line ?t:format("Links2: ~p~n",[Links2]),
-    ?line false = lists:member(Port, Links2), %% This used to fail
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    Path = ?config(data_dir, Config),
+    ok = load_driver(Path, "exit_drv"),
+    Port = otp_5112_get_wrapped_port(),
+    ?t:format("Max ports: ~p~n",[max_ports()]),
+    ?t:format("Port: ~p~n",[Port]),
+    {links, Links1} = process_info(self(),links),
+    ?t:format("Links1: ~p~n",[Links1]),
+    true = lists:member(Port, Links1),
+    Port ! {self(), {command, ""}},
+    {links, Links2} = process_info(self(),links),
+    ?t:format("Links2: ~p~n",[Links2]),
+    false = lists:member(Port, Links2), %% This used to fail
+    test_server:timetrap_cancel(Dog),
     ok.
 
 otp_5112_get_wrapped_port() ->
-    ?line P1 = erlang:open_port({spawn, "exit_drv"}, []),
-    ?line case port_ix(P1) < max_ports() of
+    P1 = erlang:open_port({spawn, "exit_drv"}, []),
+    case port_ix(P1) < max_ports() of
 	      true ->
-		  ?line ?t:format("Need to wrap port index (~p)~n", [P1]),
-		  ?line otp_5112_wrap_port_ix([P1]),
-		  ?line P2 = erlang:open_port({spawn, "exit_drv"}, []),
-		  ?line false = port_ix(P2) < max_ports(),
-		  ?line P2;
+		  ?t:format("Need to wrap port index (~p)~n", [P1]),
+		  otp_5112_wrap_port_ix([P1]),
+		  P2 = erlang:open_port({spawn, "exit_drv"}, []),
+		  false = port_ix(P2) < max_ports(),
+		  P2;
 	      false ->
-		  ?line ?t:format("Port index already wrapped (~p)~n", [P1]),
-		  ?line P1
+		  ?t:format("Port index already wrapped (~p)~n", [P1]),
+		  P1
 	  end.
 
 otp_5112_wrap_port_ix(Ports) ->
-    ?line case (catch erlang:open_port({spawn, "exit_drv"}, [])) of
+    case (catch erlang:open_port({spawn, "exit_drv"}, [])) of
 	      Port when is_port(Port) ->
-		  ?line otp_5112_wrap_port_ix([Port|Ports]);
+		  otp_5112_wrap_port_ix([Port|Ports]);
 	      _ ->
 		  %% Port table now full; empty port table
-		  ?line lists:foreach(fun (P) ->  P ! {self(), close} end,
+		  lists:foreach(fun (P) ->  P ! {self(), close} end,
 				      Ports),
-		  ?line ok
+		  ok
 	  end.
 
 
@@ -1669,106 +1603,105 @@ otp_5119(suite) ->
 otp_5119(doc) ->
     ["Test that port index is not unnecessarily wrapped"];
 otp_5119(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line ok = load_driver(Path, "exit_drv"),
-    ?line PI1 = port_ix(otp_5119_fill_empty_port_tab([])),
-    ?line PI2 = port_ix(erlang:open_port({spawn, "exit_drv"}, [])),
-    ?line {PortIx1, PortIx2}
-	= case PI2 > PI1 of
-	      true ->
-		  ?line {PI1, PI2};
-	      false ->
-		  ?line {port_ix(otp_5119_fill_empty_port_tab([PI2])),
-			 port_ix(erlang:open_port({spawn, "exit_drv"}, []))}
-	  end,
-    ?line MaxPorts = max_ports(),
-    ?line ?t:format("PortIx1 = ~p ~p~n", [PI1, PortIx1]),
-    ?line ?t:format("PortIx2 = ~p ~p~n", [PI2, PortIx2]),
-    ?line ?t:format("MaxPorts = ~p~n", [MaxPorts]),
-    ?line true = PortIx2 > PortIx1,
-    ?line true = PortIx2 =< PortIx1 + MaxPorts,
-    ?line test_server:timetrap_cancel(Dog),
-    ?line ok.
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    Path = ?config(data_dir, Config),
+    ok = load_driver(Path, "exit_drv"),
+    PI1 = port_ix(otp_5119_fill_empty_port_tab([])),
+    PI2 = port_ix(erlang:open_port({spawn, "exit_drv"}, [])),
+    {PortIx1, PortIx2} = case PI2 > PI1 of
+	true ->
+	    {PI1, PI2};
+	false ->
+	    {port_ix(otp_5119_fill_empty_port_tab([PI2])),
+		port_ix(erlang:open_port({spawn, "exit_drv"}, []))}
+    end,
+    MaxPorts = max_ports(),
+    ?t:format("PortIx1 = ~p ~p~n", [PI1, PortIx1]),
+    ?t:format("PortIx2 = ~p ~p~n", [PI2, PortIx2]),
+    ?t:format("MaxPorts = ~p~n", [MaxPorts]),
+    true = PortIx2 > PortIx1,
+    true = PortIx2 =< PortIx1 + MaxPorts,
+    test_server:timetrap_cancel(Dog),
+    ok.
 
 otp_5119_fill_empty_port_tab(Ports) ->
-    ?line case (catch erlang:open_port({spawn, "exit_drv"}, [])) of
+    case (catch erlang:open_port({spawn, "exit_drv"}, [])) of
 	      Port when is_port(Port) ->
-		  ?line otp_5119_fill_empty_port_tab([Port|Ports]);
+		  otp_5119_fill_empty_port_tab([Port|Ports]);
 	      _ ->
 		  %% Port table now full; empty port table
-		  ?line lists:foreach(fun (P) ->  P ! {self(), close} end,
+		  lists:foreach(fun (P) ->  P ! {self(), close} end,
 				      Ports),
-		  ?line [LastPort|_] = Ports,
-		  ?line LastPort
+		  [LastPort|_] = Ports,
+		  LastPort
 	  end.
 
 -define(DEF_MAX_PORTS, 1024).
 
 max_ports_env() ->
-    ?line case os:getenv("ERL_MAX_PORTS") of
+    case os:getenv("ERL_MAX_PORTS") of
 	      EMP when is_list(EMP) ->
 		  case catch list_to_integer(EMP) of
-		      Int when is_integer(Int) -> ?line Int;
-		      _ -> ?line false
+		      Int when is_integer(Int) -> Int;
+		      _ -> false
 		  end;
-	      _ -> ?line false
+	      _ -> false
 	  end.
 
 max_ports() ->
-    ?line PreMaxPorts
+    PreMaxPorts
 	= case max_ports_env() of
-	      Env when is_integer(Env) -> ?line Env;
+	      Env when is_integer(Env) -> Env;
 	      _ ->
-		  ?line case os:type() of
+		  case os:type() of
 			    {unix, _} ->
-				?line UlimStr = string:strip(os:cmd("ulimit -n")
+				UlimStr = string:strip(os:cmd("ulimit -n")
 							     -- "\n"),
-				?line case catch list_to_integer(UlimStr) of
-					  Ulim when is_integer(Ulim) -> ?line Ulim;
-					  _ -> ?line ?DEF_MAX_PORTS
+				case catch list_to_integer(UlimStr) of
+					  Ulim when is_integer(Ulim) -> Ulim;
+					  _ -> ?DEF_MAX_PORTS
 				      end;
-			    _ -> ?line ?DEF_MAX_PORTS
+			    _ -> ?DEF_MAX_PORTS
 			end
 	  end,
-    ?line case PreMaxPorts > ?DEF_MAX_PORTS of
-	      true -> ?line PreMaxPorts;
-	      false -> ?line ?DEF_MAX_PORTS
+    case PreMaxPorts > ?DEF_MAX_PORTS of
+	      true -> PreMaxPorts;
+	      false -> ?DEF_MAX_PORTS
 	  end.
 
 port_ix(Port) when is_port(Port) ->
-    ?line ["#Port",_,PortIxStr] = string:tokens(erlang:port_to_list(Port),
+    ["#Port",_,PortIxStr] = string:tokens(erlang:port_to_list(Port),
 						"<.>"),
-    ?line list_to_integer(PortIxStr).
+    list_to_integer(PortIxStr).
 
 
 otp_6224(doc) -> ["Check that port command failure doesn't crash the emulator"];
 otp_6224(suite) -> [];
 otp_6224(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line ok = load_driver(Path, "failure_drv"),
-    ?line Go = make_ref(),
-    ?line Failer = spawn(fun () ->
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    Path = ?config(data_dir, Config),
+    ok = load_driver(Path, "failure_drv"),
+    Go = make_ref(),
+    Failer = spawn(fun () ->
 				 receive Go -> ok end,
-				 ?line Port = open_port({spawn, "failure_drv"},
+				 Port = open_port({spawn, "failure_drv"},
 							[]),
 				 Port ! {self(), {command, "Fail, please!"}},
 				 otp_6224_loop()
 			 end),
-    ?line Mon = erlang:monitor(process, Failer),
-    ?line Failer ! Go,
-    ?line receive
+    Mon = erlang:monitor(process, Failer),
+    Failer ! Go,
+    receive
 	      {'DOWN', Mon, process, Failer, Reason} ->
-		  ?line case Reason of
-			    {driver_failed, _} -> ?line ok;
-			    driver_failed -> ?line ok;
-			    _ -> ?line ?t:fail({unexpected_exit_reason,
+		  case Reason of
+			    {driver_failed, _} -> ok;
+			    driver_failed -> ok;
+			    _ -> ?t:fail({unexpected_exit_reason,
 						Reason})
 			end
 	  end,
-    ?line test_server:timetrap_cancel(Dog),
-    ?line ok.
+    test_server:timetrap_cancel(Dog),
+    ok.
     
 otp_6224_loop() ->
     receive _ -> ok after 0 -> ok end,
@@ -1781,11 +1714,11 @@ otp_6224_loop() ->
 exit_status_multi_scheduling_block(doc) -> [];
 exit_status_multi_scheduling_block(suite) -> [];
 exit_status_multi_scheduling_block(Config) when is_list(Config) ->
-    ?line Repeat = 3,
-    ?line case ?t:os_type() of
+    Repeat = 3,
+    case ?t:os_type() of
 	      {unix, _} ->
-		  ?line Dog = ?t:timetrap(test_server:minutes(2*Repeat)),
-		  ?line SleepSecs = 6,
+		  Dog = ?t:timetrap(test_server:minutes(2*Repeat)),
+		  SleepSecs = 6,
 		  try
 		      lists:foreach(fun (_) ->
 					    exit_status_msb_test(Config,
@@ -1799,7 +1732,7 @@ exit_status_multi_scheduling_block(Config) when is_list(Config) ->
 		      ?t:timetrap_cancel(Dog),
 		      receive after SleepSecs+500 -> ok end
 		  end;
-	      _ -> ?line {skip, "Not implemented for this OS"}
+	      _ -> {skip, "Not implemented for this OS"}
 	  end.
 
 exit_status_msb_test(Config, SleepSecs) when is_list(Config) ->
@@ -1808,22 +1741,22 @@ exit_status_msb_test(Config, SleepSecs) when is_list(Config) ->
     %% and we want these port programs to terminate while multi-scheduling
     %% is blocked.
     %% 
-    ?line NoSchedsOnln = erlang:system_info(schedulers_online),
-    ?line Parent = self(),
-    ?line ?t:format("SleepSecs = ~p~n", [SleepSecs]),
-    ?line PortProg = "sleep " ++ integer_to_list(SleepSecs),
-    ?line Start = now(),
-    ?line NoProcs = case NoSchedsOnln of
+    NoSchedsOnln = erlang:system_info(schedulers_online),
+    Parent = self(),
+    ?t:format("SleepSecs = ~p~n", [SleepSecs]),
+    PortProg = "sleep " ++ integer_to_list(SleepSecs),
+    Start = now(),
+    NoProcs = case NoSchedsOnln of
 			NProcs when NProcs < ?EXIT_STATUS_MSB_MAX_PROCS ->
 			    NProcs;
 			_ ->
 			    ?EXIT_STATUS_MSB_MAX_PROCS
 		    end,
-    ?line NoPortsPerProc = case 20*NoProcs of
+    NoPortsPerProc = case 20*NoProcs of
 			       TNPorts when TNPorts < ?EXIT_STATUS_MSB_MAX_PORTS -> 20;
 			       _ -> ?EXIT_STATUS_MSB_MAX_PORTS div NoProcs
 			   end,
-    ?line ?t:format("NoProcs = ~p~nNoPortsPerProc = ~p~n",
+    ?t:format("NoProcs = ~p~nNoPortsPerProc = ~p~n",
 		    [NoProcs, NoPortsPerProc]),
     ProcFun
 	= fun () ->
@@ -1873,32 +1806,32 @@ exit_status_msb_test(Config, SleepSecs) when is_list(Config) ->
 		    PrtSIds),
 		  Parent ! {self(), done}
 	  end,
-    ?line Procs = lists:map(fun (N) ->
+    Procs = lists:map(fun (N) ->
 				    spawn_opt(ProcFun,
 					      [link,
 					       {scheduler,
 						(N rem NoSchedsOnln)+1}])
 			    end,
 			    lists:seq(1, NoProcs)),
-    ?line SIds = lists:map(fun (P) ->
+    SIds = lists:map(fun (P) ->
 				   receive {P, started, SIds} -> SIds end
 			   end,
 			   Procs),
-    ?line StartedTime = timer:now_diff(now(), Start)/1000000,
-    ?line ?t:format("StartedTime = ~p~n", [StartedTime]),
-    ?line true = StartedTime < SleepSecs,
-    ?line erlang:system_flag(multi_scheduling, block),
-    ?line lists:foreach(fun (P) -> receive {P, done} -> ok end end, Procs),
-    ?line DoneTime = timer:now_diff(now(), Start)/1000000,
-    ?line ?t:format("DoneTime = ~p~n", [DoneTime]),
-    ?line true = DoneTime > SleepSecs,
-    ?line ok = verify_multi_scheduling_blocked(),
-    ?line erlang:system_flag(multi_scheduling, unblock),
-    ?line case {length(lists:usort(lists:flatten(SIds))), NoSchedsOnln} of
+    StartedTime = timer:now_diff(now(), Start)/1000000,
+    ?t:format("StartedTime = ~p~n", [StartedTime]),
+    true = StartedTime < SleepSecs,
+    erlang:system_flag(multi_scheduling, block),
+    lists:foreach(fun (P) -> receive {P, done} -> ok end end, Procs),
+    DoneTime = timer:now_diff(now(), Start)/1000000,
+    ?t:format("DoneTime = ~p~n", [DoneTime]),
+    true = DoneTime > SleepSecs,
+    ok = verify_multi_scheduling_blocked(),
+    erlang:system_flag(multi_scheduling, unblock),
+    case {length(lists:usort(lists:flatten(SIds))), NoSchedsOnln} of
 	      {N, N} ->
-		  ?line ok;
+		  ok;
 	      {N, M} ->
-		  ?line ?t:fail("Failed to create ports on all"
+		  ?t:fail("Failed to create ports on all"
 				++ integer_to_list(M) ++ " available"
 				"schedulers. Only created ports on "
 				++ integer_to_list(N) ++ " schedulers.")
@@ -1921,18 +1854,18 @@ sid_proc(SIds) ->
     end.
 
 verify_multi_scheduling_blocked() ->
-    ?line Procs = lists:map(fun (_) ->
+    Procs = lists:map(fun (_) ->
 				    spawn_link(fun () -> sid_proc([]) end)
 			    end,
 			    lists:seq(1, 3*erlang:system_info(schedulers_online))),
-    ?line receive after 1000 -> ok end,
-    ?line SIds = lists:map(fun (P) ->
+    receive after 1000 -> ok end,
+    SIds = lists:map(fun (P) ->
 				   P ! {self(), want_sids},
 				   receive {P, sids, PSIds} -> PSIds end
 			   end,
 			   Procs),
-    ?line 1 = length(lists:usort(lists:flatten(SIds))),
-    ?line ok.
+    1 = length(lists:usort(lists:flatten(SIds))),
+    ok.
 		      
     
 %%% Pinging functions.
@@ -1993,30 +1926,30 @@ build_cmd_line(FixedCmdLine, [], Result) ->
 port_expect(Config, Actions, HSize, CmdLine, Options0) ->
 %    io:format("port_expect(~p, ~p, ~p, ~p)",
 %		[Actions, HSize, CmdLine, Options0]),
-    ?line PortTest = port_test(Config),
-    ?line Cmd = lists:concat([PortTest, " -h", HSize, " ", CmdLine]),
-    ?line PortType =
+    PortTest = port_test(Config),
+    Cmd = lists:concat([PortTest, " -h", HSize, " ", CmdLine]),
+    PortType =
 	case HSize of
 	    0 -> stream;
 	    _ -> {packet, HSize}
 	end,
-    ?line Options = [PortType|Options0],
-    ?line io:format("open_port({spawn, ~p}, ~p)", [Cmd, Options]),
-    ?line Port = open_port({spawn, Cmd}, Options),
-    ?line port_expect(Port, Actions, Options),
+    Options = [PortType|Options0],
+    io:format("open_port({spawn, ~p}, ~p)", [Cmd, Options]),
+    Port = open_port({spawn, Cmd}, Options),
+    port_expect(Port, Actions, Options),
     Port.
 
 port_expect(Port, [{Send, Expects}|Rest], Options) when is_list(Expects) ->
-    ?line port_send(Port, Send),
-    ?line IsBinaryPort = lists:member(binary, Options),
-    ?line Receiver =
+    port_send(Port, Send),
+    IsBinaryPort = lists:member(binary, Options),
+    Receiver =
 	case {lists:member(stream, Options), line_option(Options)} of
 	    {false, _} -> fun receive_all/2;
 	    {true,false}  -> fun stream_receive_all/2;
 	    {_, true} -> fun receive_all/2
 	end,
-    ?line Receiver(Port, maybe_to_binary(Expects, IsBinaryPort)),
-    ?line port_expect(Port, Rest, Options);
+    Receiver(Port, maybe_to_binary(Expects, IsBinaryPort)),
+    port_expect(Port, Rest, Options);
 port_expect(_, [], _) ->
     ok.
 
@@ -2068,7 +2001,7 @@ receive_all(Port, [Expect|Rest]) ->
 		_ ->
 %%%	            io:format("Unexpected message: ~s", [format(Other)]),
 		    io:format("Unexpected message: ~w", [Other]),
-		    ?line test_server:fail(unexpected_message)
+		    test_server:fail(unexpected_message)
 	    end
     end,
     receive_all(Port, Rest);
@@ -2157,15 +2090,8 @@ build_packet(Left, Result, NextChar0) ->
     build_packet(Left-1, [NextChar0|Result], NextChar).
 
 sizes() ->
-    case os:type() of
-	vxworks ->
-	    % don't stress VxWorks too much 
-	    [10, 13, 64, 127, 128, 255, 256, 1023, 1024,
-	     8191, 8192, 16383, 16384];
-	_ ->
-	    [10, 13, 64, 127, 128, 255, 256, 1023, 1024,
-	     32767, 32768, 65535, 65536]
-    end.
+    [10, 13, 64, 127, 128, 255, 256, 1023, 1024,
+	32767, 32768, 65535, 65536].
 
 sizes(Header_Size) ->
     sizes(Header_Size, sizes(), []).
@@ -2203,18 +2129,18 @@ fun_spawn(Fun, Args) ->
     spawn_link(erlang, apply, [Fun, Args]).
 
 port_test(Config) when is_list(Config) ->
-    ?line filename:join(?config(data_dir, Config), "port_test").
+    filename:join(?config(data_dir, Config), "port_test").
 
 
 ports(doc) -> "Test that erlang:ports/0 returns a consistent snapshot of ports";
 ports(suite) -> [];
 ports(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
-    ?line ok = load_driver(Path, "exit_drv"),
+    Path = ?config(data_dir, Config),
+    ok = load_driver(Path, "exit_drv"),
 
     receive after 1000 -> ok end, % Wait for other ports to stabilize
 
-    ?line OtherPorts = erlang:ports(),
+    OtherPorts = erlang:ports(),
     io:format("Other ports: ~p\n",[OtherPorts]),
     MaxPorts = 1024 - length(OtherPorts),
 
@@ -2222,7 +2148,7 @@ ports(Config) when is_list(Config) ->
 
     ports_snapshots(100, TrafficPid, OtherPorts),
     TrafficPid ! {self(),die},
-    ?line receive {TrafficPid, dead} -> ok end,
+    receive {TrafficPid, dead} -> ok end,
     ok.
 
 ports_snapshots(0, _, _) ->
@@ -2230,12 +2156,12 @@ ports_snapshots(0, _, _) ->
 ports_snapshots(Iter, TrafficPid, OtherPorts) ->
 
     TrafficPid ! start,    
-    ?line receive after 1 -> ok end,
+    receive after 1 -> ok end,
 
     Snapshot = erlang:ports(),
 
     TrafficPid ! {self(), stop},
-    ?line receive {TrafficPid, EventList, TrafficPorts} -> ok end,
+    receive {TrafficPid, EventList, TrafficPorts} -> ok end,
     
     %%io:format("Snapshot=~p\n", [Snapshot]),
     ports_verify(Snapshot, OtherPorts ++ TrafficPorts, EventList),
@@ -2252,7 +2178,7 @@ ports_traffic_stopped(MaxPorts, {PortList, PortCnt}) ->
 	    %%io:format("Traffic started in ~p\n",[self()]),
 	    ports_traffic_started(MaxPorts, {PortList, PortCnt}, []);
 	{Pid,die} ->
-	    ?line lists:foreach(fun(Port)-> erlang:port_close(Port) end,
+	    lists:foreach(fun(Port)-> erlang:port_close(Port) end,
 				PortList),
 	    Pid ! {self(),dead}
     end.
@@ -2272,15 +2198,15 @@ ports_traffic_do(MaxPorts, {PortList, PortCnt}, EventList) ->
     N = uniform(MaxPorts),
     case N > PortCnt of
 	true -> % Open port	    
-	    ?line P = open_port({spawn, "exit_drv"}, []),
+	    P = open_port({spawn, "exit_drv"}, []),
 	    %%io:format("Created port ~p\n",[P]),
 	    ports_traffic_started(MaxPorts, {[P|PortList], PortCnt+1},
 				  [{open,P}|EventList]);
 	
 	false -> % Close port
-	    ?line P = lists:nth(N, PortList),
+	    P = lists:nth(N, PortList),
 	    %%io:format("Close port ~p\n",[P]),
-	    ?line true = erlang:port_close(P),
+	    true = erlang:port_close(P),
 	    ports_traffic_started(MaxPorts, {lists:delete(P,PortList), PortCnt-1},
 				  [{close,P}|EventList])
     end.
@@ -2301,7 +2227,7 @@ ports_verify(Ports, PortsAfter, EventList) ->
 		    ports_verify(Ports, [P | PortsAfter], Tail);		    
 
 		[] ->
-		    ?line test_server:fail("Inconsistent snapshot from erlang:ports()")
+		    test_server:fail("Inconsistent snapshot from erlang:ports()")
 	    end
     end.
 
@@ -2318,27 +2244,27 @@ close_deaf_port(doc) -> ["Send data to port program that does not read it, then
 			 "Primary targeting Windows to test threaded_handle_closer in sys.c"];
 close_deaf_port(suite) -> [];
 close_deaf_port(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(100)),
-    ?line DataDir = ?config(data_dir, Config),
-    ?line DeadPort = os:find_executable("dead_port", DataDir),
-    ?line Port = open_port({spawn,DeadPort++" 60"},[]),
-    ?line erlang:port_command(Port,"Hello, can you hear me!?!?"),
-    ?line port_close(Port),
+    Dog = test_server:timetrap(test_server:seconds(100)),
+    DataDir = ?config(data_dir, Config),
+    DeadPort = os:find_executable("dead_port", DataDir),
+    Port = open_port({spawn,DeadPort++" 60"},[]),
+    erlang:port_command(Port,"Hello, can you hear me!?!?"),
+    port_close(Port),
 
     Res = close_deaf_port_1(0, DeadPort),
     io:format("Waiting for OS procs to terminate...\n"),
     receive after 5*1000 -> ok end,
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     Res.
 
 close_deaf_port_1(1000, _) ->
     ok;
 close_deaf_port_1(N, Cmd) ->
     Timeout = integer_to_list(random:uniform(5*1000)),
-    ?line try open_port({spawn_executable,Cmd},[{args,[Timeout]}]) of
+    try open_port({spawn_executable,Cmd},[{args,[Timeout]}]) of
     	Port ->
-	    ?line erlang:port_command(Port,"Hello, can you hear me!?!?"),
-	    ?line port_close(Port),
+	    erlang:port_command(Port,"Hello, can you hear me!?!?"),
+	    port_close(Port),
 	    close_deaf_port_1(N+1, Cmd)
     catch
     	_:eagain ->
diff --git a/erts/emulator/test/port_SUITE_data/dead_port.c b/erts/emulator/test/port_SUITE_data/dead_port.c
index 68e96fbf14..4dd9ee4cc2 100644
--- a/erts/emulator/test/port_SUITE_data/dead_port.c
+++ b/erts/emulator/test/port_SUITE_data/dead_port.c
@@ -17,15 +17,6 @@
  * %CopyrightEnd%
  */
 
-#ifdef VXWORKS
-#include <vxWorks.h>
-#include <taskVarLib.h>
-#include <taskLib.h>
-#include <sysLib.h>
-#include <string.h>
-#include <ioLib.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -37,12 +28,7 @@
 #ifndef __WIN32__
 #include <unistd.h>
 
-#ifdef VXWORKS
-#include "reclaim.h"
-#include <sys/times.h>
-#else
 #include <sys/time.h>
-#endif
 
 #define O_BINARY 0
 #define _setmode(fd, mode)
@@ -53,13 +39,7 @@
 #include "winbase.h"
 #endif
 
-
-#ifdef VXWORKS
-#define MAIN(argc, argv) port_test(argc, argv)
-#else
 #define MAIN(argc, argv) main(argc, argv)
-#endif
-
 
 extern int errno;
 
@@ -86,9 +66,6 @@ char *argv[];
 static void
 delay(unsigned ms)
 {
-#ifdef VXWORKS
-  taskDelay((sysClkRateGet() * ms) / 1000);
-#else
 #ifdef __WIN32__
   Sleep(ms);
 #else
@@ -98,5 +75,4 @@ delay(unsigned ms)
 
   select(0, NULL, NULL, NULL, &t);
 #endif
-#endif
 }
diff --git a/erts/emulator/test/port_SUITE_data/port_test.c b/erts/emulator/test/port_SUITE_data/port_test.c
index 7b4e386d87..7abefab2e3 100644
--- a/erts/emulator/test/port_SUITE_data/port_test.c
+++ b/erts/emulator/test/port_SUITE_data/port_test.c
@@ -3,15 +3,6 @@
  * Purpose: A port program to be used for testing the open_port bif.
  */
 
-#ifdef VXWORKS
-#include <vxWorks.h>
-#include <taskVarLib.h>
-#include <taskLib.h>
-#include <sysLib.h>
-#include <string.h>
-#include <ioLib.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -23,12 +14,7 @@
 #ifndef __WIN32__
 #include <unistd.h>
 
-#ifdef VXWORKS
-#include "reclaim.h"
-#include <sys/times.h>
-#else
 #include <sys/time.h>
-#endif 
 
 #define O_BINARY 0
 #define _setmode(fd, mode)
@@ -40,22 +26,13 @@
 #endif
 
 
-#ifdef VXWORKS
-#define REDIR_STDOUT(fd) ioTaskStdSet(0, 1, fd);
-#else
 #define REDIR_STDOUT(fd) if (dup2(fd, 1) == -1) { \
     fprintf(stderr, "%s: failed to duplicate handle %d to 1: %d\n", \
     port_data->progname, fd, errno); \
     exit(1); \
 }
-#endif
 
-#ifdef VXWORKS
-#define MAIN(argc, argv) port_test(argc, argv)
-#else
 #define MAIN(argc, argv) main(argc, argv)
-#endif
-
 
 extern int errno;
 
@@ -101,7 +78,6 @@ static void dump(unsigned char* buf, int sz, int max);
 static void replace_stdout(char* filename);
 static void generate_reply(char* spec);
 
-#ifndef VXWORKS
 #ifndef HAVE_STRERROR
 extern int sys_nerr;
 #ifndef sys_errlist /* sys_errlist is sometimes defined to
@@ -125,7 +101,6 @@ int err;
     return msgstr;
 }
 #endif
-#endif
 
 
 MAIN(argc, argv)
@@ -133,12 +108,6 @@ int argc;
 char *argv[];
 {
   int ret;
-#ifdef VXWORKS
-  if(taskVarAdd(0, (int *)&port_data) != OK) {
-    fprintf(stderr, "Can't do taskVarAdd in port_test\n");
-    exit(1);
-  }
-#endif
   if((port_data = (PORT_TEST_DATA *) malloc(sizeof(PORT_TEST_DATA))) == NULL) {
     fprintf(stderr, "Couldn't malloc for port_data");
     exit(1);
@@ -511,9 +480,6 @@ dump(buf, sz, max)
 static void
 delay(unsigned ms)
 {
-#ifdef VXWORKS
-  taskDelay((sysClkRateGet() * ms) / 1000);
-#else
 #ifdef __WIN32__
   Sleep(ms);
 #else
@@ -523,7 +489,6 @@ delay(unsigned ms)
 
   select(0, NULL, NULL, NULL, &t);
 #endif
-#endif
 }
 
 /*
diff --git a/erts/emulator/test/port_SUITE_data/reclaim.h b/erts/emulator/test/port_SUITE_data/reclaim.h
deleted file mode 100644
index 1d57dc5b8a..0000000000
--- a/erts/emulator/test/port_SUITE_data/reclaim.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef __RECLAIM_H__
-#define __RECLAIM_H__
-
-
-/* The Erlang release for VxWorks includes a simple mechanism for
-   "resource reclamation" at task exit - it allows replacement of the
-   functions that open/close "files" and malloc/free memory with versions
-   that keep track, to be able to "reclaim" file descriptors and memory
-   when a task exits (regardless of *how* it exits).
-
-   The interface to this mechanism is made available via this file,
-   with the following caveats:
-
-   - The interface may change (or perhaps even be removed, though that
-     isn't likely until VxWorks itself provides similar functionality)
-     in future releases - i.e. you must always use the version of this
-     file that comes with the Erlang release you are using.
-
-   - Disaster is guaranteed if you use the mechanism incorrectly (see
-     below for the correct way), e.g. allocate memory with the "tracking"
-     version of malloc() and free it with the "standard" version of free().
-
-   - The mechanism (of course) incurs some performance penalty - thus
-     for a simple program you may be better off with careful programming,
-     making sure that you do whatever close()/free()/etc calls that are
-     appropriate at all exit points (though if you need to guard against
-     taskDelete() etc, things get messy...).
-
-   To use the mechanism, simply program your application normally, i.e.
-   use open()/close()/malloc()/free() etc as usual, but #include this
-   file before any usage of the relevant functions. NOTE: To avoid the
-   "disaster" mentioned above, you *must* #include it in *all* (or none)
-   of the files that manipulate a particular file descriptor, allocated
-   memory area, etc. Finally, note that you can obviously not load your
-   application before the Erlang system when using this interface.
-*/
-
-/* Sorry, no ANSI prototypes yet... */
-extern int save_open(),save_creat(),save_socket(),save_accept(),save_close();
-#define open	save_open
-#define creat	save_creat
-#define socket	save_socket
-#define accept	save_accept
-#define close	save_close
-extern FILE *save_fopen(), *save_fdopen(), *save_freopen();
-extern int save_fclose();
-#define fopen	save_fopen
-#define fdopen	save_fdopen
-#define freopen	save_freopen
-#define fclose	save_fclose
-/* XXX Should do opendir/closedir too... */
-extern char *save_malloc(), *save_calloc(), *save_realloc();
-extern void save_free(), save_cfree();
-#define malloc	save_malloc
-#define calloc	save_calloc
-#define realloc	save_realloc
-#define free	save_free
-#define cfree	save_cfree
-
-#endif
diff --git a/erts/emulator/test/port_bif_SUITE_data/port_test.c b/erts/emulator/test/port_bif_SUITE_data/port_test.c
index c6b128df66..28324a56a6 100644
--- a/erts/emulator/test/port_bif_SUITE_data/port_test.c
+++ b/erts/emulator/test/port_bif_SUITE_data/port_test.c
@@ -3,15 +3,6 @@
  * Purpose: A port program to be used for testing the open_port bif.
  */
 
-#ifdef VXWORKS
-#include <vxWorks.h>
-#include <taskVarLib.h>
-#include <taskLib.h>
-#include <sysLib.h>
-#include <string.h>
-#include <ioLib.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -23,12 +14,7 @@
 #ifndef __WIN32__
 #include <unistd.h>
 
-#ifdef VXWORKS
-#include "reclaim.h"
-#include <sys/times.h>
-#else
 #include <sys/time.h>
-#endif 
 
 #define O_BINARY 0
 #define _setmode(fd, mode)
@@ -40,22 +26,13 @@
 #endif
 
 
-#ifdef VXWORKS
-#define REDIR_STDOUT(fd) ioTaskStdSet(0, 1, fd);
-#else
 #define REDIR_STDOUT(fd) if (dup2(fd, 1) == -1) { \
     fprintf(stderr, "%s: failed to duplicate handle %d to 1: %d\n", \
     port_data->progname, fd, errno); \
     exit(1); \
 }
-#endif
 
-#ifdef VXWORKS
-#define MAIN(argc, argv) port_test(argc, argv)
-#else
 #define MAIN(argc, argv) main(argc, argv)
-#endif
-
 
 extern int errno;
 
@@ -101,7 +78,6 @@ static void dump(unsigned char* buf, int sz, int max);
 static void replace_stdout(char* filename);
 static void generate_reply(char* spec);
 
-#ifndef VXWORKS
 #ifndef HAVE_STRERROR
 extern int sys_nerr;
 #ifndef sys_errlist /* sys_errlist is sometimes defined to
@@ -125,20 +101,13 @@ int err;
     return msgstr;
 }
 #endif
-#endif
-
 
 MAIN(argc, argv)
 int argc;
 char *argv[];
 {
   int ret;
-#ifdef VXWORKS
-  if(taskVarAdd(0, (int *)&port_data) != OK) {
-    fprintf(stderr, "Can't do taskVarAdd in port_test\n");
-    exit(1);
-  }
-#endif
+
   if((port_data = (PORT_TEST_DATA *) malloc(sizeof(PORT_TEST_DATA))) == NULL) {
     fprintf(stderr, "Couldn't malloc for port_data");
     exit(1);
@@ -508,9 +477,6 @@ dump(buf, sz, max)
 static void
 delay(unsigned ms)
 {
-#ifdef VXWORKS
-  taskDelay((sysClkRateGet() * ms) / 1000);
-#else
 #ifdef __WIN32__
   Sleep(ms);
 #else
@@ -520,7 +486,6 @@ delay(unsigned ms)
 
   select(0, NULL, NULL, NULL, &t);
 #endif
-#endif
 }
 
 /*
diff --git a/erts/emulator/test/port_bif_SUITE_data/reclaim.h b/erts/emulator/test/port_bif_SUITE_data/reclaim.h
deleted file mode 100644
index 1d57dc5b8a..0000000000
--- a/erts/emulator/test/port_bif_SUITE_data/reclaim.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef __RECLAIM_H__
-#define __RECLAIM_H__
-
-
-/* The Erlang release for VxWorks includes a simple mechanism for
-   "resource reclamation" at task exit - it allows replacement of the
-   functions that open/close "files" and malloc/free memory with versions
-   that keep track, to be able to "reclaim" file descriptors and memory
-   when a task exits (regardless of *how* it exits).
-
-   The interface to this mechanism is made available via this file,
-   with the following caveats:
-
-   - The interface may change (or perhaps even be removed, though that
-     isn't likely until VxWorks itself provides similar functionality)
-     in future releases - i.e. you must always use the version of this
-     file that comes with the Erlang release you are using.
-
-   - Disaster is guaranteed if you use the mechanism incorrectly (see
-     below for the correct way), e.g. allocate memory with the "tracking"
-     version of malloc() and free it with the "standard" version of free().
-
-   - The mechanism (of course) incurs some performance penalty - thus
-     for a simple program you may be better off with careful programming,
-     making sure that you do whatever close()/free()/etc calls that are
-     appropriate at all exit points (though if you need to guard against
-     taskDelete() etc, things get messy...).
-
-   To use the mechanism, simply program your application normally, i.e.
-   use open()/close()/malloc()/free() etc as usual, but #include this
-   file before any usage of the relevant functions. NOTE: To avoid the
-   "disaster" mentioned above, you *must* #include it in *all* (or none)
-   of the files that manipulate a particular file descriptor, allocated
-   memory area, etc. Finally, note that you can obviously not load your
-   application before the Erlang system when using this interface.
-*/
-
-/* Sorry, no ANSI prototypes yet... */
-extern int save_open(),save_creat(),save_socket(),save_accept(),save_close();
-#define open	save_open
-#define creat	save_creat
-#define socket	save_socket
-#define accept	save_accept
-#define close	save_close
-extern FILE *save_fopen(), *save_fdopen(), *save_freopen();
-extern int save_fclose();
-#define fopen	save_fopen
-#define fdopen	save_fdopen
-#define freopen	save_freopen
-#define fclose	save_fclose
-/* XXX Should do opendir/closedir too... */
-extern char *save_malloc(), *save_calloc(), *save_realloc();
-extern void save_free(), save_cfree();
-#define malloc	save_malloc
-#define calloc	save_calloc
-#define realloc	save_realloc
-#define free	save_free
-#define cfree	save_cfree
-
-#endif
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index fdc55a4cc5..6509871a7d 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -280,15 +280,7 @@ kb_128() ->
      big_binary()}.
 
 eight_kb() ->
-    %%% This is really much more than eight kb, so vxworks platforms
-    %%% gets away with 1/8 of the other platforms (due to limited
-    %%% memory resources). 
-    B64 = case os:type() of
-	      vxworks ->
-		  ?line lists:seq(1, 8);
-	      _ ->
-		  ?line lists:seq(1, 64)
-	  end,
+    B64 = lists:seq(1, 64),
     ?line B512 = {<<1>>,B64,<<2,3>>,B64,make_unaligned_sub_binary(<<4,5,6,7,8,9>>),
 		  B64,make_sub_binary([1,2,3,4,5,6]),
 		  B64,make_sub_binary(lists:seq(1, ?heap_binary_size+1)),
diff --git a/erts/emulator/test/timer_bif_SUITE.erl b/erts/emulator/test/timer_bif_SUITE.erl
index 7ff7449ff5..c9533d0748 100644
--- a/erts/emulator/test/timer_bif_SUITE.erl
+++ b/erts/emulator/test/timer_bif_SUITE.erl
@@ -71,38 +71,23 @@ end_per_group(_GroupName, Config) ->
 
 start_timer_1(doc) -> ["Basic start_timer/3 functionality"];
 start_timer_1(Config) when is_list(Config) ->
-    ?line Ref1 = erlang:start_timer(1000, self(), plopp),
-    ?line ok = get(1100, {timeout, Ref1, plopp}),
-
-    ?line false = erlang:read_timer(Ref1),
-    ?line false = erlang:cancel_timer(Ref1),
-    ?line false = erlang:read_timer(Ref1),
-
-    ?line Ref2 = erlang:start_timer(1000, self(), plapp),
-    ?line Left2 = erlang:cancel_timer(Ref2),
-    UpperLimit = case os:type() of
-	vxworks ->
-	    %% The ticks of vxworks have a far lesser granularity
-	    %% than what is expected in this testcase, in
-	    %% fact the Left2 variable can get a little more than 1000...
-	    1100;
-	_ ->
-	    1000
-    end,
-    ?line RetVal = case os:type() of
-	vxworks ->
-		{comment, "VxWorks behaves slightly unexpected, should be fixed,"};
-	_ ->
-		ok
-    end,
-    ?line true = (Left2 > 900) and (Left2 =< UpperLimit),
-    ?line empty = get_msg(),
-    ?line false = erlang:cancel_timer(Ref2),
-
-    ?line Ref3 = erlang:start_timer(1000, self(), plopp),
-    ?line no_message = get(900, {timeout, Ref3, plopp}),
-
-    RetVal.
+    Ref1 = erlang:start_timer(1000, self(), plopp),
+    ok   = get(1100, {timeout, Ref1, plopp}),
+
+    false = erlang:read_timer(Ref1),
+    false = erlang:cancel_timer(Ref1),
+    false = erlang:read_timer(Ref1),
+
+    Ref2  = erlang:start_timer(1000, self(), plapp),
+    Left2 = erlang:cancel_timer(Ref2),
+    UpperLimit = 1000,
+    true = (Left2 > 900) and (Left2 =< UpperLimit),
+    empty = get_msg(),
+    false = erlang:cancel_timer(Ref2),
+
+    Ref3 = erlang:start_timer(1000, self(), plopp),
+    no_message = get(900, {timeout, Ref3, plopp}),
+    ok.
 
 send_after_1(doc) -> ["Basic send_after/3 functionality"];
 send_after_1(Config) when is_list(Config) ->
@@ -153,19 +138,11 @@ send_after_2(Config) when is_list(Config) ->
 
 send_after_3(doc) -> ["send_after/3: messages in the right order, worse than send_after_2"];
 send_after_3(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skipped, "VxWorks timer granularity and order is not working good, this is subject to change!"};
-	_ ->
-	    do_send_after_3()
-    end.
-
-do_send_after_3() ->
-    ?line _ = erlang:send_after(100, self(), b1),
-    ?line _ = erlang:send_after(101, self(), b2),
-    ?line _ = erlang:send_after(102, self(), b3),
-    ?line _ = erlang:send_after(103, self(), last),
-    ?line [b1, b2, b3, last] = collect(last),
+    _ = erlang:send_after(100, self(), b1),
+    _ = erlang:send_after(101, self(), b2),
+    _ = erlang:send_after(102, self(), b3),
+    _ = erlang:send_after(103, self(), last),
+    [b1, b2, b3, last] = collect(last),
 
 % This behaviour is not guaranteed:
 %    ?line _ = erlang:send_after(100, self(), c1),
diff --git a/erts/emulator/test/trace_local_SUITE.erl b/erts/emulator/test/trace_local_SUITE.erl
index b238d5c630..54f8cc3c30 100644
--- a/erts/emulator/test/trace_local_SUITE.erl
+++ b/erts/emulator/test/trace_local_SUITE.erl
@@ -714,16 +714,10 @@ exception_test(Opts) ->
     ?line ok.
 
 exceptions() ->
-    ?line Ref = make_ref(),
-    ?line N = case os:type() of
-		  vxworks ->
-		      ?line 2000; % Limited memory on themachines, not actually
-		                  % VxWorks' fault /PaN
-		  _ ->
-		      ?line 200000
-	      end,
-    ?line LiL = seq(1, N-1, N),	% Long Improper List
-    ?line LL = seq(1, N, []),  	% Long List
+    Ref = make_ref(),
+    N   = 200000,
+    LiL = seq(1, N-1, N),	% Long Improper List
+    LL  = seq(1, N, []),  	% Long List
     [{{erlang,exit},  [done]},
      {{erlang,error}, [1.0]},
      {{erlang,error}, [Ref,[]]},
diff --git a/erts/emulator/test/trace_port_SUITE.erl b/erts/emulator/test/trace_port_SUITE.erl
index f81cab3114..cc2eadafbc 100644
--- a/erts/emulator/test/trace_port_SUITE.erl
+++ b/erts/emulator/test/trace_port_SUITE.erl
@@ -472,14 +472,9 @@ default_tracer(Config) when is_list(Config) ->
     ?line M = N,
     ok.
 
-
 %%% Help functions.
 
-huge_data() ->
-    case os:type() of
-	vxworks -> huge_data(4711);
-	_ -> huge_data(16384)
-    end.
+huge_data() -> huge_data(16384).
 huge_data(0) -> [];
 huge_data(N) when N rem 2 == 0 ->
     P = huge_data(N div 2),
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index b10f5d9a87..0e128fda12 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -33,11 +33,7 @@ else
 ifeq ($(TYPE),purify)
 PURIFY = purify
 TYPEMARKER =
-ifeq ($(findstring ose,$(TARGET)),ose)
-TYPE_FLAGS = -g -XO -DPURIFY
-else
 TYPE_FLAGS = -g -O2 -DPURIFY
-endif
 else
 
 override TYPE=opt
@@ -77,25 +73,15 @@ EMUDIR    = $(ERL_TOP)/erts/emulator/beam
 EMUOSDIR  = $(ERL_TOP)/erts/emulator/@ERLANG_OSTYPE@
 SYSDIR    = $(ERL_TOP)/erts/emulator/sys/@ERLANG_OSTYPE@
 DRVDIR    = $(ERL_TOP)/erts/emulator/drivers/@ERLANG_OSTYPE@
-VXETC     = ../vxworks
 UXETC     = ../unix
 OSEETC	  = ../ose
 WINETC	  = ../win32
 
-ifeq ($(findstring vxworks,$(TARGET)), vxworks)
-ERLEXEC = erl.exec
-else 
-ifeq ($(findstring ose,$(TARGET)), ose)
-ERLEXEC =
-TAR	= @TAR@
-else
 ifeq ($(TARGET), win32)
 ERLEXEC = erlexec.dll
 else
 ERLEXEC = erlexec
 endif
-endif
-endif
 
 # On windows we always need reentrant libraries.
 ifeq ($(TARGET),win32)
@@ -110,42 +96,6 @@ ERTS_LIB = $(ERL_TOP)/erts/lib_src/obj/$(TARGET)/$(TYPE)/MADE
 # Release directory specification
 # ----------------------------------------------------
 
-ifeq ($(findstring vxworks,$(TARGET)), vxworks)
-INSTALL_EMBEDDED_PROGS = $(BINDIR)/erl_io $(BINDIR)/rdate $(BINDIR)/vxcall
-INSTALL_EMBEDDED_DATA = $(BINDIR)/erl_script.sam $(VXETC)/resolv.conf
-INSTALL_INCLUDES = $(VXETC)/reclaim.h
-INSTALL_TOP = $(VXETC)/README.VxWorks
-INSTALL_MISC =
-INSTALL_SRC = heart.c $(VXETC)/heart_config.h $(VXETC)/heart_config.c  \
-		$(VXETC)/erl.exec.c $(VXETC)/rdate.c $(VXETC)/vxcall.c \
-		$(VXETC)/erl_io.c
-ERLEXECDIR = $(VXETC)
-INSTALL_LIBS = $(OBJDIR)/reclaim.o
-INSTALL_OBJS = $(OBJDIR)/heart.o
-TEXTFILES = $(BINDIR)/erl_script.sam
-ERLSRV_OBJECTS= 
-MC_OUTPUTS=
-ENTRY_LDFLAGS=
-ENTRY_OBJ=
-INSTALL_PROGS =              \
-	$(INET_GETHOST)      \
-	$(BINDIR)/heart      \
-	$(BINDIR)/$(ERLEXEC) \
-	$(INSTALL_EMBEDDED_PROGS)
-else
-ifeq ($(findstring ose,$(TARGET)), ose)
-INSTALL_TOP = $(OSEETC)/README.OSE
-INSTALL_ERL_OSE = monolith lm erl_utils drivers port_progs host
-INSTALL_SRC =
-INSTALL_LIBS =
-INSTALL_OBJS =
-INSTALL_INCLUDES =
-INSTALL_PROGS = 
-ERLSRV_OBJECTS= 
-MC_OUTPUTS=
-ENTRY_LDFLAGS=
-ENTRY_OBJ=
-else
 ifeq ($(TARGET),win32)
 CFLAGS += -I$(EMUOSDIR) -I$(WINETC)
 RC=rc.sh
@@ -207,7 +157,7 @@ endif
 PORT_ENTRY_POINT=erl_port_entry
 ENTRY_LDFLAGS=-entry:$(PORT_ENTRY_POINT)
 
-else
+else # UNIX (!win32)
 ENTRY_LDFLAGS=
 ENTRY_OBJ=
 ERLSRV_OBJECTS= 
@@ -232,8 +182,6 @@ INSTALL_PROGS =              \
 	$(BINDIR)/$(ERLEXEC) \
 	$(INSTALL_EMBEDDED_PROGS)
 endif
-endif
-endif
 
 .PHONY: etc
 etc:	$(ENTRY_OBJ) $(INSTALL_PROGS) $(INSTALL_LIBS) $(TEXTFILES) $(INSTALL_TOP_BIN)
@@ -396,24 +344,6 @@ endif
 # End of windows specific targets.
 #---------------------------------------------------------
 
-ifeq ($(findstring vxworks,$(TARGET)), vxworks)
-$(BINDIR)/heart: $(OBJDIR)/heart.o $(OBJDIR)/heart_config.o 
-	$(LD) $(LDFLAGS) -o $@ $(OBJDIR)/heart.o $(OBJDIR)/heart_config.o
-
-$(OBJDIR)/heart_config.o: $(VXETC)/heart_config.c
-	$(CC) $(CFLAGS) -o $@ -c $(VXETC)/heart_config.c
-
-$(OBJDIR)/reclaim.o: $(VXETC)/reclaim.c
-	$(CC) $(CFLAGS) -o $@ -c $(VXETC)/reclaim.c
-
-$(OBJDIR)/heart.o: heart.c
-	$(CC) $(CFLAGS) -I$(VXETC) -o $@ -c heart.c
-
-$(BINDIR)/erl_script.sam: $(VXETC)/erl_script.sam.in ../../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' \
-		$(VXETC)/erl_script.sam.in > $(BINDIR)/erl_script.sam
-else
-
 $(BINDIR)/heart@EXEEXT@: $(OBJDIR)/heart.o $(ENTRY_OBJ)
 	$(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/heart.o \
 		$(ENTRY_OBJ) $(WINDSOCK)
@@ -421,31 +351,6 @@ $(BINDIR)/heart@EXEEXT@: $(OBJDIR)/heart.o $(ENTRY_OBJ)
 $(OBJDIR)/heart.o: heart.c $(RC_GENERATED)
 	$(CC) $(CFLAGS) -o $@ -c heart.c
 
-endif
-
-
-# VxWorks specific executables and objects ...
-
-$(BINDIR)/erl_io: $(OBJDIR)/erl_io.o
-	$(LD) $(LDFLAGS) -o $@ $(OBJDIR)/erl_io.o
-
-$(OBJDIR)/erl_io.o: $(VXETC)/erl_io.c
-	$(CC) $(CFLAGS) -o $@ -c $(VXETC)/erl_io.c
-
-$(BINDIR)/rdate: $(OBJDIR)/rdate.o
-	$(LD) $(LDFLAGS) -o $@ $(OBJDIR)/rdate.o
-
-$(OBJDIR)/rdate.o: $(VXETC)/rdate.c
-	$(CC) $(CFLAGS) -o $@ -c $(VXETC)/rdate.c
-
-$(BINDIR)/vxcall: $(OBJDIR)/vxcall.o
-	$(LD) $(LDFLAGS) -o $@ $(OBJDIR)/vxcall.o
-
-$(OBJDIR)/vxcall.o: $(VXETC)/vxcall.c
-	$(CC) $(CFLAGS) -o $@ -c $(VXETC)/vxcall.c
-
-
-
 #
 # Objects & executables
 #
diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c
index 755e308219..6ac77e4e63 100644
--- a/erts/etc/common/heart.c
+++ b/erts/etc/common/heart.c
@@ -66,8 +66,7 @@
  *  input and output file descriptors (0 and 1). These descriptors
  *  (and the standard error descriptor 2) must NOT be closed
  *  explicitely by this program at termination (in UNIX it is
- *  taken care of by the operating system itself; in VxWorks
- *  it is taken care of by the spawn driver part of the Emulator).
+ *  taken care of by the operating system itself).
  *
  *  END OF FILE
  *
@@ -75,12 +74,6 @@
  *  that there is no process at the other end of the connection
  *  having the connection open for writing (end-of-file).
  *
- *  HARDWARE WATCHDOG
- *
- *  When used with VxWorks(with CPU40), the hardware
- *  watchdog is enabled, making sure that the system reboots
- *  even if the heart port program malfunctions or the system
- *  is completely overloaded.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -93,9 +86,6 @@
 #include <fcntl.h>
 #include <process.h>
 #endif
-#ifdef VXWORKS
-#include "sys.h"
-#endif
 
 /*
  * Implement time correction using times() call even on Linuxes 
@@ -116,19 +106,7 @@
 #include <time.h>
 #include <errno.h>
 
-#ifdef VXWORKS
-#  include <vxWorks.h>
-#  include <ioLib.h>
-#  include <selectLib.h>
-#  include <netinet/in.h>
-#  include <rebootLib.h>
-#  include <sysLib.h> 
-#  include <taskLib.h>
-#  include <wdLib.h>
-#  include <taskHookLib.h>
-#  include <selectLib.h>
-#endif
-#if !defined(__WIN32__) && !defined(VXWORKS)
+#if !defined(__WIN32__)
 #  include <sys/types.h>
 #  include <netinet/in.h>
 #  include <sys/time.h>
@@ -550,8 +528,7 @@ kill_old_erlang(void){
 	CloseHandle(erlh);
     }
 }
-#elif !defined(VXWORKS)
-/* Unix eh? */
+#else
 static void 
 kill_old_erlang(void){
     pid_t pid;
@@ -570,7 +547,7 @@ kill_old_erlang(void){
 	}
     }
 }
-#endif /* Not on VxWorks */
+#endif
 
 #ifdef __WIN32__
 void win_system(char *command)
@@ -653,7 +630,7 @@ do_terminate(reason)
   case R_ERROR:
   case R_CLOSED:
   default:
-#if defined(__WIN32__) /* Not VxWorks */
+#if defined(__WIN32__)
     {
       if(!cmd[0]) {
 	char *command = get_env(HEART_COMMAND_ENV);
@@ -1026,59 +1003,6 @@ time_t timestamp(time_t *res)
     return r;
 }
 
-#elif defined(VXWORKS)
-
-static WDOG_ID watchdog_id;
-static volatile unsigned elapsed;
-static WIND_TCB *this_task;
-/* A simple variable is enough to lock the time update, as the
-   watchdog is run at interrupt level and never preempted. */
-static volatile int lock_time; 
-
-static void my_delete_hook(WIND_TCB *tcb) 
-{ 
-    if (tcb == this_task) {
-	wdDelete(watchdog_id);
-	watchdog_id = NULL;
-	taskDeleteHookDelete((FUNCPTR) &my_delete_hook);
-    }
-}
-
-static void my_wd_routine(int count)
-{
-    if (watchdog_id != NULL) {
-	++count;
-	if (!lock_time) {
-	    elapsed += count;
-	    count = 0;
-	}
-	wdStart(watchdog_id, sysClkRateGet(), 
-		(FUNCPTR) &my_wd_routine, count);
-    }
-}
-
-void init_timestamp(void)
-{
-    lock_time = 0;
-    elapsed = 0;
-    watchdog_id = wdCreate();
-    this_task = (WIND_TCB *) taskIdSelf();
-    taskDeleteHookAdd((FUNCPTR) &my_delete_hook);
-    wdStart(watchdog_id, sysClkRateGet(), 
-	    (FUNCPTR) &my_wd_routine, 0);
-}
-
-time_t timestamp(time_t *res)
-{
-    time_t r;
-    ++lock_time;
-    r = (time_t) elapsed;
-    --lock_time;
-    if (res != NULL)
-	*res = r;
-    return r;
-}
-   
 #elif defined(HAVE_GETHRTIME) 
 
 void init_timestamp(void)
diff --git a/erts/etc/vxworks/README.VxWorks b/erts/etc/vxworks/README.VxWorks
deleted file mode 100644
index 299e35b513..0000000000
--- a/erts/etc/vxworks/README.VxWorks
+++ /dev/null
@@ -1,350 +0,0 @@
-
- %CopyrightBegin%
- 
- Copyright Ericsson AB 1997-2009. All Rights Reserved.
- 
- The contents of this file are subject to the Erlang Public License,
- Version 1.1, (the "License"); you may not use this file except in
- compliance with the License. You should have received a copy of the
- Erlang Public License along with this software. If not, it can be
- retrieved online at http://www.erlang.org/.
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and limitations
- under the License.
- 
- %CopyrightEnd%
-
------------------------------------------------------------------------
-README, Erlang/OTP R11B for VxWorks on PPC860 and PPC603
------------------------------------------------------------------------
-20060515 -- Patrik Nyblom, [email protected]
-
-R11B is a libraries only release for VxWorks. Only the libraries of
-erl_interface (ei+erl_inteface) and ic are expected to be used. Still
-the whole erlang system is distributed, although no support will be
-given for anything else but the libraries. The information in this
-file still applies to the full erlang distribution and parts of it are 
-therefore somewhat irrelevant to commercial users.
-
-
-Included OTP applications
--------------------------
-
-appmon
-asn1
-compiler
-cosEvent
-cosNotification
-cosTime
-cosTransaction
-debugger
-erl_interface
-erts
-eva [1]
-ic
-inets [2]
-jinterface
-kernel
-mesh
-mnemosyne
-mnesia [1]
-mnesia_session
-orber
-os_mon
-pman
-runtime_tools
-sasl
-snmp
-stdlib
-tools 
-tv
-
-[1]  Only ram_copies work, The VxWorks filesystems are not 
-     reliable enough for disk_copies to be fully supported.
-[2]  CGI scripts do not work on VxWorks.
-
-Omitted applications
---------------------
-
-crypto
-emacs
-etk
-gs
-odbc
-parsetools
-toolbar
-ssl
-megaco
-webtools
-
-As `crypto' and `ssl' provides cryptographic functionality to `inets'
-and `snmp', the latter applications will not handle cryptography on
-VxWorks.
-
-Graphical interfaces
---------------------
-
-For applications using graphical interfaces, only the backend part works.
-
-Compilers
----------
-
-All compilers are expected to be run on a cross host. The VxWorks
-systems memory capabilities are too restricting to allow native
-compiling. The expected host system is a Sun Solaris machine, although
-Erlang compilation may be done on most platforms.
-
-Supported boards and configuration (only libraries supported)
-----------------------------------
-The following boards and configurations are supported:
-
-* Force PowerCore 603 with Force pcore603 BSP and VxWorks 3.5.1 (no
-  SENS or SENS 1.1 + SPR23938) and a minimum of 32 Mb memory.
-
-* Force Powercore 750 with Force pcore750 BSP and VxWorks 3.5.1 (no
-  SENS or SENS 1.1 + SPR23938) and a minimum of 32 Mb memory.
-
-* PSS Core PPC860 processors, only erl_interface (too small main memory).
-
-Most PowerPC boards with FPU are expected to work, but will need to be
-tested by OTP to be fully supported.
-
-The PPC603 build has been compiled with Wind River's `-mlongcall' 
-flag (SPR25893) to support arbitrary function calls across more
-than 32 MB of memory.
-
-The PPC860 (PowerQuicc) has no FPU and requires a separate build.
-
-For Erlang to run, the Wind kernel has to be configured with a minimum
-of these variables defined in config.h (or by the Tornado
-configuration tool):
-
- INCLUDE_ANSI_ALL
- INCLUDE_ENV_VARS
- INCLUDE_EXC_HANDLING
- INCLUDE_EXC_TASK
- INCLUDE_FLOATING_POINT
- INCLUDE_FORMATTED_IO
- INCLUDE_IO_SYSTEM
- INCLUDE_LOADER
- INCLUDE_NETWORK
- INCLUDE_NET_INIT
- INCLUDE_NET_SHOW
- INCLUDE_NET_SYM_TBL or INCLUDE_STANDALONE_SYM_TBL
- INCLUDE_PIPES
- INCLUDE_POSIX_FTRUNC
- INCLUDE_RLOGIN or INCLUDE_TELNET (for pty's only)
- INCLUDE_SELECT
- INCLUDE_SEM_BINARY
- INCLUDE_SEM_COUNTING
- INCLUDE_SEM_MUTEX
- INCLUDE_SHELL (*)
- INCLUDE_SHOW_ROUTINES
- INCLUDE_SIGNALS
- INCLUDE_STARTUP_SCRIPT (*)
- INCLUDE_STDIO
- INCLUDE_SYM_TBL
- INCLUDE_TASK_HOOKS
- INCLUDE_TASK_VARS
- INCLUDE_TTY_DEV
- INCLUDE_UNLOADER
- INCLUDE_NFS or INCLUDE_RAMDRV or INCLUDE_DOSFS (i.e. a file system,
- possibly read-only) (**)
-
-(*) Needed for the example startup script, not actually needed in production if
-    erlang is set up by a c routine called from usrConfig.c.
-(**) INCLUDE_NFS usually requires the NFS_USER_ID and NFS_GROUP_ID variables 
-     to be set in config.h
-
-As an erlang system may open a lot of files, it is recommended to raise the
-default NUM_FILES variable to something like 256 in config.h like this:
- #ifdef NUM_FILES
- #undef NUM_FILES
- #endif
- #define NUM_FILES 256
-
-The SENS stack *has* to be of version 1.1 or higher, 1.0 is *not*
-supported and will not work reliably. Upgrades as well as the patch
-for SPR23938 can be found at www.wrs.com (i.e. WindSurf). Also, the
-following constants in $WIND_BASE/target/h/netBufLib.h has to be
-raised to a value of at least four times the default:
-
- NUM_NET_MBLKS
- NUM_64
- NUM_128
- NUM_256
- NUM_512
- NUM_1024
- NUM_2048
-
- NUM_SYS_64
- NUM_SYS_128
- NUM_SYS_256
- NUM_SYS_512
-
-Use the show routines mbufShow and netStackSysPoolShow to verify that
-these pools are not exhausted.
-
-Installation
-------------
-
-To install Erlang on a VxWorks card, the following knowledge is
-expected:
-
-* VxWorks installation and configuration.
-
-* Network (TCP/IP) configuration.
-
-* Erlang basic operation and configuration.
-
-There is no specific install script for erlang on the VxWorks
-platform.  There is however an example VxWorks startup file named
-erts-5.0.1/bin/erl_script.sam under the root of an unpacked
-release. There may of course be other things to do in the start
-script, like using the rdate program in the erlang distribution to get
-a correct date and set the TIMEZONE variable.
-
-Please consult the "Embedded System" documentation for further
-information on installation.
-
-Known Bugs and problems
------------------------
-
-We have found the VxWorks/NFS client file system to be unreliable.
-Important file operations like rename, ftruncate, cd and unlink
-doesn't always work as expected. Therefore more complex file using
-parts of OTP, like DETS and disk based mnesia tables cannot be used
-reliably with NFS. Lowering the NFS cache size (global variable
-nfsCacheSize) to 512 gives a more reliable NFS client, but to disk
-base the mnesia tables over NFS is still not a good idea, especially
-as disk based mnesia tables are not supported on VxWorks.  Another
-problem with VxWorks file systems is that the error codes they produce
-are not consistent. We have worked around this problem by mapping the
-codes to POSIX ones, by doing this we make the VxWorks Erlang platform
-behave similarly to the UNIX and Windows implementations.
-
-The rename and ftruncate operations over NFS are emulated using
-copying of files. This is mainly for our own test suites and it is not
-recommended to use file:rename and/or file:ftruncate on NFS file
-systems in production.
-
-Floating point operations is somewhat faulty. For instance, testing
-floating point numbers for equality should be done with care. This is
-actually not a bug, IEEE specifies no equality among floating point
-numbers.
-
-Memory handling
----------------
-
-Please read the erl_set_memory_block(3) manual page in the ERTS
-documentation for information concerning memory handling in the erlang
-emulator.  Also please observe that reclaim.o has to be loaded and
-reclaim_init() called before any other erlang routines are loaded and
-started. If one wish to use the resource reclamation routines in other
-programs, refer to the header file in `erts-5.0.1/include/reclaim.h'.
-Including that file in your C source makes malloc/realloc/free and
-open/fopen/socket/close etc be redefined to routines that makes the
-memory and files be free'd/closed when the task exits. Still,
-reclaim_init() *has* to be called before any program that uses this is
-started.
-
-Using heart
------------
-
-The default behavior of the heart object file that is part of the
-distribution is that it reboots the target when the Erlang process
-hasn't given it a heart beat in 60 seconds. The normal heart beat rate
-is one beat per five seconds.  This makes an effective "software
-watchdog" but there is really no substitute for the real thing --- a
-hardware watchdog.  If you want to add a hardware watchdog to the
-system please contact us for directions.  If you want to disable the
-reboot you may set the environment variable HEART_DONT_REBOOT (see the
-example erlang start script, erl). Please note that if you DO want the
-card to reboot you mustn't define HEART_DONT_REBOOT at all.  E.g. to
-disable heart reboot you may include the following line in the start
-script (as is indeed the case with the example start script).
-
-   putenv "HEART_DONT_REBOOT=1"
-
-A few words on writing port program and dynamically loaded drivers for VxWorks
-------------------------------------------------------------------------------
-
-VxWorks has one name-space for all symbols. This makes it harder to
-write C programs whose global symbols doesn't interfere with each
-other.  It is a good rule to avoid all globally visible symbols that
-are not absolutely necessary. Due to these facts we use the following
-naming rules that are crucial to follow. (there are more issues
-involved but the issues described here is a good beginning).
-
-Port programs must have a function with the same name as the object
-file.  E.g. if you have an object file named `port_test.o' it must
-contain a globally visible function named `port_test'. This is the
-function that will be called when you output data from Erlang to the
-port.  (The object file, in this example, should be named
-`port_test.o', but `port_test' will also do).
-
-Also, in an embedded system, it is recommended to load the port
-program into the system before the port program is used. This is to
-avoid the real time degradation dynamical linking in runtime would
-introduce.  Use VxWorks command ld < "port_prg" to accomplish this.
-
-Dynamically linked drivers must have a function with the same name as
-the object file with the added suffix `_init'. We recommend the use of
-the macro DRIVER_INIT in `driver.h'.  E.g. if you have an object file
-named `echo_drv.eld' it must contain a globally visible function
-`echo_drv_init'. (The object file, in this example, should be named
-`echo_drv.eld' (`eld' is short for Erlang Loadable Driver), but
-`echo_drv.o' and `echo_drv' will both also do).  It is also very
-important to initialize all unused function pointer in the
-`driver_entry' struct to NULL (see example below).
-
-Example of dynamically linked driver
-------------------------------------
-
-#include <stdio.h>
-#include "driver.h"
-
-static int erlang_port;
-static long echo_start();
-static int echo_stop(), echo_read();
-
-static struct driver_entry echo_driver_entry = { 
-    null_func,
-    echo_start,
-    echo_stop,
-    echo_read,
-    null_func,
-    null_func,
-    "echo_drv",
-    null_func
-};
-
-int DRIVER_INIT(echo_drv)(void *handle)
-{
-    erlang_port = -1;
-
-    echo_driver_entry.handle = handle;
-    return (int) &echo_driver_entry;
-}
-
-static long echo_start(long port,char *buf)
-{
-    if (erlang_port != -1) {
-	return -1;
-    }
-    
-    erlang_port = port;
-    return port;
-}
-
-static int echo_read(long port, char *buf, int count)
-{
-    return driver_output(erlang_port, buf, count);
-}
-
-static int echo_stop()
-{
-    return erlang_port = -1;
-}
diff --git a/erts/etc/vxworks/erl.exec.c b/erts/etc/vxworks/erl.exec.c
deleted file mode 100644
index 6b45ebaa39..0000000000
--- a/erts/etc/vxworks/erl.exec.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-/* 
-   A simpified version of the 'erl.exec' "startup script".
-   Called (e.g. from VxWorks shell) with all arguments in a
-   single string, e.g.: erl "-name thisnode -s mymod myfunc".
-   These arguments are handled as in 'erl.exec':
-   -name
-   -sname
-   -noshell
-   -noinput
-   anything else is just passed on to the emulator. Note that there
-   is no automatic start of epmd, that -oldshell is implicit, and
-   that you need to set current directory appropriately if you want
-   auto-load of port programs
-*/
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef DEFAULT_HOMEDIR		/* used if environment HOME isn't set */
-#define DEFAULT_HOMEDIR "/"
-#endif
-
-#define ARGLEN 2048		/* Total length of args passed to erl_main */
-#define ARGMAX 64		/* Max no of "extra" args */
-
-static char *erl_cmd = "erl_main -n ";
-
-static toomuch()
-{
-    fprintf(stderr, "erl: Too many arguments\n");
-    return(-1);
-}
-
-static toolittle(arg)
-char *arg;
-{
-    fprintf(stderr, "erl.exec: Missing argument for %s\n", arg);
-    return(-1);
-}
-
-erl_exec(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10)
-int arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10;
-{
-    char *shell = "-oldshell ", *noshell = "",
-       *home, *rootdir, *bindir, *progname;
-    char cmd[ARGLEN], eargs[ARGLEN], iargs[ARGLEN];
-    char *args[ARGMAX], *arglast = NULL, *argp;
-    int nargs = 0, len, i;
-
-    if ((rootdir = getenv("ROOTDIR")) == NULL || 
-	(bindir = getenv("BINDIR")) == NULL ||
-	(progname = getenv("PROGNAME")) == NULL) {
-      fprintf(stderr, "erl.exec: ROOTDIR, BINDIR, and PROGNAME must be set.");
-      return -1;
-    }
-    eargs[0] = '\0';
-    iargs[0] = '\0';
-    if ((home = getenv("HOME")) == NULL)
-	home = DEFAULT_HOMEDIR;
-    argp = strtok_r((char *)arg1, " \t", &arglast);
-    while (argp != NULL) {
-      if (strcmp(argp, "-name") == 0) {
-	if ((argp = strtok_r((char *)NULL, " \t", &arglast)) == NULL)
-	  return(toolittle("-name"));
-	strcat(iargs, "-name ");
-	strcat(iargs, argp);
-	strcat(iargs, " ");
-      } else if (strcmp(argp, "-sname") == 0) {
-	if ((argp = strtok_r((char *)NULL, " \t", &arglast)) == NULL)
-	  return(toolittle("-sname"));
-	strcat(iargs, "-sname ");
-	strcat(iargs, argp);
-	strcat(iargs, " ");
-      } else if (strcmp(argp, "-noshell") == 0) {
-	strcat(iargs, "-noshell -noinp_shell ");
-      } else if (strcmp(argp, "-noinput") == 0) {
-	strcat(iargs, "-noshell -noinput ");
-      } else {
-	if (nargs > ARGMAX - 1)
-	  return(toomuch());
-	args[nargs++] = argp;
-      }
-      argp = strtok_r((char *)NULL, " \t", &arglast);
-    }
-    strcpy(cmd, erl_cmd);
-    strcat(cmd, eargs);
-    strcat(cmd, " -- -root ");
-    strcat(cmd, rootdir);
-    strcat(cmd, " -progname ");
-    strcat(cmd, progname); 
-    strcat(cmd, " -- ");
-    strcat(cmd, "-home ");
-    strcat(cmd, home);
-    strcat(cmd, " ");
-    strcat(cmd, iargs);
-
-    len = strlen(cmd);
-    for (i = 0; i < nargs; i++) {
-	if (len + strlen(args[i]) + 2 >= ARGLEN)
-	    return(toomuch());
-	cmd[len++] = ' ';
-	strcpy(&cmd[len], args[i]);
-	len += strlen(args[i]);
-    }
-    argcall(cmd);
-}
-
diff --git a/erts/etc/vxworks/erl_io.c b/erts/etc/vxworks/erl_io.c
deleted file mode 100644
index 0032b77079..0000000000
--- a/erts/etc/vxworks/erl_io.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-/* Some stuff to let the Erlang and VxWorks shells coexist peacefully.
-   Basically, run Erlang as a spawned task with input redirected to
-   the slave side of a pseudo-tty, and connect explicitly to the master
-   side of the pseudo-tty to send input to Erlang when desired. */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#include <stdio.h>
-#include <ioLib.h>
-#include <taskLib.h>
-#include <ptyDrv.h>
-
-extern int spTaskPriority, spTaskOptions;
-
-#define TBUFSIZ 512
-
-#define DEFAULT_STACK_SIZE    100000
-
-static int slavefd = -1, masterfd = -1;
-static run_erl();
-
-/* Frontend to the Erlang startup function - callable from VxWorks shell
-   or script. 'arg' is actually a string passed to the real startup. */
-start_erl(arg)
-int arg;
-{
-  int stacksize;
-  char *stackenv;
-
-    /* create and open the pty - we want the master side to be open
-       all the time, since closing it probably generates EOF on the
-       slave side */
-    (void)ptyDevCreate("/pty/erlang.", TBUFSIZ, TBUFSIZ);
-    if (slavefd != -1)
-	(void)close(slavefd);
-    slavefd = open("/pty/erlang.S", O_RDONLY, 0);
-    if (masterfd != -1)
-	(void)close(masterfd);
-    masterfd = open("/pty/erlang.M", O_WRONLY, 0);
-
-    /* flush any old leftover garbage */
-    (void) ioctl(masterfd, FIOFLUSH, 0);
-    if ((stackenv = getenv("ERLSTACKSIZE")) == NULL)
-      stacksize = DEFAULT_STACK_SIZE;
-    else
-      stacksize = atoi(stackenv);
-    /* spawn Erlang, via stub below */
-    return(taskSpawn("erlang", spTaskPriority, spTaskOptions, stacksize,
-		     run_erl, arg, 0,0,0,0,0,0,0,0,0));
-}
-
-/* Little stub that runs in the spawned task - we need this to redirect
-   stdin reliably (redirections aren't "inherited" in VxWorks) */
-static
-run_erl(arg)
-int arg;
-{
-    ioTaskStdSet(0, 0, slavefd); /* redirect stdin to slave side of pty */
-
-    /* We don't want to redirect stdout/err since no one will be reading
-       from the master side (to_erl - and the open()s above - could be
-       made bidirectional, but still the master side would only be read
-       when to_erl was running), and output can eventually fill the pty
-       buffer and cause the Erlang system to block. Not redirecting
-       stdout/err will have the effect that output from Erlang, e.g. the
-       shell prompt, will appear on console/rlogin/whatever even when
-       to_erl isn't running, which may be confusing - can't win 'em all... */
-
-    erl_exec(arg, 0,0,0,0,0,0,0,0);	/* call the real startup */
-}
-
-/* Function callable from VxWorks shell to talk to Erlang - stop talking
-   and return to VxWorks shell through ^D (EOF) */
-to_erl()
-{
-    char buf[TBUFSIZ];
-    int cc;
-
-    if (masterfd == -1) {	/* sanity check */
-	fprintf(stderr, "Must start_erl first!\n");
-	return(-1);
-    }
-    while ((cc = read(0, buf, TBUFSIZ)) > 0) /* just pass everything through */
-	if (write(masterfd, buf, cc) != cc) {
-	    fprintf(stderr, "Write to Erlang failed!\n");
-	    return(-1);
-	}
-    return(cc);
-}
diff --git a/erts/etc/vxworks/erl_script.sam.in b/erts/etc/vxworks/erl_script.sam.in
deleted file mode 100644
index 81c2b0128d..0000000000
--- a/erts/etc/vxworks/erl_script.sam.in
+++ /dev/null
@@ -1,100 +0,0 @@
-# 
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
-# 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# %CopyrightEnd%
-# 
-#
-# erl_script.sam
-# Sample VxWorks script to start Erlang
-#
-# Note! This is not a complete or ready to use VxWorks startup script,
-# rather an example of what You should add to Your existing startupscript
-# to execute the erlang emulator at boot.
-#
-# When writing Your own script to start erlang, the paths to
-# the binaries have to be changed to reflect your system.
-# 
-# The ROOTDIR variable should not point to a ftp or rcp filesystem unless 
-# the erlang machine is run in embedded mode. Loading of modules 
-# is far to slow if the erlang binaries are not placed on a real filesystem 
-# like NFS or any type of local filesystem.
-# 
-
-#
-# Load modules
-#
-
-#
-# First load and initiate the reclaim facility
-#
-ld </home/tornado/erlvxworks/erts-%VSN%/bin/reclaim.o
-reclaim_init()
-
-#
-# Now load the runtime system
-#
-ld </home/tornado/erlvxworks/erts-%VSN%/bin/jam
-ld </home/tornado/erlvxworks/erts-%VSN%/bin/erl.exec
-ld </home/tornado/erlvxworks/erts-%VSN%/bin/erl_io
-ld </home/tornado/erlvxworks/erts-%VSN%/bin/vxcall
-ld </home/tornado/erlvxworks/erts-%VSN%/bin/heart
-ld </home/tornado/erlvxworks/erts-%VSN%/bin/epmd
-
-#
-# Stack sizes
-#
-putenv "ERLSTACKSIZE=100000"
-putenv "ERLPORTSTACKSIZE=100000"
-
-#
-# Activate Round robin scheduling
-#
-kernelTimeSlice 1
-
-#
-# Distribution
-# The VxWorks machines host name
-sethostname "sb001", 5
-# Erlangs internal resolver
-putenv "ERLRESCONF=/home/tornado/erlvxworks/erts-%VSN%/bin/resolv.conf"
-
-#
-# Start epmd (for distribution)
-#
-start_epmd "-daemon"
-
-#
-# Misc environment variables
-#
-putenv "ROOTDIR=/home/tornado/erlvxworks"
-putenv "BINDIR=/home/tornado/erlvxworks/erts-%VSN%/bin"
-putenv "PROGNAME=erl"
-putenv "HOME=/home/tornado/erlvxworks"
-
-#
-# Set heart no reboot mode (to make heart reboot - 
-#  don't define HEART_DONT_REBOOT at all)
-# 
-putenv "HEART_DONT_REBOOT=1"
-
-# To get fullsweep garbage collection on systems with
-# very limited memory, set ERL_FULLSWEEP_AFTER to "0":
-# putenv "ERL_FULLSWEEP_AFTER=0"
-
-#
-# Start Erlang/OTP
-#
-start_erl "-oldshell -heart -sname vxnode -setcookie switch -boot start_sasl"
diff --git a/erts/etc/vxworks/heart_config.c b/erts/etc/vxworks/heart_config.c
deleted file mode 100644
index 7e60e61fbb..0000000000
--- a/erts/etc/vxworks/heart_config.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-/*
- * A basic heart configure module for VxWorks.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#include <vxWorks.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <rebootLib.h>
-#include <sysLib.h>
-
-/* wd_init is executed to initialize a watchdog (if one is used). */
-int wd_init(timeout, prio)
-     int timeout, prio;
-{
-
-} 
-
-/* wd_reset should be called every 5th second from heart */
-void wd_reset()
-{
-
-}
-
-/* This routine is called when erlang has closed */
-void heart_reboot()
-{
-    if (getenv("HEART_DONT_REBOOT") != NULL) {
-	fprintf(stderr, "heart_config: HEART_DONT_REBOOT set, no reboot ...\n");
-    } else {
-	fprintf(stderr, "heart_config: rebooting ...\n");
-	taskDelay(sysClkRateGet() * 5);
-	reboot(BOOT_CLEAR);
-    }
-}
-
-
-
-
diff --git a/erts/etc/vxworks/heart_config.h b/erts/etc/vxworks/heart_config.h
deleted file mode 100644
index 5ffaaa8c3f..0000000000
--- a/erts/etc/vxworks/heart_config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-/*
- * This is heart's watchdog interface for VxWorks.
- */
-
-#ifndef _HW_WATCHDOG_H
-#define _HW_WATCHDOG_H
-
-extern void wd_init(int timeout, int prio);     /* wd_init initializes the 
-						  watchdog, if one is used. */
-extern void wd_reset(void);                     /* wd_reset is used by heart to kick
-						  the watchdog, if one is used. */
-extern void heart_reboot(void);                        /* reboot is called if heart discovers
-						  that the Erlang task has stopped sending
-						  heart beats. It can log system status
-						  and should reboot VxWorks. */
-
-#endif
diff --git a/erts/etc/vxworks/rdate.c b/erts/etc/vxworks/rdate.c
deleted file mode 100644
index 3e8cc644d0..0000000000
--- a/erts/etc/vxworks/rdate.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <vxWorks.h>
-#include <timers.h>
-#ifdef NETDB
-#include <netdb.h>
-#endif
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-/*
-   rdate("host") - Set the time from "host".
-*/
-
-/* No getservbyname() available... */
-#define TIME_PORT 37
-
-rdate(host)
-char *host;
-{
-    u_long haddr;
-#ifdef NETDB
-    struct hostent *hp;
-#endif
-    struct sockaddr_in saddr;
-    int sock;
-    u_long net_time;
-    struct timespec t;
-
-    if ((haddr = inet_addr(host)) == ERROR) {
-#ifdef NETDB
-	if ((hp = gethostbyname(host)) == NULL) {
-#else
-	if ((haddr = hostGetByName(host)) == ERROR) {
-#endif
-	    printf("Host not found.\n");
-	    return(-1);
-	}
-#ifdef NETDB
-	memcpy(&haddr, hp->h_addr, sizeof(haddr));
-#endif
-    }
-    memset(&saddr, 0, sizeof(saddr));
-    saddr.sin_family = AF_INET;
-    memcpy(&saddr.sin_addr, &haddr, sizeof(haddr));
-    saddr.sin_port = htons(TIME_PORT);
-    if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
-	perror("socket");
-	return(-1);
-    }
-    if (connect(sock, (struct sockaddr *)&saddr, sizeof(saddr)) < 0) {
-	perror("connect");
-	close(sock);
-	return(-1);
-    }
-    if (read(sock, &net_time, 4) != 4) {
-	perror("read");
-	close(sock);
-	return(-1);
-    }
-    t.tv_sec = ntohl(net_time);
-    t.tv_sec -= 2208988800;	/* seconds 1900-01-01 -- 1970-01-01 */
-    t.tv_nsec = 0;
-    clock_settime(CLOCK_REALTIME, &t);
-    close(sock);
-    return(0);
-}
diff --git a/erts/etc/vxworks/reclaim.c b/erts/etc/vxworks/reclaim.c
deleted file mode 100644
index d8676b3750..0000000000
--- a/erts/etc/vxworks/reclaim.c
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <vxWorks.h>
-#include <version.h>
-#include <string.h>
-#include <types.h>
-#include <sigLib.h>
-#include <ioLib.h>
-#include <iosLib.h>
-#include <fioLib.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <symLib.h>
-#include <sysLib.h>
-#include <sysSymTbl.h>
-#include <loadLib.h>
-#include <taskLib.h>
-#include <taskVarLib.h>
-#include <taskHookLib.h>
-#include <tickLib.h>
-#include <time.h>
-#include <rngLib.h>
-#include <semLib.h>
-#include <selectLib.h>
-#include <sockLib.h>
-#include <a_out.h>
-#include <wdLib.h>
-#include <timers.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <stdarg.h>
-
-#include <stdio.h>
-#include <math.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-
-#define RECLAIM_NO_ALIAS /* No #defines for open/malloc/fopen etc */
-#include "reclaim.h"
-#include "reclaim_private.h"
-
-#undef open
-#undef creat
-#undef socket
-#undef accept
-#undef close
-#undef fopen
-#undef fdopen
-#undef freopen
-#undef fclose
-/* XXX Should do opendir/closedir too... */
-#undef malloc
-#undef calloc
-#undef realloc
-#undef free
-#undef cfree
-
-#ifdef _ARCH_PPC 
-#define MAX_FILES_SYM_NAME "maxFiles"
-#else
-#define MAX_FILES_SYM_NAME "_maxFiles"
-#endif
-
-
-/* 
- * Use another free() function upon task deletion? 
- * Note! When changing free function, the new free function will have to
- * be able to cope with ALL previously used malloced areas, that is 
- * it has to be able to find out how things are malloced
- * to free them in the right way!
- */
-static FreeFunction reclaim_free_function = NULL;
-
-/* delete hook handling (see below) */
-static int hook_added = 0;	/* Initated at first reclaim_init, an extra
-				 non MT-safe check that we only get 
-				 initialized once */
-
-/* Forward... */
-static void save_reclaim(WIND_TCB *tcbp);
-
-struct mall_data {
-    struct mall_data *next;
-    char *self;
-};
-
-struct task_data {
-    FUNCPTR version;		/* To recognize when we have reloaded */
-    int max_files;		/* It may change... */
-    struct fd_set open_fds;
-    struct mall_data *mall_data;
-    FUNCPTR delete_hook;
-    caddr_t hook_data;
-    FILE *open_fps[1];		/* Will be max_files long */
-} *task_data = NULL;
-
-static int max_files = 50;	/* default configAll.h */
-
-int reclaim_max_files(void)
-{
-    return max_files;
-}
-
-#ifdef DEBUG
-#define check_hook() \
-((task_data != NULL || \
-  fdprintf(2,"check_hook() TID = 0x%08x, Called from line %d\n", \
-	  (unsigned int)taskIdSelf(),\
-	  __LINE__)) && \
-(task_data != NULL || \
- (taskVarAdd(0, (int *)&task_data) == OK && \
- (task_data = (struct task_data *)\
- calloc(1, sizeof(struct task_data) + max_files*sizeof(FILE *))) != NULL && \
-   (task_data->version = (FUNCPTR)save_reclaim) != NULL && \
-   (task_data->max_files = max_files) != 0 && \
-  fdprintf(2,"taskVar Added for 0x%08x\n",(unsigned int)taskIdSelf()))))
-#else
-#define check_hook() \
-(task_data != NULL || \
- (taskVarAdd(0, (int *)&task_data) == OK && \
- (task_data = (struct task_data *)\
- calloc(1, sizeof(struct task_data) + max_files*sizeof(FILE *))) != NULL && \
-   (task_data->version = (FUNCPTR)save_reclaim) != NULL && \
-   (task_data->max_files = max_files) != 0))
-#endif
-
-/*
- * Global initialization of the reclaim data structures, mainly
- * the max_files variable. This HAS to be called by some task before 
- * the first task that utilizes this exit's, preferrably before any
- * task makes the first use of this library.
- */
-STATUS reclaim_init(void)
-{
-    int *mp;
-    SYM_TYPE type;
-    struct task_data *tdp;
-    int i;
-
-    if (!hook_added) {
-	/* race condition */
-	++hook_added;
-	/* Try to find the maxFiles value */
-	if (symFindByNameAndType(sysSymTbl, MAX_FILES_SYM_NAME, (char **)&mp, 
-				 &type,
-				 N_EXT | N_BSS, N_EXT | N_BSS) == OK ||
-	    symFindByNameAndType(sysSymTbl, MAX_FILES_SYM_NAME, (char **)&mp, 
-				 &type,
-				 N_EXT | N_DATA, N_EXT | N_DATA) == OK) {
-
-#ifdef DEBUG
-	    fdprintf(2, "Found maxFiles=%d\n", *mp);
-#endif
-	    if (*mp <= FD_SETSIZE)
-		max_files = *mp;
-	    else
-		max_files = FD_SETSIZE;
-	}
-	if (task_data != NULL && task_data->max_files != max_files) {
-	    /* fix our own iff we have one */
-	    if ((tdp = (struct task_data *)
-		 realloc(task_data, sizeof(struct task_data) +
-			 max_files*sizeof(FILE *))) != NULL) {
-		task_data = tdp;
-		for (i = task_data->max_files; i < max_files; i++)
-		    task_data->open_fps[i] = NULL;
-		task_data->max_files = max_files;
-	    }
-	}
-	/* Make sure taskVariables are deleted AFTER our hook is run. */
-	taskVarInit();
-	if(taskDeleteHookAdd((FUNCPTR)save_reclaim) != OK) {
-	    fprintf(stderr, 
-		    "Panic: taskDeleteHook cannot be added for reclaim.\n");
-	    return ERROR;
-	}
-	return OK;
-    } else 
-	return ERROR;
-}
-
-/* N.B.!! We do *not* execute in the context of the dying task here,
-   but rather that of tExcTask - we do get a pointer to the task's
-   TCB though - this pointer is in fact also the task's ID.     */
-static void save_reclaim(WIND_TCB *tcbp)
-{
-  int i, var, oldfd;
-  struct task_data *tdp;
-  struct mall_data *mdp, *mdnextp;
-
-  if ((var = taskVarGet((int)tcbp, (int *)&task_data)) != ERROR &&
-      var != 0) {
-    tdp = (struct task_data *)var;
-    if (tdp->version == (FUNCPTR)save_reclaim) { /* Only handle our own */
-#ifdef DEBUG
-      fdprintf(2, "Reclaiming for task id 0x%x:\nFiles: ", (int)tcbp);
-#endif
-      /* Ugh! VxWorks doesn't even flush stdout/err - we need to
-	 get at those (which are task-private of course, i.e. we
-	 can't just do fflush(stdout) here) - we could be really
-	 pedantic and try to redefine stdout/err (which "are"
-	 function calls) too, snarfing the values when they are
-	 used - but besides the overhead this is problematic since
-	 they are actually #defines already... We'll peek in the
-	 TCB instead (no documentation of course). And of course,
-	 we must also meddle with the *file descriptor* indirections,
-	 or we'll just flush out on tExcTask's descriptors...   */
-      for (i = 1; i <= 2; i++) {
-	if (tcbp->taskStdFp[i] != NULL) {
-#ifdef DEBUG
-	  fdprintf(2, "fflush(%s) ", i == 1 ? "stdout" : "stderr");
-#endif
-	  oldfd = ioTaskStdGet(0, i);
-	  ioTaskStdSet(0, i, tcbp->taskStd[i]);
-	  fflush(tcbp->taskStdFp[i]);
-	  ioTaskStdSet(0, i, oldfd);
-	}
-      }
-      for (i = 3; i < tdp->max_files; i++) {
-	if (FD_ISSET(i, &tdp->open_fds)) {
-#ifdef DEBUG
-	  fdprintf(2, "close(%d) ", i);
-#endif
-	  (void) close(i);
-	}
-	if (tdp->open_fps[i] != NULL) {
-#ifdef DEBUG
-	  fdprintf(2, "fclose(%0x%x) ", (int)tdp->open_fps[i]);
-#endif
-	  (void) fclose(tdp->open_fps[i]);
-	}
-      }
-      i = 0;
-      mdp = tdp->mall_data;
-      while (mdp != NULL) {
-	mdnextp = mdp->next;
-	if(reclaim_free_function != NULL)
-	    (*reclaim_free_function)(mdp->self);
-	else
-	    free(mdp->self);
-	i++;
-	mdp = mdnextp;
-      }
-#ifdef DEBUG
-      fdprintf(2, "\nFreeing memory: total %d mallocs\n", i);
-#endif
-      
-      if (tdp->delete_hook != NULL) {
-#ifdef DEBUG
-	  fdprintf(2, "Calling delete hook at 0x%08x\n", tdp->delete_hook);
-#endif
-	  (*tdp->delete_hook)(tdp->hook_data);
-#ifdef DEBUG
-	  fdprintf(2, "Called delete hook at 0x%08x\n", tdp->delete_hook);
-#endif
-      }
-#ifdef DEBUG
-      fdprintf(2, "Freeing own mem at 0x%08x\n", tdp);
-#endif
-      (void) free((char *)tdp);
-#ifdef DEBUG
-      fdprintf(2, "Freed own mem at 0x%08x, done (0x%08x)\n**********\n", tdp,
-	       taskIdSelf());
-      checkStack(0);
-#endif
-    }
-  }
-#ifdef DEBUG
-  else
-    fdprintf(2, "No task data found for id 0x%x, var = %d\n", (int)tcbp, var);
-#endif
-}
-
-/*
- * This sets another free function to be used by the task deletion hook.
- * The free function HAS to be able to free ANY type of dynamically allocated
- * memory that can be in the task data list of allocated memory, that is
- * also memory that's allocated before the free function was set.
- * A "user-supplied" free function is GLOBAL to the system!!!
- * A race condition is present, a task delete hook may be running when this
- * function is called, that may not be especially funny...
- */ 
-void set_reclaim_free_function(FreeFunction f){
-    reclaim_free_function = f;
-}
-
-void save_delete_hook(FUNCPTR func, caddr_t parm)
-{
-  if (check_hook()) {
-    task_data->delete_hook = func;
-    task_data->hook_data = parm;
-  }
-}
-
-/*
- * plain_malloc is only used by spawn_start; plain_free by call_proc;
- * save_fd is used by both.
- */
-void *plain_malloc(size_t size){
-  return(malloc(size));
-}
-
-void *plain_realloc(void *ptr, size_t size){
-  return(realloc(ptr, size));
-}
-
-void plain_free(void *ptr){
-  free(ptr);
-}
-
-void save_fd(int fd){
-  if (fd >= 0 && check_hook() && fd < task_data->max_files)
-    FD_SET(fd, &task_data->open_fds);
-}
-
-int save_open(char *path, int flags, /*mode_t mode*/ ...){
-  int fd;
-  mode_t mode = 0;
-  if(flags & O_CREAT){
-      va_list pvar;
-      va_start(pvar,flags);
-#ifdef __GNUC__
-#warning save_open() gives three known alignment warnings.
-#endif
-      mode = va_arg(pvar, mode_t);
-      va_end(pvar);
-  }
-  if ((fd = open(path, flags, mode)) >= 0 && check_hook())
-    FD_SET(fd, &task_data->open_fds);
-  return(fd);
-}
-
-int save_creat(char *path, int mode){
-  int fd;
-  if ((fd = creat(path, mode)) >= 0 && check_hook())
-    FD_SET(fd, &task_data->open_fds);
-  return(fd);
-}
-
-int save_socket(int domain, int type, int protocol){
-  int fd;
-  if ((fd = socket(domain, type, protocol)) >= 0 && check_hook())
-    FD_SET(fd, &task_data->open_fds);
-  return(fd);
-}
-
-int save_accept(int s, struct sockaddr *addr, int *addrlen){
-  int fd;
-  if ((fd = accept(s, addr, addrlen)) >= 0 && check_hook())
-    FD_SET(fd, &task_data->open_fds);
-  return(fd);
-}
-
-int save_close(int fd){
-  if (fd >= 0 && fd <= FD_SETSIZE && check_hook())
-    FD_CLR(fd, &task_data->open_fds);
-  return(close(fd));
-}
-
-/* The dealing with FILE *'s below isn't strictly correct, we assume
-   that one never has several pointing to the same fd - in the unlikely
-   event that one does, all but the last one opened is forgotten */
-FILE *save_fopen(const char *filename, char *type){
-  FILE *fp;
-    
-  if ((fp = fopen(filename, type)) != NULL &&
-      check_hook() && fileno(fp) < task_data->max_files)
-    task_data->open_fps[fileno(fp)] = fp;
-  return(fp);
-}
-
-FILE *save_fdopen(int fd, char *type){
-  FILE *fp;
-    
-  if ((fp = fdopen(fd, type)) != NULL &&
-      check_hook() && fileno(fp) < task_data->max_files) {
-    task_data->open_fps[fileno(fp)] = fp;
-    FD_CLR(fd, &task_data->open_fds);
-  }
-  return(fp);
-}
-
-FILE *save_freopen(char *filename, char *type, FILE *stream){
-  FILE *fp;
-
-  if (check_hook()) {
-    if(fileno(stream) < task_data->max_files &&
-       task_data->open_fps[fileno(stream)] == stream)
-      task_data->open_fps[fileno(stream)] = NULL;
-    if ((fp = freopen(filename, type, stream)) != NULL &&
-	fileno(fp) < task_data->max_files)
-      task_data->open_fps[fileno(fp)] = fp;
-  } else
-    fp = freopen(filename, type, stream);
-  return(fp);
-}
-
-int save_fclose(FILE *stream){
-  if (check_hook() && fileno(stream) < task_data->max_files &&
-      task_data->open_fps[fileno(stream)] == stream)
-    task_data->open_fps[fileno(stream)] = NULL;
-  return(fclose(stream));
-}
-
-/* We link all malloc'ed segments by adding a couple of pointers
-   at the *end* - that way we can return the address malloc gave
-   (need to make sure we align those pointers) */
-
-/*
-  #define MALL_MARGIN   32
-  #define save_mall_size(size)  save_mall_size1((size) + 2 * MALL_MARGIN)
-  #define save_mall_size1(size) \
-  (((size) + sizeof(char *) - 1) & (unsigned long)(-sizeof(char*)))
- 
-  #define save_mall_enq(ptr, mdp) save_mall_enq1((ptr), (mdp) - MALL_MARGIN)
-  #define save_mall_enq1(ptr, mdp) \
-  (((struct mall_data *)(mdp))->self = (ptr), \
-  ((struct mall_data *)(mdp))->next = task_data->mall_data, \
-  task_data->mall_data = (struct mall_data *)(mdp))
-*/
-#define save_mall_size(size) \
-(((size) + sizeof(char *) - 1) & (unsigned long)(-sizeof(char*)))
-#define save_mall_enq(ptr, mdp) \
-(((struct mall_data *)(mdp))->self = (ptr), \
- ((struct mall_data *)(mdp))->next = task_data->mall_data, \
-     task_data->mall_data = (struct mall_data *)(mdp))
- 
-
-#define save_mall_deq(ptr) { \
-    struct mall_data *mdp = task_data->mall_data, \
-    **prevnext = &task_data->mall_data; \
-    while (mdp != NULL && mdp->self != (ptr)) { \
-	prevnext = &mdp->next; \
-	mdp = mdp->next; \
-    } \
-    if (mdp != NULL) *prevnext = mdp->next; \
-}
-
-void *save_malloc2(size_t size, MallocFunction mf){
-  unsigned msize = save_mall_size(size);
-  char *ptr;
-
-  if ((ptr = (*mf)(msize + sizeof(struct mall_data))) != NULL &&
-      check_hook())
-    save_mall_enq((void *) ptr, (void *) (ptr + msize));
-  return((void *) ptr);
-}
-
-void *save_malloc(size_t size){
-    return save_malloc2(size, &malloc);
-}
-
-void *save_calloc2(size_t nelem, size_t elsize, CallocFunction cf){
-  unsigned msize = save_mall_size(nelem * elsize);
-  char *ptr;
-
-  if ((ptr = (*cf)(1, msize + sizeof(struct mall_data))) != NULL &&
-      check_hook())
-    save_mall_enq((void *) ptr, (void *) (ptr + msize));
-  return((void *) ptr);
-}
-
-void *save_calloc(size_t nelem, size_t elsize){
-    return save_calloc2(nelem,elsize,&calloc);
-}
-
-void *save_realloc2(void *optr, size_t size, ReallocFunction rf){
-  unsigned msize = save_mall_size(size);
-  char *ptr;
-
-  /* First we must dequeue the old save block, after that
-     we try to realloc, if that succeeds we enqueue the new
-     block, if it fails we have to enqueue the old one anew
-     so we must deduce the size of that old block first. */
-
-  struct mall_data *mdp0 = task_data->mall_data,
-      **prevnext0 = &task_data->mall_data;
-  while (mdp0 != NULL && mdp0->self != (((char *) optr))) { 
-      prevnext0 = &mdp0->next;
-      mdp0 = mdp0->next;
-  }
-  /* mdp0 == NULL (can) mean that the block that is realloced
-   have been malloced with an (for example) ordinary malloc
-   (that is not a save_malloc). This is handled like: no dequeing
-   is done of that block, the new block is enqueued */ 
-  if (mdp0 != NULL)
-      save_mall_deq(((char *) optr));
-
-  if ((ptr = (*rf)(optr, msize + sizeof(struct mall_data))) != NULL &&
-      check_hook())
-      save_mall_enq((void *) ptr, (void *) (ptr + msize));
-  else if (mdp0 != NULL)
-      /* re-enqueue the old block that has just been dequeued */
-      save_mall_enq(((char *) optr), mdp0);
-  
-  return((void *) ptr);
-}
-
-void *save_realloc(void *optr, size_t size){
-    return save_realloc2(optr,size,&realloc);
-}
-
-void save_free2(void *ptr, FreeFunction ff)
-{
-  if (check_hook())
-    save_mall_deq(((char *) ptr));
-  (*ff)(ptr);
-}
-
-void save_free(void *ptr){
-    save_free2(ptr,&free);
-}
-
-void save_cfree2(void *ptr, CfreeFunction cf)
-{
-  if (check_hook())
-    save_mall_deq(((char *)ptr));
-  (*cf)(ptr);
-}
-
-void save_cfree(void *ptr){
-    save_cfree2(ptr,&cfree);
-}
-
diff --git a/erts/etc/vxworks/reclaim.h b/erts/etc/vxworks/reclaim.h
deleted file mode 100644
index ca9aa8f6be..0000000000
--- a/erts/etc/vxworks/reclaim.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-#ifndef _RECLAIM_H
-#define _RECLAIM_H
-
-
-/* The Erlang release for VxWorks includes a simple mechanism for
-   "resource reclamation" at task exit - it allows replacement of the
-   functions that open/close "files" and malloc/free memory with versions
-   that keep track, to be able to "reclaim" file descriptors and memory
-   when a task exits (regardless of *how* it exits).
-
-   The interface to this mechanism is made available via this file,
-   with the following caveats:
-
-   - The interface may change (or perhaps even be removed, though that
-     isn't likely until VxWorks itself provides similar functionality)
-     in future releases - i.e. you must always use the version of this
-     file that comes with the Erlang release you are using.
-
-   - Disaster is guaranteed if you use the mechanism incorrectly (see
-     below for the correct way), e.g. allocate memory with the "tracking"
-     version of malloc() and free it with the "standard" version of free().
-
-   - The mechanism (of course) incurs some performance penalty - thus
-     for a simple program you may be better off with careful programming,
-     making sure that you do whatever close()/free()/etc calls that are
-     appropriate at all exit points (though if you need to guard against
-     taskDelete() etc, things get messy...).
-
-   To use the mechanism, simply program your application normally, i.e.
-   use open()/close()/malloc()/free() etc as usual, but #include this
-   file before any usage of the relevant functions. NOTE: To avoid the
-   "disaster" mentioned above, you *must* #include it in *all* (or none)
-   of the files that manipulate a particular file descriptor, allocated
-   memory area, etc.
-
-   Before any task that uses this utility is loaded (which includes the 
-   erlang emulator), the reclaim.o object file has to be loaded and
-   the function reclaim_init() has to be called. reclaim_init should be called
-   only _ONCE_ in a systems lifetime and has only a primitive guard
-   against multiple calls (i.e. a global variable is checked). Therefore
-   the initialization should occur either in the start script of the system
-   or (even better) in the usrInit() part of system initialization. The 
-   object file itself should be loaded only once, so linking it with the
-   kernel is a good idea, linking with each application is an extremely bad 
-   dito. Make really sure that it's loaded _before_ any application that 
-   uses it if You want to load it in the startup script.
-
-   If You dont want to have #define's for the posix/stdio names
-   of the file/memory operations (i.e. no #define malloc save_malloc etc),
-   #define RECLAIM_NO_ALIAS in Your source before reclaim.h is included. 
-*/
-
-#include <vxWorks.h> /* STATUS, size_t  */
-#include <sockLib.h> /* struct sockaddr */
-#include <memLib.h> 
-#include <stdio.h>   /* FILE            */
-
-#if defined(__STDC__)
-#define _RECLAIM_DECL_FUN(RetType, FunName, ParamList) \
-extern RetType FunName ParamList
-#define _RECLAIM_VOID_PTR void *
-#define _RECLAIM_VOID_PARAM void
-#define _RECLAIM_VOID_RETURN void
-#elif defined(__cplusplus)
-#define _RECLAIM_DECL_FUN(RetType, FunName, ParamList) \
-extern "C" RetType FunName ParamList
-#define _RECLAIM_VOID_PTR void *
-#define _RECLAIM_VOID_PARAM 
-#define _RECLAIM_VOID_RETURN void
-#else
-#define _RECLAIM_DECL_FUN(RetType, FunName, Ignore) extern RetType FunName()
-#define DECLARE_FUNCTION_TYPE(RetType, Type, PList) typedef RetType (* Type)()
-#define _RECLAIM_VOID_PTR char *
-#define _RECLAIM_VOID_PARAM 
-#define _RECLAIM_VOID_RETURN
-#endif /* __STDC__ / __cplusplus */
-
-/* Initialize the facility, on a per system basis. */
-_RECLAIM_DECL_FUN(STATUS, reclaim_init, (_RECLAIM_VOID_PARAM)); 
-
-/* File descriptor operations */
-_RECLAIM_DECL_FUN(int,save_open,(char *, int, ...));
-_RECLAIM_DECL_FUN(int,save_creat,(char *, int));
-_RECLAIM_DECL_FUN(int,save_socket,(int, int, int));
-_RECLAIM_DECL_FUN(int,save_accept,(int, struct sockaddr *, int *));
-_RECLAIM_DECL_FUN(int,save_close,(int)); 
-/* Interface to add an fd to what's reclaimed even though it's not open with 
-   one of the above functions */
-_RECLAIM_DECL_FUN(_RECLAIM_VOID_RETURN, save_fd, (int fd));
-#ifndef RECLAIM_NO_ALIAS
-#define open	save_open
-#define creat	save_creat
-#define socket	save_socket
-#define accept	save_accept
-#define close	save_close
-#endif
-/* Stdio file operations */
-_RECLAIM_DECL_FUN(FILE *, save_fopen, (const char *, char *));
-_RECLAIM_DECL_FUN(FILE *, save_fdopen, (int, char *));
-_RECLAIM_DECL_FUN(FILE *, save_freopen, (char *, char *, FILE *));
-_RECLAIM_DECL_FUN(int, save_fclose, (FILE *));
-/* XXX Should do opendir/closedir too... */
-#ifndef RECLAIM_NO_ALIAS
-#define fopen	save_fopen
-#define fdopen	save_fdopen
-#define freopen	save_freopen
-#define fclose	save_fclose
-#endif
-/* Memory allocation */
-_RECLAIM_DECL_FUN(_RECLAIM_VOID_PTR, save_malloc, (size_t));
-_RECLAIM_DECL_FUN(_RECLAIM_VOID_PTR, save_calloc, (size_t, size_t));
-_RECLAIM_DECL_FUN(_RECLAIM_VOID_PTR, save_realloc, 
-		  (_RECLAIM_VOID_PTR, size_t));
-_RECLAIM_DECL_FUN(void, save_free, (_RECLAIM_VOID_PTR));
-_RECLAIM_DECL_FUN(void, save_cfree, (_RECLAIM_VOID_PTR));
-#ifndef RECLAIM_NO_ALIAS
-#define malloc	save_malloc
-#define calloc	save_calloc
-#define realloc	save_realloc
-#define free	save_free
-#define cfree	save_cfree
-#endif
-/* Generic interfaces to malloc etc... */
-_RECLAIM_DECL_FUN(_RECLAIM_VOID_PTR, plain_malloc, (size_t));
-_RECLAIM_DECL_FUN(_RECLAIM_VOID_PTR, plain_realloc, 
-		  (_RECLAIM_VOID_PTR, size_t));
-_RECLAIM_DECL_FUN(void, plain_free, (_RECLAIM_VOID_PTR));
-#endif /* _RECLAIM_H */
-
-
-
-
diff --git a/erts/etc/vxworks/reclaim_private.h b/erts/etc/vxworks/reclaim_private.h
deleted file mode 100644
index 4ed935bee2..0000000000
--- a/erts/etc/vxworks/reclaim_private.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-#ifndef _RECLAIM_PRIVATE_H
-#define _RECLAIM_PRIVATE_H
-/*
- * Private header for the reclaim facility, also included in the emulator.
- */
-
-#include "reclaim.h"
-
-/* Typedefs for ANSI memory allocation function pointers */
-typedef void *(*MallocFunction)(size_t);
-typedef void *(*ReallocFunction)(void *, size_t);
-typedef void *(*CallocFunction)(size_t, size_t);
-typedef void (*FreeFunction)(void *);
-typedef STATUS (*CfreeFunction)(char *);
-
-/* Functions for internal use and use by the emulator */
-extern int reclaim_max_files(void);
-extern void set_reclaim_free_function(FreeFunction f);
-extern void save_delete_hook(FUNCPTR func, caddr_t parm);
-extern void *save_malloc2(size_t size, MallocFunction mf);
-extern void *save_calloc2(size_t nelem, size_t elsize, CallocFunction cf);
-extern void *save_realloc2(void *optr, size_t size, ReallocFunction rf);
-extern void save_free2(void *ptr, FreeFunction ff);
-extern void save_cfree2(void *ptr, CfreeFunction ff);
-
-#endif /* _RECLAIM_PRIVATE_H */
diff --git a/erts/etc/vxworks/resolv.conf b/erts/etc/vxworks/resolv.conf
deleted file mode 100644
index 85c89d64c4..0000000000
--- a/erts/etc/vxworks/resolv.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-domain du.uab.ericsson.se
-nameserver 134.138.176.16
-nameserver 136.225.254.224
-nameserver 134.138.128.25
-search du.uab.ericsson.se uab.ericsson.se ericsson.se
-lookup bind file
diff --git a/erts/etc/vxworks/vxcall.c b/erts/etc/vxworks/vxcall.c
deleted file mode 100644
index 3362d05fc5..0000000000
--- a/erts/etc/vxworks/vxcall.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <vxWorks.h>
-#include <symLib.h>
-#include <sysSymTbl.h>
-#include <a_out.h>
-
-extern char *malloc();
-static STATUS lookup();
-
-/*
-   Little utility to convert from Unix' argv,argv calling conventions to
-   VxWorks' arg0,arg1,arg2,...
-   Will do limited argument parsing - no parenthesis around nor commas
-   between the args, which may be "-enclosed strings (without \ escapes),
-   '-enclosed characters (also no \ escapes), integers, or symbols.
-*/
-
-int vxcall(argc, argv)
-int argc;
-char **argv;
-{
-    int vxarg[10];		/* Max 10 args can be passed */
-    FUNCPTR entry;
-    SYM_TYPE type;
-    int i, l;
-
-#ifdef DEBUG
-    fdprintf(2, "vxcall:");
-    for (i = 1; i < argc; i++)
-	fdprintf(2, " %s", argv[i]);
-    fdprintf(2, "\n");
-#endif
-    if (lookup(argv[1], N_EXT | N_TEXT, (char **)&entry) != OK)
-	return(ERROR);
-    /* Do limited "C" parsing of the args */
-    for (i = 0; i < 10; i++) {
-	if (i < argc - 2) {
-	    switch (argv[i+2][0]) {
-	    case '"':
-		l = strlen(argv[i+2]) - 1;
-		if (argv[i+2][l] != '"')
-		    return(ERROR);
-		/* just strip the quotes - should do \escapes within... */
-		vxarg[i] = (int)&argv[i+2][1];
-		argv[i+2][l] = '\0';
-		break;
-	    case '\'':
-		if (argv[i+2][2] != '\'')
-		    return(ERROR);
-		vxarg[i] = argv[i+2][1]; /* should do \escapes... */
-		break;
-	    case '1': case '2': case '3': case '4':
-	    case '5': case '6': case '7': case '8': case '9':
-		vxarg[i] = atoi(argv[i+2]); /* should do octal, hex, float.. */
-		break;
-	    default:
-		if (lookup(argv[i+2], 0, (char **)&vxarg[i]) != OK)
-		    return(ERROR);
-	    }
-	} else
-	    vxarg[i] = 0;
-    }
-#ifdef DEBUG
-    fdprintf(2, "calling 0x%x(0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x)\n",
-	     entry, vxarg[0], vxarg[1], vxarg[2], vxarg[3], vxarg[4],
-		    vxarg[5], vxarg[6], vxarg[7], vxarg[8], vxarg[9]);
-#endif
-    return((*entry)(vxarg[0], vxarg[1], vxarg[2], vxarg[3], vxarg[4],
-		    vxarg[5], vxarg[6], vxarg[7], vxarg[8], vxarg[9]));
-}
-
-/* Entry point for unix:cmd in post-4.1 erlang - uses "sh -c 'cmd...'" */
-int sh(argc, argv)
-int argc;
-char **argv;
-{
-    int ll = strlen(argv[argc-1]) - 1;
-
-#ifdef DEBUG
-    int i;
-    fdprintf(2, "sh:");
-    for (i = 1; i < argc; i++)
-	fdprintf(2, " %s", argv[i]);
-    fdprintf(2, "\n");
-#endif
-    if (strcmp(argv[1], "-c") != 0 ||
-	argv[2][0] != '\'' || argv[argc-1][ll] != '\'')
-	return(ERROR);
-    argv[argc-1][ll] = '\0';	/* delete trailing ' */
-    argv[2]++;			/* skip leading ' (*after* the above!) */
-    return(vxcall(argc-1, argv+1));
-}
-
-/* Lookup symbol; get address for text symbols, value (assuming int)
-   otherwise; return OK or ERROR on failure
-   Symbol name is null-terminated and without the leading '_' */
-STATUS
-lookup(sym, stype, value)
-char *sym, **value;
-int stype;
-{
-    char buf[256];
-    char *symname = buf;
-    int len, ret;
-    SYM_TYPE type;
-
-    len = strlen(sym);
-    if (len > 254 && (symname = malloc(len+2)) == NULL)
-	return(ERROR);
-#if defined _ARCH_PPC || defined SIMSPARCSOLARIS
-    /* GCC for PPC or SIMSPARC doesn't add a leading _ to symbols */
-    strcpy(symname, sym);
-#else
-    sprintf(symname, "_%s", sym);
-#endif
-    ret = (stype != 0) ?
-	symFindByNameAndType(sysSymTbl, symname, value, &type, stype, stype) :
-	    symFindByName(sysSymTbl, symname, value, &type);
-    if (symname != buf)
-	free(symname);
-    if (ret == OK && (type & N_TEXT) == 0) /* get value */
-	*value = (char *)*((int *)*value);
-    return(ret);
-}
diff --git a/erts/etc/vxworks/wd_example.c b/erts/etc/vxworks/wd_example.c
deleted file mode 100644
index 0e3a6a1cb2..0000000000
--- a/erts/etc/vxworks/wd_example.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-/*  
- *  File:      frc5te_wd.c
- *  Purpose:   Watchdog NMI handling for FORCE 5TE
- *
- * Description:
- * The watchdog handler routines are system specific. A program that
- * wants to utilize a hardware watchdog should call wd_init and test
- * the return value. If wd_init returns true (!0); there is a hardware
- * watchdog, and that watchdog has been activated. If no watchdog exists,
- * wd_init returns false (0).
- * 
- * To keep the watchdog happy, call wd_reset at least every X seconds,
- * where X is the number of seconds specified in the call to wd_init.
- *
- * The watchdog can be disarmed by setting the variable wd_disarmed to 1,
- * and armed again by setting the same variable to 0. Watchdog status 
- * information can be retrieved using the function wd_status.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#include <frc5e.h>
-#include <logLib.h>
-#include <taskLib.h>
-#include <sysLib.h>
-#include <stdio.h>
-#include "hw_watchdog.h"
-
-/* prototypes */
-extern sysNMIConnect();
-#ifdef __STDC__
-void wd_keeper(int);
-void wd_nmi_int(UINT8);
-void wd_status(void);
-#else
-void wd_keeper();
-void wd_nmi_int();
-void wd_status();
-#endif
-
-#define WD_NMI_MIN_DELAY  0.830      /* Min time before watchdog NMI (in seconds) */
-#define WD_RESET_FREQUENCY (WD_NMI_MIN_DELAY / 2) /* how often the timer is reset */
-
-#define WD_KEEPER_STACK_SIZE 10000
-
-/* global variables */
-extern int spTaskOptions;
-static volatile int wd_count_startval;   /* start value set by wd_init */
-static volatile int wd_count;            /* counter for wd_keeper */
-volatile int wd_disarmed = 0;            /* debug feature */
-
-/* wd_init is executed to initialize the watchdog. It spawns the task   */
-/* wd_keeper and returns true (non-zero) if a hardware watchdog exists, */
-/* or returns false (zero) otherwise.                                   */
-int wd_init(timeout, prio)
-     int timeout, prio;
-{
-  taskSpawn("wd_keeper", prio, spTaskOptions, WD_KEEPER_STACK_SIZE, 
-	    (FUNCPTR)wd_keeper, timeout,0,0,0,0,0,0,0,0,0);
-  return !0;                          /* watchdog exists */
-} 
-
-
-/* wd_reset is called as an alive-signal from the supervisor process. */
-/* If there is no call to this function within a certain time, the    */
-/* watchdog will reboot the system.                                   */
-void wd_reset()
-{
-  wd_count = wd_count_startval;
-}
-
-
-/* wd_keeper runs as a separate task and resets the watchdog timer     */
-/* before an NMI is generated. This task uses the counter wd_count to  */
-/* decide if it should exit or keep resetting the timer.               */
-/* Note! This task must run with higher priority than the application! */
-void wd_keeper(timeout)
-     int timeout;
-{
-  int wd_delay = sysClkRateGet() * WD_RESET_FREQUENCY;
-  wd_count_startval = (int)(timeout / WD_RESET_FREQUENCY);
-  wd_count = wd_count_startval;
-
-  /* Connect and enable level 15 interrupts */
-  sysNMIConnect((VOIDFUNCPTR) wd_nmi_int, WD_NMI, WD_NMI);
-  *(char *)FRC5CE_GEN_PURPOSE2_REG |= FRC5CE_NMI_ENABLE;
-
-  while ((wd_count > 0) || wd_disarmed) {
-      *(char *)FRC5CE_VME_A32MAP_REG |= FRC5CE_WATCHDOG_ENABLE;
-      taskDelay(wd_delay);
-      if (!wd_disarmed) wd_count--;
-      else wd_count = wd_count_startval;
-    }
-  logMsg("Watchdog keeper exits. No alive signal from application in %d seconds.\n",wd_count_startval * WD_RESET_FREQUENCY,0,0,0,0,0);
-}
-
-
-/* wd_nmi_int is the function connected to the watchdog interrupt. */
-/* It will report the failure to reset the watchdog timer.         */
-void wd_nmi_int(type)
-     UINT8 type;
-{
-  switch(type) {
-  case WD_NMI:
-    logMsg("Watchdog interrupt! System will reboot.\n",0,0,0,0,0,0);
-    break;
-  default:
-    logMsg("Bad type (%d) in call to watchdog interrupt handler.\n",type,0,0,0,0,0);
-    break;
-  }    
-}
-
-
-/* wd_status displays the current value of the counter. */
-void wd_status()
-{
-    fprintf(stderr, "Watchdog is %sarmed.\n", wd_disarmed ? "dis" : "");
-    fprintf(stderr, "Counter value:  %d\n", wd_count);
-    fprintf(stderr, "Start value is: %d (%d seconds)\n",
-	    wd_count_startval, (int)(wd_count_startval * WD_RESET_FREQUENCY));
-}
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index 8e92cc21cb..68059c5a2e 100644
--- a/erts/preloaded/ebin/erl_prim_loader.beam
+++ b/erts/preloaded/ebin/erl_prim_loader.beam
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index 538aa264d3..635d18f44e 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index cd5519f537..2d2a7aafbd 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -1376,14 +1376,7 @@ pathtype(Name) when is_list(Name) ->
 	{unix, _}  -> 
 	    unix_pathtype(Name);
 	{win32, _} ->
-	    win32_pathtype(Name);
-	{vxworks, _} ->
-	    case vxworks_first(Name) of
-		{device, _Rest, _Dev} ->
-		    absolute;
-		_ ->
-		    relative
-	    end
+	    win32_pathtype(Name)
     end.
 
 unix_pathtype(Name) ->
@@ -1420,32 +1413,6 @@ win32_pathtype(Name) ->
 	    relative
     end.
 
-vxworks_first(Name) ->
-    case Name of
-	[] ->
-	    {not_device, [], []};
-	[$/ | T] ->
-	    vxworks_first2(device, T, [$/]);
-	[H | T] when is_list(H) ->
-	    vxworks_first(H ++ T);
-	[H | T] ->
-	    vxworks_first2(not_device, T, [H])
-    end.
-
-vxworks_first2(Devicep, Name, FirstComp) ->
-    case Name of 
-	[] ->
-    {Devicep, [], FirstComp};
-	[$/ |T ] ->
-	    {Devicep, [$/ | T], FirstComp};
-	[$: | T]->
-	    {device, T, [$: | FirstComp]};
-	[H | T] when is_list(H) ->
-	    vxworks_first2(Devicep, H ++ T, FirstComp);
-	[H | T] ->
-	    vxworks_first2(Devicep, T, [H | FirstComp])
-    end.
-
 normalize(Name, Acc) ->
     case Name of
 	[List | Rest] when is_list(List) ->
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index d66f0e09cc..401b5e8611 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -674,25 +674,7 @@ set_cwd(Dir) ->
 set_cwd(Port, Dir) when is_port(Port) ->
     set_cwd_int(Port, Dir).
 
-set_cwd_int(Port, Dir0) ->
-    Dir = 
-	(catch
-	 case os:type() of
-	     vxworks -> 
-		 %% chdir on vxworks doesn't support
-		 %% relative paths
-		 %% must call get_cwd from here and use
-		 %% absname/2, since
-		 %% absname/1 uses file:get_cwd ...
-		 case get_cwd_int(Port, 0) of
-		     {ok, AbsPath} ->
-			 filename:absname(Dir0, AbsPath);
-		     _Badcwd ->
-			 Dir0
-		 end;
-	     _Else ->
-		 Dir0
-	 end),
+set_cwd_int(Port, Dir) ->
     %% Dir is now either a string or an EXIT tuple.
     %% An EXIT tuple will fail in the following catch.
     drv_command(Port, [?FILE_CHDIR, pathname(Dir)]).
diff --git a/erts/test/Makefile b/erts/test/Makefile
index 9097781ae7..85b78a79d2 100644
--- a/erts/test/Makefile
+++ b/erts/test/Makefile
@@ -79,7 +79,7 @@ release_spec:
 
 release_tests_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) system.spec system.dynspec system.spec.vxworks \
+	$(INSTALL_DATA) system.spec system.dynspec \
 		$(ERL_FILES) $(TARGET_FILES) "$(RELSYSDIR)"
 	chmod -R u+w "$(RELSYSDIR)"
 	tar cf - *_SUITE_data utils | (cd "$(RELSYSDIR)"; tar xf -)
diff --git a/erts/test/system.spec.vxworks b/erts/test/system.spec.vxworks
deleted file mode 100644
index 378adf56ac..0000000000
--- a/erts/test/system.spec.vxworks
+++ /dev/null
@@ -1,2 +0,0 @@
-{topcase, {dir, "../system_test"}}.
-{skip,{erlc_SUITE, "Not on VxWorks, erlc is a HOST tool."}}
diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
index 903cf32838..8cf9cda274 100644
--- a/lib/asn1/c_src/Makefile
+++ b/lib/asn1/c_src/Makefile
@@ -66,13 +66,8 @@ NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1_erl_nif.dll
 CLIB_FLAGS =
 LN=cp
 else
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1_erl_nif.eld
-CLIB_FLAGS =
-else
 NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1_erl_nif.so
 CLIB_FLAGS = -lc
-endif
 LN= ln -s
 endif
 
diff --git a/lib/cosFileTransfer/test/fileTransfer_SUITE.erl b/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
index 79a234bd28..18a591a7af 100644
--- a/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
+++ b/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
@@ -292,13 +292,8 @@ fts_ftp_file_api(Config) ->
 fts_ftp_file_ssl_api(doc) -> ["CosFileTransfer FTP FileTransferSession API tests.", ""];
 fts_ftp_file_ssl_api(suite) -> [];
 fts_ftp_file_ssl_api(Config) ->
-    case os:type() of
-        vxworks ->
-	    {skipped, "No SSL-support for VxWorks."};
-        _ ->
-	    ?line {ok, Node} = create_node("ftp_file_api_ssl", {4005, 1}, ssl),
-	    file_helper(Config, 'FTP', ?TEST_DIR, Node, 4005, "ftp_file_api_ssl", ssl)
-    end.
+    ?line {ok, Node} = create_node("ftp_file_api_ssl", {4005, 1}, ssl),
+    file_helper(Config, 'FTP', ?TEST_DIR, Node, 4005, "ftp_file_api_ssl", ssl).
 
 fts_native_file_api(doc) -> ["CosFileTransfer NATIVE FileTransferSession API tests.", ""];
 fts_native_file_api(suite) -> [];
@@ -311,15 +306,10 @@ fts_native_file_api(Config) ->
 fts_native_file_ssl_api(doc) -> ["CosFileTransfer NATIVE FileTransferSession API tests.", ""];
 fts_native_file_ssl_api(suite) -> [];
 fts_native_file_ssl_api(Config) ->
-    case os:type() of
-        vxworks ->
-	    {skipped, "No SSL-support for VxWorks."};
-        _ ->
-	    ?line {ok, Node} = create_node("native_file_ssl_api", {4007, 1}, ssl),
-	    {ok, Pwd} = file:get_cwd(),
-	    file_helper(Config,{'NATIVE', 'cosFileTransferNATIVE_file'},filename:split(Pwd),
-			Node, 4007, "native_file_ssl_api", ssl)
-    end.   
+    ?line {ok, Node} = create_node("native_file_ssl_api", {4007, 1}, ssl),
+    {ok, Pwd} = file:get_cwd(),
+    file_helper(Config,{'NATIVE', 'cosFileTransferNATIVE_file'},filename:split(Pwd),
+	Node, 4007, "native_file_ssl_api", ssl).
 				 
 
 
@@ -817,23 +807,13 @@ create_node(Name, Port, Retries, Type, Args, Options) ->
     end.
 
 starter(Host, Name, Args) ->
-    case os:type() of
-        vxworks ->
-            test_server:start_node(Name, slave, [{args,Args}]);
-        _ ->
-            slave:start(Host, Name, Args)
-    end.
+    slave:start(Host, Name, Args).
 
 slave_sup() ->
     process_flag(trap_exit, true),
     receive
         {'EXIT', _, _} -> 
-            case os:type() of
-                vxworks ->
-                    erlang:halt();
-                _  ->
-                    ignore
-            end
+	    ignore
     end.
 
 
@@ -850,12 +830,7 @@ destroy_node(Node, Type) ->
 
 stopper(Node, Type) ->
     catch stop_orber_remote(Node, Type),
-    case os:type() of
-        vxworks ->
-            test_server:stop_node(Node);
-        _ ->
-            slave:stop(Node)
-    end.
+    slave:stop(Node).
 -endif.
   
 %%------------------------------------------------------------
diff --git a/lib/diameter/autoconf/configure.vxworks b/lib/diameter/autoconf/configure.vxworks
deleted file mode 100755
index 33aa497680..0000000000
--- a/lib/diameter/autoconf/configure.vxworks
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/sh
-# 
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-# 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# %CopyrightEnd%
-# 
-# Author:
-#         Patrik Winroth 
-#
-
-
-# vxworks_ppc860 vxworks_ppc603 vxworks_ppc603_longcall vxworks_cpu32 vxworks_sparc 
-# vxworks_ppc750 vxworks_simso
-
-case $# in
-1) host=$1 ;;
-*) echo "usage: configure.vxworks host-configuration"; exit 1 ;;
-esac
-
-case $1 in
-vxworks_cpu32) ;;
-vxworks_ppc750) ;;
-vxworks_ppc860) ;;
-vxworks_ppc603) ;;
-vxworks_ppc603_nolongcall) ;;
-vxworks_sparc) ;;
-vxworks_simso) ;;
-vxworks_simlinux) ;;
-vxworks_ppc32) ;;
-*) echo "usage: configure.vxworks TARGET";
-   echo "where TARGET is one of vxworks_cpu32, vxworks_ppc750, vxworks_ppc860, vxworks_ppc603, vxworks_ppc603_nolongcall, vxworks_sparc, vxworks_simso, vxworks_simlinux, vxworks_ppc32"; exit 1;;
-esac
-
-if [ "x$ERL_TOP" = x ]; then
-    echo "You need to set ERL_TOP!"
-    exit 1
-fi
-
-
-target=$host
-
-# Find out the HOST and WIND_BASE environment
-HOST_TYPE=${HOST_TYPE:=sun4-solaris2}
-case $1 in
-vxworks_ppc750) VXTOP=Tornado2.2 ;;
-vxworks_simso)  VXTOP=WindRiver ;;
-vxworks_simlinux)  VXTOP=WindRiver ;;
-vxworks_ppc32)  VXTOP=WindRiver ;;
-*)              VXTOP=wind ;;
-esac
-
-WIND_BASE=${WIND_BASE:=`ypmatch tornado passwd | awk -F: '{print $6}'`/$VXTOP}
-
-# These are created by autoconf.
-MKDIRS="${ERL_TOP}/lib/os_mon/priv/bin/$target
-        ${ERL_TOP}/lib/os_mon/priv/obj/$target
-        ${ERL_TOP}/lib/orber/priv/obj/$target
-        ${ERL_TOP}/lib/orber/priv/bin/$target
-        ${ERL_TOP}/lib/ic/priv/lib/$target
-        ${ERL_TOP}/lib/ic/priv/obj/$target
-        ${ERL_TOP}/lib/asn1/priv/lib/$target
-        ${ERL_TOP}/lib/asn1/priv/obj/$target
-        ${ERL_TOP}/lib/erl_interface/obj/$target
-        ${ERL_TOP}/lib/erl_interface/obj.debug/$target
-        ${ERL_TOP}/lib/erl_interface/bin/$target
-        ${ERL_TOP}/lib/runtime_tools/priv/lib/$target
-        ${ERL_TOP}/lib/runtime_tools/priv/obj/$target
-	${ERL_TOP}/erts/obj/$target
-	${ERL_TOP}/erts/obj.debug/$target
-	${ERL_TOP}/bin/$target"
-
-for dir in $MKDIRS; do
-  test ! -d "$dir" && mkdir -p "$dir"
-done
-
-#
-# Create Makefiles for vxWorks.
-#
-my_root=${ERL_TOP}/erts/emulator
-emu_test=$my_root/test
-beam=$my_root/beam
-erts_lib_src=${ERL_TOP}/erts/lib_src
-erts_incl=${ERL_TOP}/erts/include
-erts_incl_intrnl=${ERL_TOP}/erts/include/internal
-etcdir=${ERL_TOP}/erts/etc/common
-erlint_dir=${ERL_TOP}/lib/erl_interface/src
-epmd_dir=${ERL_TOP}/erts/epmd/src
-os_mon_dir=${ERL_TOP}/lib/os_mon/c_src
-orber_dir=${ERL_TOP}/lib/orber/c_src
-ic_dir=${ERL_TOP}/lib/ic/c_src
-asn1_dir=${ERL_TOP}/lib/asn1/c_src
-internal_tools_dir=${ERL_TOP}
-libdir=${ERL_TOP}/lib
-tsdir=$libdir/test_server/src
-zlibdir=${ERL_TOP}/erts/emulator/zlib
-runtime_tools_dir=${ERL_TOP}/lib/runtime_tools/c_src
-tools_dir=${ERL_TOP}/lib/tools/c_src
-
-CONFIG_FILES="${ERL_TOP}/erts/emulator/$host/Makefile
-	    $erts_lib_src/$host/Makefile
-	    $erts_incl/$host/erl_int_sizes_config.h
-	    $erts_incl_intrnl/$host/ethread.mk
-	    $erts_incl_intrnl/$host/ethread_header_config.h
-	    $etcdir/$host/Makefile
-	    $erlint_dir/$host/Makefile
-	    $erlint_dir/$host/eidefs.mk
-	    $epmd_dir/$host/Makefile
-	    $internal_tools_dir/make/$host/otp.mk
-	    $os_mon_dir/$host/Makefile
-	    $zlibdir/$host/Makefile
-	    $ic_dir/$host/Makefile
-	    $asn1_dir/$host/Makefile
-	    $runtime_tools_dir/$host/Makefile
-	    $tools_dir/$host/Makefile
-	    $orber_dir/$host/Makefile"
-
-for file in $CONFIG_FILES; do
-    new_name=`echo $file|sed "s%/$host/%/$target/%"`
-    dir=`echo $new_name|sed 's%/[^/][^/]*$%%'`
-    if test "$dir" != "$new_name" && test "$dir" != .; then
-	test ! -d "$dir" && mkdir "$dir"
-    fi
-
-    sole_name=`echo $file|sed "s%.*$target/%%"`
-    in_file=`echo $dir|sed "s%/[^/][^/]*$%/$sole_name.in%"`
-    echo "creating $new_name"
-    sed -f vxworks/sed.$target -f vxworks/sed.general \
-	-e "s,@HOST_TYPE@,$HOST_TYPE,g" \
-	-e "s,@WIND_BASE@,$WIND_BASE,g" \
-	-e "s,@TARGET@,$target,g" \
-	$in_file > $new_name
-done
-
-
diff --git a/lib/diameter/autoconf/vxworks/sed.general b/lib/diameter/autoconf/vxworks/sed.general
deleted file mode 100644
index 9199983e16..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.general
+++ /dev/null
@@ -1,124 +0,0 @@
-# 
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-# 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# %CopyrightEnd%
-# 
-# Author: Patrik Winroth
-#
-# This sed program file is intended to be used when creating Makefiles
-# for vxworks from the generic Makefile.in that is found in a number
-# of directories (see configure.vxworks).
-#
-# This is the general part that is common for all architectures.
-#
-
-# Size of data types.
-s|^#undef SIZEOF_CHAR|#define SIZEOF_CHAR 1|
-s|^#undef SIZEOF_SHORT|#define SIZEOF_SHORT 2|
-s|^#undef SIZEOF_INT|#define SIZEOF_INT 4|
-s|^#undef SIZEOF_LONG_LONG|#define SIZEOF_LONG_LONG 8|
-s|^#undef SIZEOF_LONG$|#define SIZEOF_LONG 4|
-
-# General stuff.
-s|@erts_rootdir@|/clearcase/otp/erts|
-
-s|@LIBOBJS@|$(OBJDIR)/elib_malloc.o|
-s|@DLOAD_LIB@||
-s|@LDFLAGS@||
-# FIXME: A bit strange to clear out remaining DED_*
-s|@DED_LDFLAGS@||
-s|@DED_CFLAGS@||
-s|@STATIC_CFLAGS@||
-s|@GCCLIB@|libgcc.a|
-s|@DEFS@||
-s|@DEXPORT@||
-s|@DCFLAGS@||
-s|@THR_DEFS@||
-s|@THR_LIBS@||
-s|@THR_LIB_NAME@||
-s|@THR_X_LIBS@||
-s|@ETHR_X_LIBS@||
-s|@ETHR_LIBS@||
-s|@ETHR_LIB_NAME@||
-s|@ETHR_DEFS@||
-s|@ETHR_THR_LIB_BASE@||
-s|@EMU_THR_DEFS@||
-s|@EMU_THR_LIBS@||
-s|@EMU_THR_LIB_NAME@|ethread|
-s|@ERTS_ENABLE_KERNEL_POLL@|no|
-s|@cc_root@|/clearcase/otp/|
-# Define VxWorks even though cross-compiling. 
-s|@HCFLAGS@|-DVXWORKS|
-s|@HCLIBS@||
-s|@ENABLE_ALLOC_TYPE_VARS@||
-s|@TERMCAP_LIB@||
-s|@ERTS_BUILD_SMP_EMU@|no|
-s|@HAVE_VALGRIND@|no|
-s|@EXEEXT@||
-s|@WITH_SCTP@||
-
-# HiPE
-s|@HIPE_ENABLED@||
-s|@PERFCTR_PATH@||
-s|@USE_PERFCTR@||
-
-# m4
-s|@OPSYS@|noopsys|
-
-# Conditional inclusion of applications
-s|@HIPE_APP@||
-s|@SSL_APP@|ssl|
-s|@CRYPTO_APP@|crypto|
-s|@SSH_APP@|ssh|
-
-# The target tools prefix, prepended to all cc,ld,as etc commands
-s|@TTPREFIX@|GCC_EXEC_PREFIX=@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/host/@HOST_TYPE@/bin/|
-
-# Install programs etc
-s|@PERL@|perl|
-s|@INSTALL@|/usr/ucb/install -c|
-s|@INSTALL_PROGRAM@|${INSTALL}|
-s|@INSTALL_SCRIPT@|${INSTALL}|
-s|@INSTALL_DATA@|${INSTALL} -m 644|
-s|@INSTALL_DIR@|$(INSTALL) -d|
-s|@RM@|/bin/rm|
-s|@MKDIR@|/bin/mkdir|
-s|@ERLANG_OSTYPE@|vxworks|
-s|@vxworks_reclaim@|reclaim.h|
-s|@os_mon_programs@||
-s|@erlexec@|erl.exec|
-s|@EMU_LIBOBJS@||
-
-# General CFLAGS
-s|@GENERAL_CFLAGS@|-DHAVE_LOCALTIME_R -DHAVE_GMTIME_R -DENABLE_ELIB_MALLOC -DELIB_HEAP_USER -DELIB_SORTED_BLOCKS -DWORDS_BIGENDIAN -DELIB_DONT_INITIALIZE -DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 -DSIZEOF_VOID_P=4 -DERTS_USE_PORT_TASKS=1|g
-s|@WFLAGS@||
-
-# Thread flags for eidefs.mk (erl_interface)
-s|@EI_THREADS@|false|
-
-# Make java code compile although we don't test it on VxWorks (no license)
-s|@JAVAC@|javac|
-
-# What is this anyway?
-# Disable it and see what breaks.
-#s|@ded_soname@||
-
-# Only variable substituted directly
-s|$(LDFLAGS)|-r -d|
-s|@LIBRT@||
-# XXX What is EFFLAGS? Not used in the emulator Makefile.in anyway.
-s|$(EFLAGS)|-DENABLE_ELIB_MALLOC -DELIB_HEAP_USER -DELIB_SORTED_BLOCKS|
-
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_cpu32 b/lib/diameter/autoconf/vxworks/sed.vxworks_cpu32
deleted file mode 100644
index 5a1590e786..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_cpu32
+++ /dev/null
@@ -1,45 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Patrik Winroth
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_cpu32|
-s|@system_type@|vxworks_cpu32|
-s|@CC@|@TTPREFIX@cc68k|
-s|@HCC@|gcc|
-s|@LD@|@TTPREFIX@ld68k|
-s|@LIBS@||
-s|@DED_LD@|@TTPREFIX@ld68k|
-s|@DED_CFLAGS@|@CFLAGS@|
-s|@DEBUG_FLAGS@|-g|
-s|@GCCLIB_PATH@|@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/m68k-wrs-vxworks/cygnus-2.7.2-960126/m68000/msoft-float/libgcc.a|
-s|@RANLIB@|@TTPREFIX@ranlib68k|
-s|@AR@|@TTPREFIX@ar68k|
-s|@STRIP@|@TTPREFIX@strip68k|
-s|@SYMPREFIX@|_|
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/m68k-wrs-vxworks/cygnus-2.7.2-960126/m68000/msoft-float -lgcc|
-
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=CPU32 -mnobitfield -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -fno-builtin -nostdinc -fvolatile -msoft-float|
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=CPU32 -mnobitfield -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -fno-builtin -nostdinc -fvolatile -msoft-float|
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc32 b/lib/diameter/autoconf/vxworks/sed.vxworks_ppc32
deleted file mode 100644
index 9104b24ed3..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc32
+++ /dev/null
@@ -1,52 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2006-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Peter Andersson
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_ppc32|
-s|@system_type@|vxworks_ppc32|
-s|@ARCH@|ppc32|
-s|@CC@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ccppc -mlongcall|
-s|@HCC@|gcc|
-s|@LD@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ldppc|
-s|@STRIP@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/workbench-2.3/@HOST_TYPE@/bin/stripppc|
-s|@SYMPREFIX@||
-s|@LIBS@||
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/vxworks-6.3/target/lib/ppc/PPC32/common -lgcc|
-s|@DED_LD@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ldppc|
-s|@DED_CFLAGS@|@CFLAGS@|
-s|@DEBUG_CFLAGS@|@CFLAGS@|
-# generate dwarf debug code on PPC ..
-s|@DEBUG_FLAGS@|-gdwarf|
-# remove -g option
-s|TYPE_FLAGS = -g |TYPE_FLAGS = |
-s|@GCCLIB_PATH@|@WIND_BASE@/vxworks-6.3/target/lib/ppc/PPC32/common/libgcc.a|
-s|@RANLIB@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ranlibppc|
-s|@AR@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/arppc|
-# -Dasm(X)= is for beam
-
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -DWANT_NONBLOCKING -DHAVE_SENS -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/vxworks-6.3/target/h -I@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc/powerpc-wrs-vxworks/3.4.4/include -I@WIND_BASE@/vxworks-6.3/target/h/wrn/coreip -mstrict-align -fvolatile -fno-builtin |
-
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -DWANT_NONBLOCKING -DHAVE_SENS -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/vxworks-6.3/target/h/wrn/coreip -I@WIND_BASE@/vxworks-6.3/target/h  -mstrict-align -fvolatile -fno-builtin |
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc603 b/lib/diameter/autoconf/vxworks/sed.vxworks_ppc603
deleted file mode 100644
index e1dd7c5afd..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc603
+++ /dev/null
@@ -1,51 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Patrik Winroth
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_ppc603|
-s|@system_type@|vxworks_ppc603|
-s|@ARCH@|ppc603|
-s|@CC@|@TTPREFIX@ccppc -mlongcall|
-s|@HCC@|gcc|
-s|@LD@|@TTPREFIX@ldppc|
-s|@STRIP@|@TTPREFIX@stripppc|
-s|@SYMPREFIX@||
-s|@LIBS@||
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126 -lgcc|
-s|@DED_LD@|@TTPREFIX@ldppc|
-s|@DED_CFLAGS@|@CFLAGS@|
-s|@DEBUG_CFLAGS@|@CFLAGS@|
-# generate dwarf debug code on PPC ..
-s|@DEBUG_FLAGS@|-gdwarf|
-# remove -g option
-s|TYPE_FLAGS = -g |TYPE_FLAGS = |
-s|@GCCLIB_PATH@|@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126/libgcc.a|
-s|@RANLIB@|@TTPREFIX@ranlibppc|
-s|@AR@|@TTPREFIX@arppc|
-# -Dasm(X)= is for beam
-
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC603 -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -mstrict-align -fvolatile -fno-builtin -fno-for-scope -D_GNU_TOOL|
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC603 -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -mstrict-align -fvolatile -fno-builtin -fno-for-scope -D_GNU_TOOL|
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc603_nolongcall b/lib/diameter/autoconf/vxworks/sed.vxworks_ppc603_nolongcall
deleted file mode 100644
index 5d7673d323..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc603_nolongcall
+++ /dev/null
@@ -1,51 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Patrik Winroth
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_ppc603|
-s|@system_type@|vxworks_ppc603|
-s|@ARCH@|ppc603|
-s|@CC@|@TTPREFIX@ccppc|
-s|@HCC@|gcc|
-s|@LD@|@TTPREFIX@ldppc|
-s|@STRIP@|@TTPREFIX@stripppc|
-s|@SYMPREFIX@||
-s|@LIBS@||
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126 -lgcc|
-s|@DED_LD@|@TTPREFIX@ldppc|
-s|@DED_CFLAGS@|@CFLAGS@|
-# generate dwarf debug code on PPC ..
-s|@DEBUG_FLAGS@|-gdwarf|
-# remove -g option
-s|TYPE_FLAGS = -g |TYPE_FLAGS = |
-s|@GCCLIB_PATH@|@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126/libgcc.a|
-s|@RANLIB@|@TTPREFIX@ranlibppc|
-s|@AR@|@TTPREFIX@arppc|
-# -Dasm(X)= is for beam
-
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC603 -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -mstrict-align -fvolatile -fno-builtin -fno-for-scope -D_GNU_TOOL|
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC603 -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -mstrict-align -fvolatile -fno-builtin -fno-for-scope -D_GNU_TOOL|
-
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc860 b/lib/diameter/autoconf/vxworks/sed.vxworks_ppc860
deleted file mode 100644
index 7a3c32df5b..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc860
+++ /dev/null
@@ -1,50 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Patrik Winroth
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_ppc860|
-s|@system_type@|vxworks_ppc860|
-s|@ARCH@|ppc860|
-s|@CC@|@TTPREFIX@ccppc -mlongcall|
-s|@HCC@|gcc|
-s|@LD@|@TTPREFIX@ldppc|
-s|@STRIP@|@TTPREFIX@stripppc|
-s|@SYMPREFIX@||
-s|@LIBS@||
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126/soft-float -lgcc|
-s|@DED_LD@|@TTPREFIX@ldppc|
-s|@DED_CFLAGS@|@CFLAGS@|
-s|@DEBUG_CFLAGS@|@CFLAGS@|
-# generate dwarf debug code on PPC ..
-s|@DEBUG_FLAGS@|-gdwarf|
-# remove -g option (go for dwarf)
-s|TYPE_FLAGS = -g |TYPE_FLAGS = |
-s|@GCCLIB_PATH@|@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126/soft-float/libgcc.a|
-s|@RANLIB@|@TTPREFIX@ranlibppc|
-s|@AR@|@TTPREFIX@arppc|
-
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC860 -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -mcpu=860 -fvolatile -fno-builtin -fno-for-scope -msoft-float -D_GNU_TOOL -nostdinc|
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC860 -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -mcpu=powerpc -fvolatile -fno-builtin -fno-for-scope -msoft-float -D_GNU_TOOL -nostdinc|
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_simlinux b/lib/diameter/autoconf/vxworks/sed.vxworks_simlinux
deleted file mode 100644
index 56eae6507c..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_simlinux
+++ /dev/null
@@ -1,59 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2008-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Peter Andersson
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_simlinux|
-s|@system_type@|vxworks_simlinux|
-s|@ARCH@|simlinux|
-
-s|@CC@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ccpentium|
-
-s|@HCC@|gcc|
-
-s|@LD@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ldpentium|
-
-#s|@STRIP@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/strip|
-s|@STRIP@||
-
-s|@SYMPREFIX@||
-s|@LIBS@||
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/vxworks-6.3/target/lib/simlinux/SIMLINUX/common -lgcc|
-
-s|@DED_LD@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ldpentium|
-
-s|@DED_CFLAGS@|@CFLAGS@|
-s|@DEBUG_CFLAGS@|@CFLAGS@|
-# remove -g option
-s|TYPE_FLAGS = -g |TYPE_FLAGS = |
-s|@GCCLIB_PATH@|@WIND_BASE@/vxworks-6.3/target/lib/simlinux/SIMLINUX/common/libgcc.a|
-
-s|@RANLIB@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ranlibpentium|
-
-s|@AR@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/arpentium|
-
-# -Dasm(X)= is for beam
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -DWANT_NONBLOCKING -DHAVE_SENS -DHAVE_MEMMOVE -DVXWORKS -DDEBUG -I@WIND_BASE@/vxworks-6.3/target/h -I@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc/i586-wrs-vxworks/3.4.4/include -I@WIND_BASE@/vxworks-6.3/target/h/wrn/coreip -fvolatile -fno-builtin |
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -DWANT_NONBLOCKING -DHAVE_SENS -DHAVE_MEMMOVE -DVXWORKS -DDEBUG -I@WIND_BASE@/vxworks-6.3/target/h -I@WIND_BASE@/vxworks-6.3/target/h/wrn/coreip -mstrict-align -fvolatile -fno-builtin |
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_simso b/lib/diameter/autoconf/vxworks/sed.vxworks_simso
deleted file mode 100644
index 6b845d31de..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_simso
+++ /dev/null
@@ -1,64 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2005-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Peter Andersson
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_simso|
-s|@system_type@|vxworks_simso|
-s|@ARCH@|simso|
-
-# Tornado2.2: s|@CC@|@TTPREFIX@ccsimso|
-s|@CC@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ccsparc|
-
-s|@HCC@|gcc|
-
-# Tornado2.2: s|@LD@|@TTPREFIX@ldsimso|
-s|@LD@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ldsparc|
-
-# Tornado2.2: s|@STRIP@|@TTPREFIX@stripsimso|
-s|@STRIP@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/stripsparc|
-
-s|@SYMPREFIX@||
-s|@LIBS@||
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/vxworks-6.3/target/lib/simso/SIMSPARCSOLARIS/common -lgcc|
-
-# Tornado2.2: s|@DED_LD@|@TTPREFIX@ldsimso|
-s|@DED_LD@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ldsparc|
-
-s|@DED_CFLAGS@|@CFLAGS@|
-s|@DEBUG_CFLAGS@|@CFLAGS@|
-# remove -g option
-s|TYPE_FLAGS = -g |TYPE_FLAGS = |
-s|@GCCLIB_PATH@|@WIND_BASE@/vxworks-6.3/target/lib/simso/SIMSPARCSOLARIS/common/libgcc.a|
-
-# Tornado2.2: s|@RANLIB@|@TTPREFIX@ranlibsimso|
-s|@RANLIB@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ranlibsparc|
-
-# Tornado2.2: s|@AR@|arsimso|
-s|@AR@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/arsparc|
-
-# -Dasm(X)= is for beam
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=SIMSPARCSOLARIS -DTOOL_FAMILY=gnu -DTOOL=gnu -DWANT_NONBLOCKING -DHAVE_SENS -DHAVE_MEMMOVE -DVXWORKS -DDEBUG -I@WIND_BASE@/vxworks-6.3/target/h -I@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc/sparc-wrs-vxworks/3.4.4/include -I@WIND_BASE@/vxworks-6.3/target/h/wrn/coreip -fvolatile -fno-builtin |
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=SIMSPARCSOLARIS -DTOOL_FAMILY=gnu -DTOOL=gnu -DWANT_NONBLOCKING -DHAVE_SENS -DHAVE_MEMMOVE -DVXWORKS -DDEBUG -I@WIND_BASE@/vxworks-6.3/target/h -I@WIND_BASE@/vxworks-6.3/target/h/wrn/coreip -mstrict-align -fvolatile -fno-builtin |
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_sparc b/lib/diameter/autoconf/vxworks/sed.vxworks_sparc
deleted file mode 100644
index 6f637d8746..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_sparc
+++ /dev/null
@@ -1,38 +0,0 @@
-# 
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-# 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# %CopyrightEnd%
-# 
-# Author: Patrik Winroth
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-
-# ccsparc -O2 doesn't work when compiling "rundir"/gc.c - signal 11 is generated when trying
-# therefore it is compiled with -O1 instead, which works - get a new ccsparc !
-s/\$(COMPILE\.emu) -o \$@ -c gc\.c/$(CC) @CFLAGS@ @DEFS@ -O1 $(BEAM_MODE) -I$(SYSDIR) -I$(EMUDIR) -I. $(CPPFLAGS) -c -o $@ -c gc.c/
-s/@host@/vxworks_sparc/
-s/@system_type@/vxworks_sparc/
-s/@CC@/\/home\/gandalf\/bsproj\/tools\/vw-gnu\/solaris.sparc\/bin\/ccsparc/
-s/@HCC@/gcc/
-s/@LD@/\/home\/gandalf\/bsproj\/tools\/vw-gnu\/solaris.sparc\/bin\/ldsparc/
-s/@DEBUG_FLAGS@/-g/
-s/@GCCLIB_PATH@/\/home\/gandalf\/bsproj\/tools\/vw-gnu\/solaris.sparc\/lib\/gcc-lib\/sparc-wrs-vxworks\/cygnus-2.2.3.1\/libgcc.a/
-s/@RANLIB@/ranlibsparc/
-s/@AR@/arsparc/
-s/@CFLAGS@/-I\/home\/gandalf\/bsproj\/BS.2\/UOS\/vw\/5.2\/h -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DCPU=SPARC -DVXWORKS -fno-builtin -nostdinc/
-
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index a5a2773598..260ffeed48 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -915,7 +915,6 @@ type(erlang, system_info, 1, Xs) ->
 		     t_list(t_pid());
 		   ['os_type'] ->
 		     t_tuple([t_sup([t_atom('unix'),
-				     t_atom('vxworks'),
 				     t_atom('win32')]),
 			      t_atom()]);
 		   ['os_version'] ->
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 41e4188e5f..58f7d4fa25 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -762,14 +762,9 @@ ip_mod_cgi(doc) ->
 ip_mod_cgi(suite) ->
     [];
 ip_mod_cgi(Config) when is_list(Config) ->
-    case test_server:os_type() of
-	vxworks ->
-	    {skip, cgi_not_supported_on_vxwoks};
-	_ ->
-	    httpd_mod:cgi(ip_comm, ?IP_PORT, 
-			  ?config(host, Config), ?config(node, Config)),
-	    ok
-    end.
+    httpd_mod:cgi(ip_comm, ?IP_PORT, 
+	?config(host, Config), ?config(node, Config)),
+    ok.
 %%-------------------------------------------------------------------------
 ip_mod_esi(doc) ->
     ["Module test: mod_esi"];
@@ -1275,16 +1270,11 @@ essl_mod_cgi(Config) when is_list(Config) ->
     ssl_mod_cgi(essl, Config).
 
 ssl_mod_cgi(Tag, Config) ->
-    case test_server:os_type() of
-	vxworks ->
-	    {skip, cgi_not_supported_on_vxwoks};
-	_ ->
-	    httpd_mod:cgi(Tag, 
-			  ?SSL_PORT, 
-			  ?config(host, Config), 
-			  ?config(node, Config)),
-	    ok
-    end.
+    httpd_mod:cgi(Tag, 
+	?SSL_PORT, 
+	?config(host, Config), 
+	?config(node, Config)),
+    ok.
 
 
 %%-------------------------------------------------------------------------
@@ -2698,11 +2688,6 @@ dos_hostname_request(Host) ->
 get_nof_clients(Mode, Load) ->
     get_nof_clients(test_server:os_type(), Mode, Load).
 
-get_nof_clients(vxworks, _,       light)  -> 1;
-get_nof_clients(vxworks, ip_comm, medium) -> 3;
-get_nof_clients(vxworks, ssl,     medium) -> 3;
-get_nof_clients(vxworks, ip_comm, heavy)  -> 5;
-get_nof_clients(vxworks, ssl,     heavy)  -> 5;
 get_nof_clients(_,       ip_comm, light)  -> 5;
 get_nof_clients(_,       ssl,     light)  -> 2;
 get_nof_clients(_,       ip_comm, medium) -> 10;
diff --git a/lib/inets/test/inets.spec.vxworks b/lib/inets/test/inets.spec.vxworks
deleted file mode 100644
index 6886299226..0000000000
--- a/lib/inets/test/inets.spec.vxworks
+++ /dev/null
@@ -1,5 +0,0 @@
-{topcase, {dir, "../inets_test"}}.
-{skip, {inets_SUITE, ip_mod_cgi, "Requires processes"}}.
-{skip, {inets_SUITE, ip_mod_all_modules, "Requires processes"}}.
-{skip, {inets_SUITE, ssl, "Requires SSL"}}.
-
diff --git a/lib/inets/test/rules.mk b/lib/inets/test/rules.mk
index 047c03b267..c4a62a87ed 100644
--- a/lib/inets/test/rules.mk
+++ b/lib/inets/test/rules.mk
@@ -17,17 +17,12 @@ DEFAULT_TARGETS =  opt debug instr release release_docs clean docs
 #	Erlang language section
 # ----------------------------------------------------
 EMULATOR = beam
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-# VxWorks object files should be compressed.
-# Other object files should have debug_info.
-ERL_COMPILE_FLAGS += +compressed
-else
+
 ifdef BOOTSTRAP
 ERL_COMPILE_FLAGS += +slim
 else
 ERL_COMPILE_FLAGS += +debug_info
 endif
-endif
 ERLC_WFLAGS = -W
 ERLC = erlc $(ERLC_WFLAGS) $(ERLC_FLAGS)
 ERL.beam =  erl.beam -boot start_clean
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index 1bc5b9e464..621ca6e9ee 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -100,8 +100,7 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
           environment. <c><anno>Value</anno></c> is returned as a string containing
           the (usually) numerical identifier for a process. On Unix,
           this is typically the return value of the <c>getpid()</c>
-          system call. On VxWorks, <c><anno>Value</anno></c> contains the task id
-          (decimal notation) of the Erlang task. On Windows,
+          system call. On Windows,
           the process id as returned by the <c>GetCurrentProcessId()</c>
           system call is used.</p>
       </desc>
@@ -154,8 +153,6 @@ format_utc_timestamp() ->
           Solaris 1 and 2, it will be <c>sunos</c>.</p>
         <p>In Windows, <c><anno>Osname</anno></c> will be either <c>nt</c> (on
           Windows NT), or <c>windows</c> (on Windows 95).</p>
-        <p>On VxWorks the OS family alone is returned, that is
-          <c>vxworks</c>.</p>
         <note>
           <p>Think twice before using this function. Use the
             <c>filename</c> module if you want to inspect or build
diff --git a/lib/kernel/src/inet_config.erl b/lib/kernel/src/inet_config.erl
index 1ddbdcec25..526baca335 100644
--- a/lib/kernel/src/inet_config.erl
+++ b/lib/kernel/src/inet_config.erl
@@ -197,16 +197,6 @@ do_load_resolv({win32,Type}, longnames) ->
     win32_load_from_registry(Type),
     inet_db:set_lookup([native]);
 
-do_load_resolv(vxworks, _) ->	
-    vxworks_load_hosts(),
-    inet_db:set_lookup([file, dns]),
-    case os:getenv("ERLRESCONF") of
-	false ->
-	    no_ERLRESCONF;
-	Resolv ->
-	    load_resolv(Resolv, resolv)
-    end;
-
 do_load_resolv(_, _) ->
     inet_db:set_lookup([native]).
 
@@ -408,55 +398,6 @@ win32_get_strings(Reg, [Name|Rest], Result) ->
 win32_get_strings(_, [], Result) ->
     lists:reverse(Result).
 
-%%
-%% Load host data from VxWorks hostShow command
-%%
-
-vxworks_load_hosts() ->
-    HostShow = os:cmd("hostShow"),
-    case check_hostShow(HostShow) of
-	Hosts when is_list(Hosts) ->
-	    case inet_parse:hosts_vxworks({chars, Hosts}) of
-		{ok, Ls} ->
-		    foreach(
-		      fun({IP, Name, Aliases}) -> 
-			      inet_db:add_host(IP, [Name|Aliases])
-		      end,
-		      Ls);
-		{error,Reason} ->
-		    error("parser error VxWorks hostShow ~s", [Reason])
-	    end;
-	_Error ->
-	    error("error in VxWorks hostShow~s~n", [HostShow])
-    end.
-
-%%
-%% Check if hostShow yields at least two line; the first one
-%% starting with "hostname", the second one starting with
-%% "--------".
-%% Returns: list of hosts in VxWorks notation
-%% rows of 'Name          IP                [Aliases]  \n'
-%% if hostShow yielded these two lines, false otherwise.
-check_hostShow(HostShow) ->
-    check_hostShow(["hostname", "--------"], HostShow).
-
-check_hostShow([], HostShow) ->
-    HostShow;
-check_hostShow([String_match|Rest], HostShow) ->
-    case lists:prefix(String_match, HostShow) of
-	true ->
-	    check_hostShow(Rest, next_line(HostShow));
-	false ->
-	    false
-    end.
-
-next_line([]) ->
-    [];
-next_line([$\n|Rest]) ->
-    Rest;
-next_line([_First|Rest]) ->
-    next_line(Rest).
-
 read_rc() ->
     {RcFile,CfgList} = read_inetrc(),
     case extract_cfg_files(CfgList, [], []) of
diff --git a/lib/kernel/src/inet_parse.erl b/lib/kernel/src/inet_parse.erl
index 65edddcb46..ba62a59068 100644
--- a/lib/kernel/src/inet_parse.erl
+++ b/lib/kernel/src/inet_parse.erl
@@ -23,7 +23,6 @@
 %% Avoid warning for local function error/2 clashing with autoimported BIF.
 -compile({no_auto_import,[error/2]}).
 -export([hosts/1, hosts/2]).
--export([hosts_vxworks/1]).
 -export([protocols/1, protocols/2]).
 -export([netmasks/1, netmasks/2]).
 -export([networks/1, networks/2]).
@@ -107,18 +106,6 @@ hosts(Fname,File) ->
     parse_file(Fname, File, Fn).
 
 %% --------------------------------------------------------------------------
-%% Parse hostShow vxworks style
-%% Syntax:
-%%      Name          IP                [Aliases]  \n 
-%% --------------------------------------------------------------------------
-hosts_vxworks(Hosts) ->
-    Fn = fun([Name, Address | Aliases]) ->
-		 {ok,IP} = address(Address),
-		 {IP, Name, Aliases}
-	 end,
-    parse_file(Hosts, Fn).
-
-%% --------------------------------------------------------------------------
 %% Parse resolv file unix style
 %% Syntax:
 %%      domain Domain \n
@@ -291,9 +278,6 @@ networks(Fname, File) ->
 %%
 %% --------------------------------------------------------------------------
 
-parse_file(File, Fn) ->
-    parse_file(noname, File, Fn).
-
 parse_file(Fname, {fd,Fd}, Fn) ->
     parse_fd(Fname,Fd, 1, Fn, []);
 parse_file(Fname, {chars,Cs}, Fn) when is_list(Cs) ->
diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
index b986f3a61e..e20a2434b4 100644
--- a/lib/kernel/src/os.erl
+++ b/lib/kernel/src/os.erl
@@ -60,16 +60,12 @@ timestamp() ->
 
 %%% End of BIFs
 
--spec type() -> vxworks | {Osfamily, Osname} when
+-spec type() -> {Osfamily, Osname} when
       Osfamily :: unix | win32,
       Osname :: atom().
 
 type() ->
-    case erlang:system_info(os_type) of
-	{vxworks, _} ->
-	    vxworks;
-	Else -> Else
-    end.
+    erlang:system_info(os_type).
 
 -spec version() -> VersionString | {Major, Minor, Release} when
       VersionString :: string(),
@@ -119,25 +115,14 @@ find_executable1(_Name, [], _Extensions) ->
 
 verify_executable(Name0, [Ext|Rest], OrigExtensions) ->
     Name1 = Name0 ++ Ext,
-    case os:type() of
-	vxworks ->
-	    %% We consider all existing VxWorks files to be executable
-	    case file:read_file_info(Name1) of
-		{ok, _} ->
-		    {ok, Name1};
-		_ ->
-		    verify_executable(Name0, Rest, OrigExtensions)
-	    end;
+    case file:read_file_info(Name1) of
+	{ok, #file_info{type=regular,mode=Mode}}
+	when Mode band 8#111 =/= 0 ->
+	    %% XXX This test for execution permission is not fool-proof
+	    %% on Unix, since we test if any execution bit is set.
+	    {ok, Name1};
 	_ ->
-	    case file:read_file_info(Name1) of
-		{ok, #file_info{type=regular,mode=Mode}}
-		when Mode band 8#111 =/= 0 ->
-		    %% XXX This test for execution permission is not fool-proof
-		    %% on Unix, since we test if any execution bit is set.
-		    {ok, Name1};
-		_ ->
-		    verify_executable(Name0, Rest, OrigExtensions)
-	    end
+	    verify_executable(Name0, Rest, OrigExtensions)
     end;
 verify_executable(Name, [], OrigExtensions) when OrigExtensions =/= [""] -> %% Windows
     %% Will only happen on windows, hence case insensitivity
@@ -190,8 +175,7 @@ reverse_element(List) ->
 extensions() ->
     case type() of
 	{win32, _} -> [".exe",".com",".cmd",".bat"];
-	{unix, _} -> [""];
-	vxworks -> [""]
+	{unix, _} -> [""]
     end.
 
 %% Executes the given command in the default shell for the operating system.
@@ -209,11 +193,6 @@ cmd(Cmd) ->
 			  {Cspec,_} -> lists:concat([Cspec," /c",Cmd])
 		      end,
 	    Port = open_port({spawn, Command}, [stream, in, eof, hide]),
-	    get_data(Port, []);
-	%% VxWorks uses a 'sh -c hook' in 'vxcall.c' to run os:cmd.
-	vxworks ->
-	    Command = lists:concat(["sh -c '", Cmd, "'"]),
-	    Port = open_port({spawn, Command}, [stream, in, eof]),
 	    get_data(Port, [])
     end.
 
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index f6d38e6d1f..69197d4915 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -579,30 +579,25 @@ sticky_compiler(File) ->
 pa_pz_option(suite) -> [];
 pa_pz_option(doc) -> ["Test that the -pa and -pz options work as expected"];
 pa_pz_option(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "Slave nodes not supported on VxWorks"};
-	_ ->
-	    DDir = ?config(data_dir,Config),
-	    PaDir = filename:join(DDir,"pa"),
-	    PzDir = filename:join(DDir,"pz"),
-	    ?line {ok, Node}=?t:start_node(pa_pz1, slave,
-					   [{args,
-					     "-pa " ++ PaDir
-					     ++ " -pz " ++ PzDir}]),
-	    ?line Ret=rpc:call(Node, code, get_path, []),
-	    ?line [PaDir|Paths] = Ret,
-	    ?line [PzDir|_] = lists:reverse(Paths),
-	    ?t:stop_node(Node),
-	    ?line {ok, Node2}=?t:start_node(pa_pz2, slave,
-					    [{args,
-					      "-mode embedded " ++ "-pa "
-					      ++ PaDir ++ " -pz " ++ PzDir}]),
-	    ?line Ret2=rpc:call(Node2, code, get_path, []),
-	    ?line [PaDir|Paths2] = Ret2,
-	    ?line [PzDir|_] = lists:reverse(Paths2),
-	    ?t:stop_node(Node2)
-    end.
+    DDir = ?config(data_dir,Config),
+    PaDir = filename:join(DDir,"pa"),
+    PzDir = filename:join(DDir,"pz"),
+    {ok, Node}=?t:start_node(pa_pz1, slave,
+	[{args,
+		"-pa " ++ PaDir
+		++ " -pz " ++ PzDir}]),
+    Ret=rpc:call(Node, code, get_path, []),
+    [PaDir|Paths] = Ret,
+    [PzDir|_] = lists:reverse(Paths),
+    ?t:stop_node(Node),
+    {ok, Node2}=?t:start_node(pa_pz2, slave,
+	[{args,
+		"-mode embedded " ++ "-pa "
+		++ PaDir ++ " -pz " ++ PzDir}]),
+    Ret2=rpc:call(Node2, code, get_path, []),
+    [PaDir|Paths2] = Ret2,
+    [PzDir|_] = lists:reverse(Paths2),
+    ?t:stop_node(Node2).
 
 add_del_path(suite) ->
     [];
diff --git a/lib/kernel/test/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl
index 0c3f5c3514..0f811b8f73 100644
--- a/lib/kernel/test/disk_log_SUITE.erl
+++ b/lib/kernel/test/disk_log_SUITE.erl
@@ -126,11 +126,6 @@
 	 error, chunk, truncate, many_users, info, change_size,
 	 change_attribute, distribution, evil, otp_6278, otp_10131]).
 
-%% The following two lists should be mutually exclusive. To skip a case
-%% on VxWorks altogether, use the kernel.spec.vxworks file instead.
-%% PLEASE don't skip out of laziness, the goal is to make every
-%% testcase runnable on VxWorks.
-
 %% These test cases should be skipped if the VxWorks card is 
 %% configured without NFS cache.
 -define(SKIP_NO_CACHE,[distribution]).
@@ -5126,33 +5121,8 @@ stop_node(Node) ->
 %% If the board is configured without NFS, the port program will fail to load
 %% and this will return 0, which may or may not be the wrong thing to do.
 
-check_nfs(Config) ->
-    case (catch check_cache(Config)) of
-	N when is_integer(N) ->
-	    N;
-	_ ->
-	    0
-    end.
-
-check_cache(Config) ->
-    ?line Check = filename:join(?datadir(Config), "nfs_check"),
-    ?line P = open_port({spawn, Check}, [{line,100}, eof]),
-    ?line Size = receive
-		     {P,{data,{eol,S}}} ->
-			 list_to_integer(S)
-		 after 1000 ->
-			 erlang:display(got_timeout),
-			 exit(timeout)
-		 end,
-    ?line receive
-	      {P, eof} ->
-		  ok
-	  end,
-    ?line P ! {self(), close},
-    ?line receive
-	      {P, closed} -> ok
-	  end,
-    Size.
+check_nfs(_Config) ->
+    0.
 
 skip_expand([]) ->
     [];
@@ -5175,13 +5145,8 @@ skip_list(Config) ->
 	    skip_expand(?SKIP_LARGE_CACHE)
     end.
 
-should_skip(Test,Config) ->
-    case os:type() of
-	vxworks ->
-	    lists:member(Test, skip_list(Config));
-	_ ->
-	    false
-    end.
+should_skip(_Test,_Config) ->
+    false.
 
 %%-----------------------------------------------------------------
 %% The error_logger handler used.
diff --git a/lib/kernel/test/disk_log_SUITE_data/Makefile.src b/lib/kernel/test/disk_log_SUITE_data/Makefile.src
deleted file mode 100644
index cae2f23d29..0000000000
--- a/lib/kernel/test/disk_log_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,15 +0,0 @@
-CC = @CC@
-LD = @LD@
-CFLAGS = @CFLAGS@ -I@erl_include@ @DEFS@
-CROSSLDFLAGS = @CROSSLDFLAGS@
-
-PROGS = nfs_check@exe@
-
-all: $(PROGS)
-
-nfs_check@exe@: nfs_check@obj@
-	$(LD) $(CROSSLDFLAGS) -o nfs_check nfs_check@obj@ @LIBS@
-
-nfs_check@obj@: nfs_check.c
-	$(CC) -c -o nfs_check@obj@ $(CFLAGS) nfs_check.c
-
diff --git a/lib/kernel/test/disk_log_SUITE_data/nfs_check.c b/lib/kernel/test/disk_log_SUITE_data/nfs_check.c
deleted file mode 100644
index 31e9ba8190..0000000000
--- a/lib/kernel/test/disk_log_SUITE_data/nfs_check.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Author: Patrik Nyblom
- * Purpose: A port program to check the NFS cache size on VxWorks (returns 0
- * for other platforms).
- */
-
-#ifdef VXWORKS
-#include <vxWorks.h>
-#include <taskVarLib.h>
-#include <taskLib.h>
-#include <sysLib.h>
-#include <string.h>
-#include <ioLib.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#ifdef VXWORKS
-extern unsigned nfsCacheSize;
-#define MAIN(argc, argv) nfs_check(argc, argv)
-#else
-#define MAIN(argc, argv) main(argc, argv)
-#endif
-
-
-MAIN(argc, argv)
-int argc;
-char *argv[];
-{
-#ifdef VXWORKS
-    char str[100];
-    sprintf(str,"%d\n", nfsCacheSize);
-    write(1, str, strlen(str));
-#else
-    fprintf(stdout,"0");
-    fflush(stdout);
-#endif
-    return 0;
-}
-
diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index 72239641e9..35502a1d27 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -110,56 +110,46 @@ get_file(Config) when is_list(Config) ->
 inet_existing(doc) -> ["Start a node using the 'inet' loading method, ",
 		       "from an already started boot server."];
 inet_existing(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "VxWorks: tested separately"};
-	_ ->
-	    ?line Name = erl_prim_test_inet_existing,
-	    ?line Host = host(),
-	    ?line Cookie = atom_to_list(erlang:get_cookie()),
-	    ?line IpStr = ip_str(Host),
-	    ?line LFlag = get_loader_flag(os:type()),
-	    ?line Args = LFlag ++ " -hosts " ++ IpStr ++
-		" -setcookie " ++ Cookie,
-	    ?line {ok, BootPid} = erl_boot_server:start_link([Host]),
-	    ?line {ok, Node} = start_node(Name, Args),
-	    ?line {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
-	    ?line stop_node(Node),
-	    ?line unlink(BootPid),
-	    ?line exit(BootPid, kill),
-	    ok
-    end.
+    Name = erl_prim_test_inet_existing,
+    Host = host(),
+    Cookie = atom_to_list(erlang:get_cookie()),
+    IpStr = ip_str(Host),
+    LFlag = get_loader_flag(os:type()),
+    Args = LFlag ++ " -hosts " ++ IpStr ++
+	" -setcookie " ++ Cookie,
+    {ok, BootPid} = erl_boot_server:start_link([Host]),
+    {ok, Node} = start_node(Name, Args),
+    {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
+    stop_node(Node),
+    unlink(BootPid),
+    exit(BootPid, kill),
+    ok.
 
 inet_coming_up(doc) -> ["Start a node using the 'inet' loading method, ",
 			"but start the boot server afterwards."];
 inet_coming_up(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "VxWorks: tested separately"};
-	_ ->
-	    ?line Name = erl_prim_test_inet_coming_up,
-	    ?line Cookie = atom_to_list(erlang:get_cookie()),
-	    ?line Host = host(),
-	    ?line IpStr = ip_str(Host),
-	    ?line LFlag = get_loader_flag(os:type()),
-	    ?line Args = LFlag ++ 
-		" -hosts " ++ IpStr ++
-		" -setcookie " ++ Cookie,
-	    ?line {ok, Node} = start_node(Name, Args, [{wait, false}]),
-
-	    %% Wait a while, then start boot server, and wait for node to start.
-	    ?line test_server:sleep(test_server:seconds(6)),
-	    io:format("erl_boot_server:start_link([~p]).", [Host]),
-	    ?line {ok, BootPid} = erl_boot_server:start_link([Host]),
-	    ?line wait_really_started(Node, 25),
-
-	    %% Check loader argument, then cleanup.
-	    ?line {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
-	    ?line stop_node(Node),
-	    ?line unlink(BootPid),
-	    ?line exit(BootPid, kill),
-	    ok
-    end.
+    Name = erl_prim_test_inet_coming_up,
+    Cookie = atom_to_list(erlang:get_cookie()),
+    Host = host(),
+    IpStr = ip_str(Host),
+    LFlag = get_loader_flag(os:type()),
+    Args = LFlag ++ 
+	" -hosts " ++ IpStr ++
+	" -setcookie " ++ Cookie,
+    {ok, Node} = start_node(Name, Args, [{wait, false}]),
+
+    %% Wait a while, then start boot server, and wait for node to start.
+    test_server:sleep(test_server:seconds(6)),
+    io:format("erl_boot_server:start_link([~p]).", [Host]),
+    {ok, BootPid} = erl_boot_server:start_link([Host]),
+    wait_really_started(Node, 25),
+
+    %% Check loader argument, then cleanup.
+    {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
+    stop_node(Node),
+    unlink(BootPid),
+    exit(BootPid, kill),
+    ok.
 
 wait_really_started(Node, 0) ->
     test_server:fail({not_booted,Node});
@@ -249,8 +239,6 @@ multiple_slaves(doc) ->
      "verify that the boot server manages"];
 multiple_slaves(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {comment, "VxWorks: tested separately"};
 	{ose,_} ->
 	    {comment, "OSE: multiple nodes not supported"};
 	_ ->
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 2b6af7e1fb..985aeb51e8 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -492,8 +492,6 @@ cur_dir_1(Config) when is_list(Config) ->
     ?line case os:type() of
 	      {unix, _} ->
 		  ?line {error, enotsup} = ?FILE_MODULE:get_cwd("d:");
-	      vxworks ->
-		  ?line {error, enotsup} = ?FILE_MODULE:get_cwd("d:");
 	      {win32, _} ->
 		  win_cur_dir_1(Config)
 	  end,
@@ -1038,32 +1036,29 @@ file_info_basic_file(Config) when is_list(Config) ->
 file_info_basic_directory(suite) -> [];
 file_info_basic_directory(doc) -> [];
 file_info_basic_directory(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
+    Dog = test_server:timetrap(test_server:seconds(5)),
 
     %% Note: filename:join/1 removes any trailing slash,
     %% which is essential for ?FILE_MODULE:file_info/1 to work on
     %% platforms such as Windows95.
-    ?line RootDir = filename:join([?config(priv_dir, Config)]),
+    RootDir = filename:join([?config(priv_dir, Config)]),
 
     %% Test that the RootDir directory has the expected attributes.
-    ?line test_directory(RootDir, read_write),
+    test_directory(RootDir, read_write),
 
     %% Note that on Windows file systems, 
     %% "/" or "c:/" are *NOT* directories.
     %% Therefore, test that ?FILE_MODULE:file_info/1 behaves as if they were
     %% directories.
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line test_directory("/", read_write),
-		  ?line test_directory("c:/", read_write),
-		  ?line test_directory("c:\\", read_write);
-	      {unix, _} ->
-		  ?line test_directory("/", read);
-	      vxworks ->
-		  %% Check is just done for owner
-		  ?line test_directory("/", read_write)
-	  end,
-    ?line test_server:timetrap_cancel(Dog).
+    case os:type() of
+        {win32, _} ->
+            ?line test_directory("/", read_write),
+            ?line test_directory("c:/", read_write),
+            ?line test_directory("c:\\", read_write);
+        {unix, _} ->
+            ?line test_directory("/", read)
+    end,
+    test_server:timetrap_cancel(Dog).
 
 test_directory(Name, ExpectedAccess) ->
     ?line {ok,#file_info{size=Size,type=Type,access=Access,
@@ -1784,9 +1779,7 @@ e_delete(Config) when is_list(Config) ->
 			   Base, #file_info {mode=8#600});
 	      {win32, _} ->
 		  %% Remove a character device.
-		  ?line {error, eacces} = ?FILE_MODULE:delete("nul");
-	      vxworks ->
-		  ok
+		  ?line {error, eacces} = ?FILE_MODULE:delete("nul")
 	  end,
 
     ?line [] = flush(),
@@ -1801,148 +1794,133 @@ e_delete(Config) when is_list(Config) ->
 e_rename(suite) -> [];
 e_rename(doc) -> [];
 e_rename(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "Windriver: dosFs must be fixed first!"};
-	_ ->
-	    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-	    ?line RootDir = ?config(priv_dir, Config),
-	    ?line Base = filename:join(RootDir,
-				       atom_to_list(?MODULE)++"_e_rename"),
-	    ?line ok = ?FILE_MODULE:make_dir(Base),
-	
-	    %% Create an empty directory.
-	    ?line EmptyDir = filename:join(Base, "empty_dir"),
-	    ?line ok = ?FILE_MODULE:make_dir(EmptyDir),
-
-	    %% Create a non-empty directory.
-	    ?line NonEmptyDir = filename:join(Base, "non_empty_dir"),
-	    ?line ok = ?FILE_MODULE:make_dir(NonEmptyDir),
-	    ?line ok = ?FILE_MODULE:write_file(
-			  filename:join(NonEmptyDir, "a_file"),
-			  "hello\n"),
-
-	    %% Create another non-empty directory.
-	    ?line ADirectory = filename:join(Base, "a_directory"),
-	    ?line ok = ?FILE_MODULE:make_dir(ADirectory),
-	    ?line ok = ?FILE_MODULE:write_file(
-			  filename:join(ADirectory, "a_file"),
-			  "howdy\n\n"),
-
-	    %% Create a data file.
-	    ?line File = filename:join(Base, "just_a_file"),
-	    ?line ok = ?FILE_MODULE:write_file(File, "anything goes\n\n"),
-	
-	    %% Move an existing directory to a non-empty directory.
-	    ?line {error, eexist} = 
-		?FILE_MODULE:rename(ADirectory, NonEmptyDir),
-
-	    %% Move a root directory.
-	    ?line {error, einval} = ?FILE_MODULE:rename("/", "arne"),
-
-	    %% Move Base into Base/new_name.
-	    ?line {error, einval} = 
-		?FILE_MODULE:rename(Base, filename:join(Base, "new_name")),
-
-	    %% Overwrite a directory with a file.
-	    ?line expect({error, eexist}, %FreeBSD (?)
-			 {error, eisdir},
-			 ?FILE_MODULE:rename(File, EmptyDir)),
-	    ?line expect({error, eexist}, %FreeBSD (?)
-			 {error, eisdir},
-			 ?FILE_MODULE:rename(File, NonEmptyDir)),
-
-	    %% Move a non-existing file.
-	    ?line NonExistingFile = 
-		filename:join(Base, "non_existing_file"),
-	    ?line {error, enoent} = 
-		?FILE_MODULE:rename(NonExistingFile, NonEmptyDir),
-
-	    %% Overwrite a file with a directory.
-	    ?line expect({error, eexist}, %FreeBSD (?)
-			 {error, enotdir},
-			 ?FILE_MODULE:rename(ADirectory, File)),
-	    
-	    %% Move a file to another filesystem.
-	    %% XXX - This test case is bogus. We cannot be guaranteed that
-	    %%       the source and destination are on 
-	    %%       different filesystems.
-	    %%
-	    %% XXX - Gross hack!
-	    ?line Comment = 
-		case os:type() of
-		    {unix, _} ->
-			OtherFs = "/tmp",
-			?line NameOnOtherFs =
-			    filename:join(OtherFs, filename:basename(File)),
-			?line {ok, Com} = 
-			    case ?FILE_MODULE:rename(File, NameOnOtherFs) of
-				{error, exdev} ->
-				    %% The file could be in 
-				    %% the same filesystem!
-				    {ok, ok};
-				    ok ->
-				    {ok, {comment, 
-					  "Moving between filesystems "
-					  "suceeded, files are probably "
-					  "in the same filesystem!"}};
-				{error, eperm} ->
-				    {ok, {comment, "SBS! You don't "
-					  "have the permission to do "
-					  "this test!"}};
-				Else ->
-				    Else
-			    end,
-			Com;
-		    {win32, _} ->
-			%% At least Windows NT can 
-			%% successfully move a file to
-			%% another drive.
-			ok
-		end,
-	    ?line [] = flush(),
-	    ?line test_server:timetrap_cancel(Dog),
-	    Comment
-    end.
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    RootDir = ?config(priv_dir, Config),
+    Base = filename:join(RootDir,
+	atom_to_list(?MODULE)++"_e_rename"),
+    ok = ?FILE_MODULE:make_dir(Base),
+
+    %% Create an empty directory.
+    EmptyDir = filename:join(Base, "empty_dir"),
+    ok = ?FILE_MODULE:make_dir(EmptyDir),
+
+    %% Create a non-empty directory.
+    NonEmptyDir = filename:join(Base, "non_empty_dir"),
+    ok = ?FILE_MODULE:make_dir(NonEmptyDir),
+    ok = ?FILE_MODULE:write_file(
+	filename:join(NonEmptyDir, "a_file"),
+	"hello\n"),
+
+    %% Create another non-empty directory.
+    ADirectory = filename:join(Base, "a_directory"),
+    ok = ?FILE_MODULE:make_dir(ADirectory),
+    ok = ?FILE_MODULE:write_file(
+	filename:join(ADirectory, "a_file"),
+	"howdy\n\n"),
+
+    %% Create a data file.
+    File = filename:join(Base, "just_a_file"),
+    ok = ?FILE_MODULE:write_file(File, "anything goes\n\n"),
+
+    %% Move an existing directory to a non-empty directory.
+    {error, eexist} = ?FILE_MODULE:rename(ADirectory, NonEmptyDir),
+
+    %% Move a root directory.
+    {error, einval} = ?FILE_MODULE:rename("/", "arne"),
+
+    %% Move Base into Base/new_name.
+    {error, einval} = 
+    ?FILE_MODULE:rename(Base, filename:join(Base, "new_name")),
+
+    %% Overwrite a directory with a file.
+    expect({error, eexist}, %FreeBSD (?)
+	{error, eisdir},
+	?FILE_MODULE:rename(File, EmptyDir)),
+    expect({error, eexist}, %FreeBSD (?)
+	{error, eisdir},
+	?FILE_MODULE:rename(File, NonEmptyDir)),
+
+    %% Move a non-existing file.
+    NonExistingFile = filename:join(Base, "non_existing_file"),
+    {error, enoent} = ?FILE_MODULE:rename(NonExistingFile, NonEmptyDir),
+
+    %% Overwrite a file with a directory.
+    expect({error, eexist}, %FreeBSD (?)
+	{error, enotdir},
+	?FILE_MODULE:rename(ADirectory, File)),
+
+    %% Move a file to another filesystem.
+    %% XXX - This test case is bogus. We cannot be guaranteed that
+    %%       the source and destination are on 
+    %%       different filesystems.
+    %%
+    %% XXX - Gross hack!
+    Comment = case os:type() of
+	{unix, _} ->
+	    OtherFs = "/tmp",
+	    NameOnOtherFs = filename:join(OtherFs, filename:basename(File)),
+	    {ok, Com} = case ?FILE_MODULE:rename(File, NameOnOtherFs) of
+		{error, exdev} ->
+		    %% The file could be in 
+		    %% the same filesystem!
+		    {ok, ok};
+		ok ->
+		    {ok, {comment, 
+			    "Moving between filesystems "
+			    "suceeded, files are probably "
+			    "in the same filesystem!"}};
+		{error, eperm} ->
+		    {ok, {comment, "SBS! You don't "
+			    "have the permission to do "
+			    "this test!"}};
+		Else ->
+		    Else
+	    end,
+	    Com;
+	{win32, _} ->
+	    %% At least Windows NT can 
+	    %% successfully move a file to
+	    %% another drive.
+	    ok
+    end,
+    [] = flush(),
+    test_server:timetrap_cancel(Dog),
+    Comment.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 e_make_dir(suite) -> [];
 e_make_dir(doc) -> [];
 e_make_dir(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line Base = filename:join(RootDir, 
-			       atom_to_list(?MODULE)++"_e_make_dir"),
-    ?line ok = ?FILE_MODULE:make_dir(Base),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    RootDir = ?config(priv_dir, Config),
+    Base = filename:join(RootDir, 
+          	       atom_to_list(?MODULE)++"_e_make_dir"),
+    ok = ?FILE_MODULE:make_dir(Base),
 
     %% A component of the path does not exist.
-    ?line {error, enoent} = 
-	?FILE_MODULE:make_dir(filename:join([Base, "a", "b"])),
+    {error, enoent} = ?FILE_MODULE:make_dir(filename:join([Base, "a", "b"])),
 
     %% Use a path-name with a non-directory component.
-    ?line Afile = filename:join(Base, "a_directory"),
-    ?line ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
-    ?line case ?FILE_MODULE:make_dir(
-		  filename:join(Afile, "another_directory")) of
-	      {error, enotdir} -> io:format("Result: enotdir");
-	      {error, enoent} -> io:format("Result: enoent")
-	  end,
+    Afile = filename:join(Base, "a_directory"),
+    ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
+    case ?FILE_MODULE:make_dir(
+            filename:join(Afile, "another_directory")) of
+        {error, enotdir} -> io:format("Result: enotdir");
+        {error, enoent} -> io:format("Result: enoent")
+    end,
 
     %% No permission (on Unix only).
     case os:type() of
 	{unix, _} ->
-	    ?line ?FILE_MODULE:write_file_info(Base, #file_info {mode=0}),
-	    ?line {error, eacces} = 
-		?FILE_MODULE:make_dir(filename:join(Base, "xxxx")),
-	    ?line ?FILE_MODULE:write_file_info(
+	    ?FILE_MODULE:write_file_info(Base, #file_info {mode=0}),
+	    {error, eacces} = ?FILE_MODULE:make_dir(filename:join(Base, "xxxx")),
+	    ?FILE_MODULE:write_file_info(
 		     Base, #file_info {mode=8#600});
 	{win32, _} ->
-	    ok;
-	vxworks ->
 	    ok
     end,
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1950,57 +1928,50 @@ e_make_dir(Config) when is_list(Config) ->
 e_del_dir(suite) -> [];
 e_del_dir(doc) -> [];
 e_del_dir(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line Base = test_server:temp_name(filename:join(RootDir, "e_del_dir")),
-    ?line io:format("Base: ~p", [Base]),
-    ?line ok = ?FILE_MODULE:make_dir(Base),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    RootDir = ?config(priv_dir, Config),
+    Base = test_server:temp_name(filename:join(RootDir, "e_del_dir")),
+    io:format("Base: ~p", [Base]),
+    ok = ?FILE_MODULE:make_dir(Base),
 
     %% Delete a non-existent directory.
-    ?line {error, enoent} = 
+    {error, enoent} = 
 	?FILE_MODULE:del_dir(filename:join(Base, "non_existing")),
 
     %% Use a path-name with a non-directory component.
-    ?line Afile = filename:join(Base, "a_directory"),
-    ?line ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
-    ?line {error, E1} = 
-	expect({error, enotdir}, {error, enoent},
-	       ?FILE_MODULE:del_dir(
-		 filename:join(Afile, "another_directory"))),
-    ?line io:format("Result: ~p", [E1]),
+    Afile = filename:join(Base, "a_directory"),
+    ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
+    {error, E1} = expect({error, enotdir}, {error, enoent},
+	?FILE_MODULE:del_dir(
+	    filename:join(Afile, "another_directory"))),
+    io:format("Result: ~p", [E1]),
 
     %% Delete a non-empty directory.
-    ?line {error, E2} = 
-	expect({error, enotempty}, {error, eexist}, {error, eacces},
+    {error, E2} = expect({error, enotempty}, {error, eexist}, {error, eacces},
 	       ?FILE_MODULE:del_dir(Base)),
-    ?line io:format("Result: ~p", [E2]),
+    io:format("Result: ~p", [E2]),
 
     %% Remove the current directory.
-    ?line {error, E3} = 
-	expect({error, einval}, 
+    {error, E3} = expect({error, einval}, 
 	       {error, eperm}, % Linux and DUX
 	       {error, eacces},
 	       {error, ebusy},
 	       ?FILE_MODULE:del_dir(".")),
-    ?line io:format("Result: ~p", [E3]),
+    io:format("Result: ~p", [E3]),
 
     %% No permission.
     case os:type() of
 	{unix, _} ->
-	    ?line ADirectory = filename:join(Base, "no_perm"),
-	    ?line ok = ?FILE_MODULE:make_dir(ADirectory),
-	    ?line ?FILE_MODULE:write_file_info(
-		     Base, #file_info {mode=0}),
-	    ?line {error, eacces} = ?FILE_MODULE:del_dir(ADirectory),
-	    ?line ?FILE_MODULE:write_file_info(
-		     Base, #file_info {mode=8#600});
+	    ADirectory = filename:join(Base, "no_perm"),
+	    ok = ?FILE_MODULE:make_dir(ADirectory),
+	    ?FILE_MODULE:write_file_info( Base, #file_info {mode=0}),
+	    {error, eacces} = ?FILE_MODULE:del_dir(ADirectory),
+	    ?FILE_MODULE:write_file_info( Base, #file_info {mode=8#600});
 	{win32, _} ->
-	    ok;
-	vxworks ->
 	    ok
     end,
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2563,147 +2534,123 @@ delayed_write(doc) ->
     ["Tests the file open option {delayed_write, Size, Delay}"];
 
 delayed_write(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(20)),
-    %%
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line File = filename:join(RootDir, 
-			       atom_to_list(?MODULE)++"_delayed_write.txt"),
-    ?line Data1 = "asdfghjkl",
-    ?line Data2 = "qwertyuio",
-    ?line Data3 = "zxcvbnm,.",
-    ?line Size = length(Data1),
-    ?line Size = length(Data2),
-    ?line Size = length(Data3),
-    ?line Data1Data1 = Data1++Data1,
-    ?line Data1Data1Data1 = Data1Data1++Data1,
-    ?line Data1Data1Data1Data1 = Data1Data1++Data1Data1,
+    Dog = ?t:timetrap(?t:seconds(20)),
+    
+    RootDir = ?config(priv_dir, Config),
+    File = filename:join(RootDir, 
+          	       atom_to_list(?MODULE)++"_delayed_write.txt"),
+    Data1 = "asdfghjkl",
+    Data2 = "qwertyuio",
+    Data3 = "zxcvbnm,.",
+    Size = length(Data1),
+    Size = length(Data2),
+    Size = length(Data3),
+    Data1Data1 = Data1++Data1,
+    Data1Data1Data1 = Data1Data1++Data1,
+    Data1Data1Data1Data1 = Data1Data1++Data1Data1,
     %%
     %% Test caching and normal close of non-raw file
-    ?line {ok, Fd1} = 
+    {ok, Fd1} = 
 	?FILE_MODULE:open(File, [write, {delayed_write, Size+1, 2000}]),
-    ?line ok = ?FILE_MODULE:write(Fd1, Data1),
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Fd2} = ?FILE_MODULE:open(File, [read]),
-    ?line case os:type() of
-	      vxworks -> 
-		  io:format("Line ~p skipped on vxworks", [?LINE]);
-	      _ ->
-		  ?line eof = ?FILE_MODULE:read(Fd2, 1)
-	  end,
-    ?line ok = ?FILE_MODULE:write(Fd1, Data1), % Data flush on size
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 2*Size+1),
-    ?line ok = ?FILE_MODULE:write(Fd1, Data1),
-    ?line ?t:sleep(3000), % Wait until data flush on timeout
-    ?line {ok, Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 3*Size+1),
-    ?line ok = ?FILE_MODULE:write(Fd1, Data1),
-    ?line ok = ?FILE_MODULE:close(Fd1), % Data flush on close
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Data1Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 4*Size+1),
-    ?line ok = ?FILE_MODULE:close(Fd2),
+    ok = ?FILE_MODULE:write(Fd1, Data1),
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Fd2} = ?FILE_MODULE:open(File, [read]),
+    eof = ?FILE_MODULE:read(Fd2, 1),
+    ok = ?FILE_MODULE:write(Fd1, Data1), % Data flush on size
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 2*Size+1),
+    ok = ?FILE_MODULE:write(Fd1, Data1),
+    ?t:sleep(3000), % Wait until data flush on timeout
+    {ok, Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 3*Size+1),
+    ok = ?FILE_MODULE:write(Fd1, Data1),
+    ok = ?FILE_MODULE:close(Fd1), % Data flush on close
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Data1Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 4*Size+1),
+    ok = ?FILE_MODULE:close(Fd2),
     %%
     %% Test implicit close through exit by file owning process, 
     %% raw file, default parameters.
-    ?line Parent = self(),
-    ?line Fun = 
-	fun () ->
-		Child = self(),
-		Test = 
-		    fun () ->
-			    ?line {ok, Fd} = 
-				?FILE_MODULE:open(File, 
-						  [raw, write, 
-						   delayed_write]),
-			    ?line ok = ?FILE_MODULE:write(Fd, Data1),
-			    ?line Parent ! {Child, wrote},
-			    ?line receive 
-				      {Parent, continue, Reason} -> 
-					  {ok, Reason}
-				  end
-		    end,
-		case (catch Test()) of
-		    {ok, Reason} ->
-			exit(Reason);
-		    Unknown ->
-			exit({Unknown, get(test_server_loc)})
-		end
-	end,
-    ?line Child1 = spawn(Fun),
-    ?line Mref1 = erlang:monitor(process, Child1),
-    ?line receive 
-	      {Child1, wrote} -> 
-		  ok;
-	      {'DOWN', Mref1, _, _, _} = Down1a ->
-		  ?t:fail(Down1a)
-	  end,
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Fd3} = ?FILE_MODULE:open(File, [read]),
-    ?line case os:type() of
-	      vxworks -> 
-		  io:format("Line ~p skipped on vxworks", [?LINE]);
-	      _ ->
-		  ?line eof = ?FILE_MODULE:read(Fd3, 1)
-	  end,
-    ?line Child1 ! {Parent, continue, normal},
-    ?line receive 
-	      {'DOWN', Mref1, process, Child1, normal} -> 
-		  ok;
-	      {'DOWN', Mref1, _, _, _} = Down1b ->
-		  ?t:fail(Down1b)
-	  end,
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Data1} = ?FILE_MODULE:pread(Fd3, bof, Size+1),
-    ?line ok = ?FILE_MODULE:close(Fd3),
+    Parent = self(),
+    Fun = fun() ->
+	    Child = self(),
+	    Test = 
+	    fun () ->
+		    {ok, Fd} = ?FILE_MODULE:open(File, 
+			[raw, write, delayed_write]),
+		    ok = ?FILE_MODULE:write(Fd, Data1),
+		    Parent ! {Child, wrote},
+		    receive 
+			{Parent, continue, Reason} -> 
+			    {ok, Reason}
+		    end
+	    end,
+	    case (catch Test()) of
+		{ok, Reason} -> exit(Reason);
+		Unknown ->
+		    exit({Unknown, get(test_server_loc)})
+	    end
+    end,
+    Child1 = spawn(Fun),
+    Mref1 = erlang:monitor(process, Child1),
+    receive 
+        {Child1, wrote} -> 
+            ok;
+        {'DOWN', Mref1, _, _, _} = Down1a ->
+            ?t:fail(Down1a)
+    end,
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Fd3} = ?FILE_MODULE:open(File, [read]),
+    eof = ?FILE_MODULE:read(Fd3, 1),
+    Child1 ! {Parent, continue, normal},
+    receive 
+        {'DOWN', Mref1, process, Child1, normal} -> 
+            ok;
+        {'DOWN', Mref1, _, _, _} = Down1b ->
+            ?t:fail(Down1b)
+    end,
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Data1} = ?FILE_MODULE:pread(Fd3, bof, Size+1),
+    ok = ?FILE_MODULE:close(Fd3),
     %%
     %% The same again, but this time with reason 'kill'.
-    ?line Child2 = spawn(Fun),
-    ?line Mref2 = erlang:monitor(process, Child2),
-    ?line receive 
-	      {Child2, wrote} -> 
-		  ok;
-	      {'DOWN', Mref2, _, _, _} = Down2a ->
-		  ?t:fail(Down2a)
-	  end,
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Fd4} = ?FILE_MODULE:open(File, [read]),
-    ?line case os:type() of
-	      vxworks -> 
-		  io:format("Line ~p skipped on vxworks", [?LINE]);
-	      _ ->
-		  ?line eof = ?FILE_MODULE:read(Fd4, 1)
-	  end,
-    ?line Child2 ! {Parent, continue, kill},
-    ?line receive 
-	      {'DOWN', Mref2, process, Child2, kill} -> 
-		  ok;
-	      {'DOWN', Mref2, _, _, _} = Down2b ->
-		  ?t:fail(Down2b)
-	  end,
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line eof = ?FILE_MODULE:pread(Fd4, bof, 1),
-    ?line ok = ?FILE_MODULE:close(Fd4),
+    Child2 = spawn(Fun),
+    Mref2 = erlang:monitor(process, Child2),
+    receive 
+        {Child2, wrote} -> 
+            ok;
+        {'DOWN', Mref2, _, _, _} = Down2a ->
+            ?t:fail(Down2a)
+    end,
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Fd4} = ?FILE_MODULE:open(File, [read]),
+    eof = ?FILE_MODULE:read(Fd4, 1),
+    Child2 ! {Parent, continue, kill},
+    receive 
+        {'DOWN', Mref2, process, Child2, kill} -> 
+            ok;
+        {'DOWN', Mref2, _, _, _} = Down2b ->
+            ?t:fail(Down2b)
+    end,
+    ?t:sleep(1000), % Just in case the file system is slow
+    eof = ?FILE_MODULE:pread(Fd4, bof, 1),
+    ok  = ?FILE_MODULE:close(Fd4),
     %%
     %% Test if file position works with delayed_write
-    ?line {ok, Fd5} = ?FILE_MODULE:open(File, [raw, read, write, 
-					       delayed_write]),
-    ?line ok = ?FILE_MODULE:truncate(Fd5),
-    ?line ok = ?FILE_MODULE:write(Fd5, [Data1|Data2]),
-    ?line {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
-    ?line ok = ?FILE_MODULE:write(Fd5, [Data3]),
-    ?line {ok, Data2} = ?FILE_MODULE:read(Fd5, Size+1),
-    ?line {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
-    ?line Data3Data2 = Data3++Data2,
-    ?line {ok, Data3Data2} = ?FILE_MODULE:read(Fd5, 2*Size+1),
-    ?line ok = ?FILE_MODULE:close(Fd5),
+    {ok, Fd5} = ?FILE_MODULE:open(File, [raw, read, write, 
+          			       delayed_write]),
+    ok = ?FILE_MODULE:truncate(Fd5),
+    ok = ?FILE_MODULE:write(Fd5, [Data1|Data2]),
+    {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
+    ok = ?FILE_MODULE:write(Fd5, [Data3]),
+    {ok, Data2} = ?FILE_MODULE:read(Fd5, Size+1),
+    {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
+    Data3Data2 = Data3++Data2,
+    {ok, Data3Data2} = ?FILE_MODULE:read(Fd5, 2*Size+1),
+    ok = ?FILE_MODULE:close(Fd5),
     %%
-    ?line [] = flush(),
-    ?line ?t:timetrap_cancel(Dog),
-    ?line case os:type() of
-	      vxworks -> 
-		  {comment, "Some lines skipped on vxworks"};
-	      _ ->
-		  ok
-	  end.
+    [] = flush(),
+    ?t:timetrap_cancel(Dog),
+    ok.
 
 
 pid2name(doc) -> "Tests file:pid2name/1.";
diff --git a/lib/kernel/test/gen_tcp_echo_SUITE.erl b/lib/kernel/test/gen_tcp_echo_SUITE.erl
index 5bbaeb02ad..94f95798a0 100644
--- a/lib/kernel/test/gen_tcp_echo_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_echo_SUITE.erl
@@ -190,24 +190,19 @@ echo_test_1(SockOpts, EchoFun, Config0) ->
     ok.
 
 echo_packet(SockOpts, EchoFun, Opts) ->
-    ?line Type =
-	case lists:keysearch(type, 1, Opts) of
-	    {value, {type, T}} ->
-		T;
-	    _ ->
-		{value, {packet, T}} = lists:keysearch(packet, 1, SockOpts),
-		T
-	end,
+    Type = case lists:keysearch(type, 1, Opts) of
+	{value, {type, T}} ->
+	    T;
+	_ ->
+	    {value, {packet, T}} = lists:keysearch(packet, 1, SockOpts),
+	    T
+    end,
 
     %% Connect to the echo server.
-    ?line EchoPort = ?config(echo_port, Opts),
-    ?line {ok, Echo} = gen_tcp:connect(localhost, EchoPort, SockOpts),
+    EchoPort = ?config(echo_port, Opts),
+    {ok, Echo} = gen_tcp:connect(localhost, EchoPort, SockOpts),
 
-    ?line SlowEcho = 
-	case os:type() of
-	    vxworks -> true;
-	    _ -> lists:member(slow_echo, Opts)
-	end,
+    SlowEcho = lists:member(slow_echo, Opts),
 
     case Type of
 	http ->
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 1592399996..5d45b91ee5 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -340,39 +340,23 @@ no_accept(doc) ->
      "a tcp_closed message."];
 no_accept(suite) -> [];
 no_accept(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skip,"Too tough for vxworks"};
-	_ ->
-	    no_accept2()
+    {ok, L} = gen_tcp:listen(0, []),
+    {ok, {_, Port}} = inet:sockname(L),
+    {ok, Client} = gen_tcp:connect(localhost, Port, []),
+    ok = gen_tcp:close(L),
+    receive
+        {tcp_closed, Client} ->
+            ok
+    after 5000 ->
+            ?line test_server:fail(never_closed)
+    
     end.
 
-no_accept2() ->
-    ?line {ok, L} = gen_tcp:listen(0, []),
-    ?line {ok, {_, Port}} = inet:sockname(L),
-    ?line {ok, Client} = gen_tcp:connect(localhost, Port, []),
-    ?line ok = gen_tcp:close(L),
-    ?line receive
-	      {tcp_closed, Client} ->
-		  ok
-	  after 5000 ->
-		  ?line test_server:fail(never_closed)
-	  
-	  end.
-
 close_with_pending_output(doc) ->
     ["Send several packets to a socket and close it.  All packets should arrive ",
      "to the other end."];
 close_with_pending_output(suite) -> [];
 close_with_pending_output(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skipped,"Too tough for vxworks"};
-	_ ->
-	    close_with_pending_output2()
-    end.
-
-close_with_pending_output2() ->
     ?line {ok, L} = gen_tcp:listen(0, [binary, {active, false}]),
     ?line {ok, {_, Port}} = inet:sockname(L),
     ?line Packets = 16,
@@ -423,22 +407,16 @@ otp_3924(doc) ->
 otp_3924(suite) -> [];
 otp_3924(Config) when is_list(Config) ->
     MaxDelay = (case has_superfluous_schedulers() of
-		    true -> 4;
-		    false -> 1
-		end
-		* case {erlang:system_info(debug_compiled),
-			erlang:system_info(lock_checking)} of
-		      {true, _} -> 6;
-		      {_, true} -> 2;
-		      _ -> 1
-		  end * ?OTP_3924_MAX_DELAY),
-    case os:type() of
-	vxworks ->
-%%	    {skip,"Too tough for vxworks"};
-	    otp_3924_1(MaxDelay);
-	_ ->
-	    otp_3924_1(MaxDelay)
-    end.
+	    true -> 4;
+	    false -> 1
+	end
+	* case {erlang:system_info(debug_compiled),
+		erlang:system_info(lock_checking)} of
+	    {true, _} -> 6;
+	    {_, true} -> 2;
+	    _ -> 1
+	end * ?OTP_3924_MAX_DELAY),
+    otp_3924_1(MaxDelay).
 
 otp_3924_1(MaxDelay) ->
     Dog = test_server:timetrap(test_server:seconds(240)),
@@ -559,26 +537,18 @@ otp_3924_sender(Receiver, Host, Port, Data) ->
 data_before_close(doc) ->
     ["Tests that a huge amount of data can be received before a close."];
 data_before_close(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skip,"Too tough for vxworks"};
-	_ ->
-	    data_before_close2()
-    end.
-
-data_before_close2() ->
-    ?line {ok, L} = gen_tcp:listen(0, [binary]),
-    ?line {ok, {_, TcpPort}} = inet:sockname(L),
-    ?line Bytes = 256*1024,
-    ?line spawn_link(fun() -> huge_sender(TcpPort, Bytes) end),
-    ?line {ok, A} = gen_tcp:accept(L),
-    ?line case count_bytes_recv(A, 0) of
-	      {Bytes, Result} ->
-		  io:format("Result: ~p", [Result]);
-	      {Wrong, Result} ->
-		  io:format("Result: ~p", [Result]),
-		  test_server:fail({wrong_count, Wrong})
-	  end,
+    {ok, L} = gen_tcp:listen(0, [binary]),
+    {ok, {_, TcpPort}} = inet:sockname(L),
+    Bytes = 256*1024,
+    spawn_link(fun() -> huge_sender(TcpPort, Bytes) end),
+    {ok, A} = gen_tcp:accept(L),
+    case count_bytes_recv(A, 0) of
+        {Bytes, Result} ->
+            io:format("Result: ~p", [Result]);
+        {Wrong, Result} ->
+            io:format("Result: ~p", [Result]),
+            test_server:fail({wrong_count, Wrong})
+    end,
     ok.
 
 count_bytes_recv(Sock, Total) ->
@@ -611,32 +581,18 @@ get_status(Config) when is_list(Config) ->
     ?line {ok,{socket,Pid,_,_}} = gen_tcp:listen(5678,[]),
     ?line {status,Pid,_,_} = sys:get_status(Pid).
 
+-define(RECOVER_SLEEP, 60000).
+-define(RETRY_SLEEP, 15000).
+
 iter_max_socks(doc) ->
     ["Open as many sockets as possible. Do this several times and check ",
      "that we get the same number of sockets every time."];
 iter_max_socks(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skip,"Too tough for vxworks"};
-	_ ->
-	    iter_max_socks2()
-    end.
-
--define(RECOVER_SLEEP, 60000).
--define(RETRY_SLEEP, 15000).
-
-iter_max_socks2() ->
-    ?line N = 
-	case os:type() of
-	    vxworks ->
-		10;
-	    _ ->
-		20
-	end,
+    N = 20,
     L = do_iter_max_socks(N, initalize),
-    ?line io:format("Result: ~p",[L]),
-    ?line all_equal(L),
-    ?line {comment, "Max sockets: " ++ integer_to_list(hd(L))}.
+    io:format("Result: ~p",[L]),
+    all_equal(L),
+    {comment, "Max sockets: " ++ integer_to_list(hd(L))}.
 
 do_iter_max_socks(0, _) ->
     [];
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index 233e438dc9..31005a01e2 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -266,13 +266,8 @@ dont_drop(doc) ->
      "set just before halt on very high I/O load."];
 dont_drop(Config) when is_list(Config) ->
     %%% Have to do it some times to make it happen...
-    case os:type() of
-	vxworks ->
-	    {comment, "No use to run with slaves on other nodes..."};
-	_ ->
-	    [ok,ok,ok,ok,ok,ok,ok,ok,ok,ok] = do_dont_drop(Config,10),
-	    ok
-    end.
+    [ok,ok,ok,ok,ok,ok,ok,ok,ok,ok] = do_dont_drop(Config,10),
+    ok.
 
 do_dont_drop(_,0) ->
     [];
@@ -333,13 +328,7 @@ kill_pid(doc) ->
     ["Tests that heart kills the old erlang node before executing ",
      "heart command."];
 kill_pid(Config) when is_list(Config) ->
-    %%% Have to do it some times to make it happen...
-    case os:type() of
-	vxworks ->
-	    {comment, "No use to run with slaves on other nodes..."};
-	_ ->
-	    ok = do_kill_pid(Config)
-    end.
+    ok = do_kill_pid(Config).
 
 do_kill_pid(_Config) ->
     Name = heart_test,
diff --git a/lib/kernel/test/heart_SUITE_data/simple_echo.c b/lib/kernel/test/heart_SUITE_data/simple_echo.c
index 0093dbce9b..a92bb8af95 100644
--- a/lib/kernel/test/heart_SUITE_data/simple_echo.c
+++ b/lib/kernel/test/heart_SUITE_data/simple_echo.c
@@ -2,11 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef VXWORKS
-int simple_echo(void){
-#else
 int main(void){
-#endif
   int x;
   while((x = getchar()) != EOF){
     putchar(x);
@@ -14,4 +10,3 @@ int main(void){
   }
   return 0;
 }
-      
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index 7241b093d0..ce138b6804 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -66,7 +66,7 @@ required(v6) ->
      {require, test_dummy_ipv6_host}];
 required(hosts) ->
     case os:type() of
-	{OS, _} when OS =:= win32; OS =:= vxworks ->
+	{OS, _} when OS =:= win32 ->
 	    [{require, hardcoded_hosts},
 	     {require, hardcoded_ipv6_hosts}];
 	_Else ->
@@ -614,17 +614,12 @@ t_gethostnative(Config) when is_list(Config) ->
 %% this will result in 26 bytes sent which causes problem in Windows
 %% if the port-program has not assured stdin to be read in BINARY mode
 %% OTP-2555
-    case os:type() of
-	vxworks ->
-	    {skipped, "VxWorks has no native gethostbyname()"};
-	_ ->
-	    ?line case inet_gethost_native:gethostbyname(
-			 "a23456789012345678901234") of
-		      {error,notfound} ->
-			  ?line ok;
-		      {error,no_data} ->
-			  ?line ok
-		  end
+    ?line case inet_gethost_native:gethostbyname(
+	    "a23456789012345678901234") of
+	{error,notfound} ->
+	    ?line ok;
+	{error,no_data} ->
+	    ?line ok
     end.
 
 gethostnative_parallell(suite) ->    
diff --git a/lib/kernel/test/inet_sockopt_SUITE_data/sockopt_helper.c b/lib/kernel/test/inet_sockopt_SUITE_data/sockopt_helper.c
index f24c93edf5..9c8f8eb91a 100644
--- a/lib/kernel/test/inet_sockopt_SUITE_data/sockopt_helper.c
+++ b/lib/kernel/test/inet_sockopt_SUITE_data/sockopt_helper.c
@@ -1,12 +1,3 @@
-#if defined(VXWORKS)
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-int sockopt_helper(void){
-    return 0;
-}
-#else
-
 #if defined(__WIN32__)
 #define WIN32_LEAN_AND_MEAN
 #include <winsock2.h>
@@ -215,5 +206,3 @@ int main(void){
     } while (x != C_QUIT);
     return 0;
 }
-#endif
-      
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index e3fa4642b7..1993cd0b32 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -256,47 +256,42 @@ get_plain_arguments(Config) when is_list(Config) ->
 boot_var(doc) -> [];
 boot_var(suite) -> {req, [distribution, {local_slave_nodes, 1}]};
 boot_var(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "Not run on VxWorks"};
+    ?line Dog = ?t:timetrap(?t:seconds(100)),
+
+    {BootScript, TEST_VAR, KernelVsn, StdlibVsn} = create_boot(Config),
+
+    %% Should fail as we have not given -boot_var TEST_VAR
+    ?line {error, timeout} =
+    start_node(init_test, "-boot " ++ BootScript),
+
+    case is_real_system(KernelVsn, StdlibVsn) of
+	true ->
+	    %% Now it should work !!
+	    ?line {ok, Node} =
+	    start_node(init_test,
+		"-boot " ++ BootScript ++
+		" -boot_var TEST_VAR " ++ TEST_VAR),
+	    stop_node(Node),
+	    Res = ok;
 	_ ->
-	    ?line Dog = ?t:timetrap(?t:seconds(100)),
-	    
-	    {BootScript, TEST_VAR, KernelVsn, StdlibVsn} = create_boot(Config),
-
-	    %% Should fail as we have not given -boot_var TEST_VAR
-	    ?line {error, timeout} =
-		start_node(init_test, "-boot " ++ BootScript),
-	    
-	    case is_real_system(KernelVsn, StdlibVsn) of
-		true ->
-		    %% Now it should work !!
-		    ?line {ok, Node} =
-			start_node(init_test,
-				   "-boot " ++ BootScript ++
-				   " -boot_var TEST_VAR " ++ TEST_VAR),
-		    stop_node(Node),
-		    Res = ok;
-		_ ->
-%% What we need is not so much version numbers on the directories, but
-%% for the boot var TEST_VAR to appear in the boot script, and it doesn't
-%% if we give the 'local' option to systools:make_script.
-		    ?t:format(
-		       "Test case not complete as we are not~n"
-		       "running in a real system!~n"
-		       "Probably this test is performed in a "
-		       "clearcase view or source tree.~n"
-		       "Need version numbers on the kernel and "
-		       "stdlib directories!~n",
-		       []),
-		    Res = {skip,
-			   "Test case only partially run since it is run "
-			   "in a clearcase view or in a source tree. "
-			   "Need an installed system to complete this test."}
-	    end,
-	    ?line ?t:timetrap_cancel(Dog),
-	    Res
-    end.
+	    %% What we need is not so much version numbers on the directories, but
+	    %% for the boot var TEST_VAR to appear in the boot script, and it doesn't
+	    %% if we give the 'local' option to systools:make_script.
+	    ?t:format(
+		"Test case not complete as we are not~n"
+		"running in a real system!~n"
+		"Probably this test is performed in a "
+		"clearcase view or source tree.~n"
+		"Need version numbers on the kernel and "
+		"stdlib directories!~n",
+		[]),
+	    Res = {skip,
+		"Test case only partially run since it is run "
+		"in a clearcase view or in a source tree. "
+		"Need an installed system to complete this test."}
+    end,
+    ?line ?t:timetrap_cancel(Dog),
+    Res.
 
 create_boot(Config) ->
     ?line {ok, OldDir} = file:get_cwd(),
@@ -579,55 +574,47 @@ script_id(Config) when is_list(Config) ->
 boot1(doc) -> [];
 boot1(suite) -> {req, [distribution, {local_slave_nodes, 1}, {time, 35}]};
 boot1(Config) when is_list(Config) ->
-    case os:type() of 
-	vxworks ->
-	    {comment, "Not run on VxWorks"};
-	_ ->
-	    ?line Dog = ?t:timetrap(?t:seconds(80)),
-	    Args = args() ++ " -boot start_sasl",
-	    ?line {ok, Node} = start_node(init_test, Args),
-	    ?line stop_node(Node),
-
-	    %% Try to start with non existing boot file.
-	    Args1 = args() ++ " -boot dummy_script",
-	    ?line {error, timeout} = start_node(init_test, Args1),
-	    
-	    ?line ?t:timetrap_cancel(Dog),
-	    ok
-    end.
+    ?line Dog = ?t:timetrap(?t:seconds(80)),
+    Args = args() ++ " -boot start_sasl",
+    ?line {ok, Node} = start_node(init_test, Args),
+    ?line stop_node(Node),
+
+    %% Try to start with non existing boot file.
+    Args1 = args() ++ " -boot dummy_script",
+    ?line {error, timeout} = start_node(init_test, Args1),
+
+    ?line ?t:timetrap_cancel(Dog),
+    ok.
 
 boot2(doc) -> [];
 boot2(suite) -> {req, [distribution, {local_slave_nodes, 1}, {time, 35}]};
 boot2(Config) when is_list(Config) ->
+    Dog = ?t:timetrap(?t:seconds(80)),
+
+    %% Absolute boot file name
+    Boot = filename:join([code:root_dir(), "bin", "start_sasl"]),
+
+    Args = args() ++ " -boot \"" ++ Boot++"\"",
+    {ok, Node} = start_node(init_test, Args),
+    stop_node(Node),
+
     case os:type() of 
-	vxworks ->
-	    {comment, "Not run on VxWorks"};
+	{win32, _} ->
+	    %% Absolute boot file name for Windows -- all slashes are
+	    %% converted to backslashes.
+	    Win_boot = lists:map(fun
+		    ($/) -> $\\;
+		    (C) -> C 
+		end, Boot),
+	    Args2 = args() ++ " -boot \"" ++ Win_boot ++ "\"",
+	    {ok, Node2} = start_node(init_test, Args2),
+	    stop_node(Node2);
 	_ ->
-	    ?line Dog = ?t:timetrap(?t:seconds(80)),
-
-	    %% Absolute boot file name
-	    Boot = filename:join([code:root_dir(), "bin", "start_sasl"]),
-
-	    Args = args() ++ " -boot \"" ++ Boot++"\"",
-	    ?line {ok, Node} = start_node(init_test, Args),
-	    ?line stop_node(Node),
-
-	    case os:type() of 
-		{win32, _} ->
-		    %% Absolute boot file name for Windows -- all slashes are
-		    %% converted to backslashes.
-		    Win_boot = lists:map(fun($/) -> $\\; (C) -> C end,
-					 Boot),
-		    Args2 = args() ++ " -boot \"" ++ Win_boot ++ "\"",
-		    ?line {ok, Node2} = start_node(init_test, Args2),
-		    ?line stop_node(Node2);
-		_ ->
-		    ok
-	    end,
-
-	    ?line ?t:timetrap_cancel(Dog),
 	    ok
-    end.
+    end,
+
+    ?t:timetrap_cancel(Dog),
+    ok.
 
 %% Misc. functions    
 
diff --git a/lib/kernel/test/kernel.spec.wxworks b/lib/kernel/test/kernel.spec.wxworks
deleted file mode 100644
index 370e474e64..0000000000
--- a/lib/kernel/test/kernel.spec.wxworks
+++ /dev/null
@@ -1,63 +0,0 @@
-%% -*- erlang -*-
-{suites,"kernel_test",all}.
-{skip_cases,"kernel_test",bif_SUITE,[spawn_link_race1],"Known bug."}.
-{skip_cases,"kernel_test",file_SUITE,
-            [read_write_file],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [cur_dir_0],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [open1],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [file_info_times],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [file_write_file_info],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [truncate],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [rename],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [e_delete],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [e_rename],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [delayed_write],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [read_ahead],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [segment_write],
-            "VxWorks filesystem would overload"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [segment_read],
-            "VxWorks filesystem would overload"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [compress_errors],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",init_SUITE,[restart],"Uses peer nodes"}.
-{skip_cases,"kernel_test",os_SUITE,[space_in_cwd],"VxWorks can't handle this"}.
-{skip_cases,"kernel_test",os_SUITE,
-            [space_in_name],
-            "VxWorks can't handle this"}.
-{skip_cases,"kernel_test",os_SUITE,[quoting],"VxWorks can't handle this"}.
-{skip_cases,"kernel_test",prim_file_SUITE,
-            [open1],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",prim_file_SUITE,
-            [compress_errors],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",seq_trace_SUITE,
-            [distributed_recv],
-            "Test not adopted to slaves on different machine"}.
-{skip_cases,"kernel_test",seq_trace_SUITE,
-            [distributed_exit],
-            "Test not adopted to slaves on different machine"}.
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index ae3410d13f..3f2195b609 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -202,8 +202,6 @@ find_executable(Config) when is_list(Config) ->
 
 	    %% Never return a directory name.
 	    ?line false = os:find_executable("unix", [DataDir]),
-	    ok;
-	vxworks -> 
 	    ok
     end.
 
diff --git a/lib/kernel/test/pdict_SUITE.erl b/lib/kernel/test/pdict_SUITE.erl
index 8afdfc8a47..60b818cbe3 100644
--- a/lib/kernel/test/pdict_SUITE.erl
+++ b/lib/kernel/test/pdict_SUITE.erl
@@ -152,7 +152,6 @@ heavy(Config) when is_list(Config) ->
     time(5000),
     ?M([],get()),
     case {os:type(),?t:is_debug()} of
-	{vxworks,_} -> ok;
 	{_,true} -> ok;	    
 	_ ->
 	    time(50000),
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index 3e2202922c..a56746bbc4 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -406,9 +406,6 @@ cur_dir_1(Config, Handle) ->
 	      {unix, _} ->
 		  ?line {error, enotsup} = 
 		      ?PRIM_FILE_call(get_cwd, Handle, ["d:"]);
-	      vxworks ->
-		  ?line {error, enotsup} = 
-		      ?PRIM_FILE_call(get_cwd, Handle,  ["d:"]);
 	      {win32, _} ->
 		  win_cur_dir_1(Config, Handle)
 	  end,
@@ -843,10 +840,7 @@ file_info_basic_directory(Config, Handle) ->
 		  ?line test_directory("c:/", read_write, Handle),
 		  ?line test_directory("c:\\", read_write, Handle);
 	      {unix, _} ->
-		  ?line test_directory("/", read, Handle);
-	      vxworks ->
-		  %% Check is just done for owner
-		  ?line test_directory("/", read_write, Handle)
+		  ?line test_directory("/", read, Handle)
 	  end,
     ?line test_server:timetrap_cancel(Dog).
 
@@ -1508,9 +1502,7 @@ e_delete(Config) when is_list(Config) ->
 			   Base, #file_info {mode=8#600});
 	      {win32, _} ->
 		  %% Remove a character device.
-		  ?line {error, eacces} = ?PRIM_FILE:delete("nul");
-	      vxworks ->
-		  ok
+		  ?line {error, eacces} = ?PRIM_FILE:delete("nul")
 	  end,
 
     ?line test_server:timetrap_cancel(Dog),
@@ -1524,110 +1516,105 @@ e_delete(Config) when is_list(Config) ->
 e_rename(suite) -> [];
 e_rename(doc) -> [];
 e_rename(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "Windriver: dosFs must be fixed first!"};
-	_ ->
-	    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-	    ?line RootDir = ?config(priv_dir, Config),
-	    ?line Base = filename:join(RootDir,
-				       atom_to_list(?MODULE)++"_e_rename"),
-	    ?line ok = ?PRIM_FILE:make_dir(Base),
-	
-	    %% Create an empty directory.
-	    ?line EmptyDir = filename:join(Base, "empty_dir"),
-	    ?line ok = ?PRIM_FILE:make_dir(EmptyDir),
-
-	    %% Create a non-empty directory.
-	    ?line NonEmptyDir = filename:join(Base, "non_empty_dir"),
-	    ?line ok = ?PRIM_FILE:make_dir(NonEmptyDir),
-	    ?line ok = ?PRIM_FILE:write_file(
-			  filename:join(NonEmptyDir, "a_file"),
-			  "hello\n"),
-
-	    %% Create another non-empty directory.
-	    ?line ADirectory = filename:join(Base, "a_directory"),
-	    ?line ok = ?PRIM_FILE:make_dir(ADirectory),
-	    ?line ok = ?PRIM_FILE:write_file(
-			  filename:join(ADirectory, "a_file"),
-			  "howdy\n\n"),
+    ?line Dog = test_server:timetrap(test_server:seconds(10)),
+    ?line RootDir = ?config(priv_dir, Config),
+    ?line Base = filename:join(RootDir,
+	atom_to_list(?MODULE)++"_e_rename"),
+    ?line ok = ?PRIM_FILE:make_dir(Base),
 
-	    %% Create a data file.
-	    ?line File = filename:join(Base, "just_a_file"),
-	    ?line ok = ?PRIM_FILE:write_file(File, "anything goes\n\n"),
-	
-	    %% Move an existing directory to a non-empty directory.
-	    ?line {error, eexist} = 
-		?PRIM_FILE:rename(ADirectory, NonEmptyDir),
-
-	    %% Move a root directory.
-	    ?line {error, einval} = ?PRIM_FILE:rename("/", "arne"),
-
-	    %% Move Base into Base/new_name.
-	    ?line {error, einval} = 
-		?PRIM_FILE:rename(Base, filename:join(Base, "new_name")),
-
-	    %% Overwrite a directory with a file.
-	    ?line expect({error, eexist}, % FreeBSD (?)
-			 {error, eisdir},
-			 ?PRIM_FILE:rename(File, EmptyDir)),
-	    ?line expect({error, eexist}, % FreeBSD (?)
-			 {error, eisdir},
-			 ?PRIM_FILE:rename(File, NonEmptyDir)),
-
-	    %% Move a non-existing file.
-	    ?line NonExistingFile = filename:join(
-				      Base, "non_existing_file"),
-	    ?line {error, enoent} = 
-		?PRIM_FILE:rename(NonExistingFile, NonEmptyDir),
-
-	    %% Overwrite a file with a directory.
-	    ?line expect({error, eexist}, % FreeBSD (?)
-			 {error, enotdir},
-			 ?PRIM_FILE:rename(ADirectory, File)),
-
-	    %% Move a file to another filesystem.
-	    %% XXX - This test case is bogus. We cannot be guaranteed that
-	    %%       the source and destination are on 
-	    %%       different filesystems.
-	    %%
-	    %% XXX - Gross hack!
-	    ?line Comment = 
-		case os:type() of
-		    {unix, _} ->
-			OtherFs = "/tmp",
-			?line NameOnOtherFs =
-			    filename:join(OtherFs, 
-					  filename:basename(File)),
-			?line {ok, Com} = 
-			    case ?PRIM_FILE:rename(
-				    File, NameOnOtherFs) of
-				{error, exdev} ->
-				    %% The file could be in 
-				    %% the same filesystem!
-				    {ok, ok};
-				ok ->
-				    {ok, {comment, 
-					  "Moving between filesystems "
-					  "suceeded, files are probably "
-					  "in the same filesystem!"}};
-				{error, eperm} ->
-				    {ok, {comment, "SBS! You don't "
-					  "have the permission to do "
-					  "this test!"}};
-				Else ->
-				    Else
-			    end,
-			Com;
-		    {win32, _} ->
-			%% At least Windows NT can 
-			%% successfully move a file to
-			%% another drive.
-			ok
-		end,
-	    ?line test_server:timetrap_cancel(Dog),
-	    Comment
-    end.
+    %% Create an empty directory.
+    ?line EmptyDir = filename:join(Base, "empty_dir"),
+    ?line ok = ?PRIM_FILE:make_dir(EmptyDir),
+
+    %% Create a non-empty directory.
+    ?line NonEmptyDir = filename:join(Base, "non_empty_dir"),
+    ?line ok = ?PRIM_FILE:make_dir(NonEmptyDir),
+    ?line ok = ?PRIM_FILE:write_file(
+	filename:join(NonEmptyDir, "a_file"),
+	"hello\n"),
+
+    %% Create another non-empty directory.
+    ?line ADirectory = filename:join(Base, "a_directory"),
+    ?line ok = ?PRIM_FILE:make_dir(ADirectory),
+    ?line ok = ?PRIM_FILE:write_file(
+	filename:join(ADirectory, "a_file"),
+	"howdy\n\n"),
+
+    %% Create a data file.
+    ?line File = filename:join(Base, "just_a_file"),
+    ?line ok = ?PRIM_FILE:write_file(File, "anything goes\n\n"),
+
+    %% Move an existing directory to a non-empty directory.
+    ?line {error, eexist} = 
+    ?PRIM_FILE:rename(ADirectory, NonEmptyDir),
+
+    %% Move a root directory.
+    ?line {error, einval} = ?PRIM_FILE:rename("/", "arne"),
+
+    %% Move Base into Base/new_name.
+    ?line {error, einval} = 
+    ?PRIM_FILE:rename(Base, filename:join(Base, "new_name")),
+
+    %% Overwrite a directory with a file.
+    ?line expect({error, eexist}, % FreeBSD (?)
+	{error, eisdir},
+	?PRIM_FILE:rename(File, EmptyDir)),
+    ?line expect({error, eexist}, % FreeBSD (?)
+	{error, eisdir},
+	?PRIM_FILE:rename(File, NonEmptyDir)),
+
+    %% Move a non-existing file.
+    ?line NonExistingFile = filename:join(
+	Base, "non_existing_file"),
+    ?line {error, enoent} = 
+    ?PRIM_FILE:rename(NonExistingFile, NonEmptyDir),
+
+    %% Overwrite a file with a directory.
+    ?line expect({error, eexist}, % FreeBSD (?)
+	{error, enotdir},
+	?PRIM_FILE:rename(ADirectory, File)),
+
+    %% Move a file to another filesystem.
+    %% XXX - This test case is bogus. We cannot be guaranteed that
+    %%       the source and destination are on 
+    %%       different filesystems.
+    %%
+    %% XXX - Gross hack!
+    ?line Comment = 
+    case os:type() of
+	{unix, _} ->
+	    OtherFs = "/tmp",
+	    ?line NameOnOtherFs =
+	    filename:join(OtherFs, 
+		filename:basename(File)),
+	    ?line {ok, Com} = 
+	    case ?PRIM_FILE:rename(
+		    File, NameOnOtherFs) of
+		{error, exdev} ->
+		    %% The file could be in 
+		    %% the same filesystem!
+		    {ok, ok};
+		ok ->
+		    {ok, {comment, 
+			    "Moving between filesystems "
+			    "suceeded, files are probably "
+			    "in the same filesystem!"}};
+		{error, eperm} ->
+		    {ok, {comment, "SBS! You don't "
+			    "have the permission to do "
+			    "this test!"}};
+		Else ->
+		    Else
+	    end,
+	    Com;
+	{win32, _} ->
+	    %% At least Windows NT can 
+	    %% successfully move a file to
+	    %% another drive.
+	    ok
+    end,
+    ?line test_server:timetrap_cancel(Dog),
+    Comment.
 
 e_make_dir(suite) -> [];
 e_make_dir(doc) -> [];
@@ -1660,8 +1647,6 @@ e_make_dir(Config) when is_list(Config) ->
 	    ?line 
 		?PRIM_FILE:write_file_info(Base, #file_info {mode=8#600});
 	{win32, _} ->
-	    ok;
-	vxworks ->
 	    ok
     end,
     ?line test_server:timetrap_cancel(Dog),
@@ -1716,8 +1701,6 @@ e_del_dir(Config) when is_list(Config) ->
 	    ?line ?PRIM_FILE:write_file_info(
 		     Base, #file_info {mode=8#600});
 	{win32, _} ->
-	    ok;
-	vxworks ->
 	    ok
     end,
     ?line test_server:timetrap_cancel(Dog),
diff --git a/lib/megaco/configure.in b/lib/megaco/configure.in
index 42c50b8961..722ccc3fb4 100644
--- a/lib/megaco/configure.in
+++ b/lib/megaco/configure.in
@@ -145,7 +145,7 @@ AC_ARG_ENABLE(megaco_flex_scanner_lineno,
 AC_SUBST(ENABLE_MEGACO_FLEX_SCANNER_LINENO)
 
 
-dnl This is the os flavour, should be unix, vxworks or win32
+dnl This is the os flavour, should be unix or win32
 if test "X$host" = "Xwin32"; then
 	ERLANG_OSTYPE=win32
 else
diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
index 976ecaa4f7..cb1d7d2a5c 100644
--- a/lib/megaco/src/flex/Makefile.in
+++ b/lib/megaco/src/flex/Makefile.in
@@ -104,10 +104,6 @@ ENABLE_MEGACO_FLEX_SCANNER_LINENO = @ENABLE_MEGACO_FLEX_SCANNER_LINENO@
 endif
 endif
 
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-        DED_INCLUDES += -I$(ERL_TOP)/erts/etc/vxworks
-endif
-
 PRIVDIR = ../../priv
 LIBDIR  = $(PRIVDIR)/lib/$(TARGET)
 OBJDIR  = $(PRIVDIR)/obj/$(TARGET)
@@ -146,15 +142,10 @@ ifeq ($(findstring win32,$(TARGET)), win32)
 FLEX_SCANNER_SO = 
 SOLIBS = $(FLEX_SCANNER_SO)
 else
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-FLEX_SCANNER_SO = 
-SOLIBS = $(FLEX_SCANNER_SO)
-else
 FLEX_SCANNER_SO = $(LIBDIR)/$(STD_DRV).$(DED_EXT) 
 FLEX_SCANNER_MT_SO = $(LIBDIR)/$(MT_DRV).$(DED_EXT) 
 SOLIBS = $(FLEX_SCANNER_SO) $(FLEX_SCANNER_MT_SO) 
 endif
-endif
 
 
 # ----------------------------------------------------
diff --git a/lib/megaco/src/rules.mk b/lib/megaco/src/rules.mk
index 20fbed2a76..a59060032d 100644
--- a/lib/megaco/src/rules.mk
+++ b/lib/megaco/src/rules.mk
@@ -29,10 +29,6 @@ PERL   = perl
 #	Erlang language section
 # ----------------------------------------------------
 EMULATOR = beam
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-# VxWorks jam object files should be compressed
-ERL_COMPILE_FLAGS += +compressed
-endif
 ERLC_WFLAGS = -W
 ERLC = erlc $(ERLC_WFLAGS) $(ERLC_FLAGS)
 ERL.beam =  erl.beam -boot start_clean
diff --git a/lib/megaco/test/megaco.spec.vxworks b/lib/megaco/test/megaco.spec.vxworks
deleted file mode 100644
index 2ac250e443..0000000000
--- a/lib/megaco/test/megaco.spec.vxworks
+++ /dev/null
@@ -1,5 +0,0 @@
-{topcase, {dir, "../megaco_test"}}.
-{require_nodenames, 1}.
-{skip, {megaco_digit_map_test, all, "Not yet implemented"}}.
-{skip, {megaco_measure_test, all, "Not yet implemented"}}.
-%{skip, {M, F, "Not yet implemented"}}.
diff --git a/lib/mnesia/test/mnesia.spec.vxworks b/lib/mnesia/test/mnesia.spec.vxworks
deleted file mode 100644
index 11c01ea3fe..0000000000
--- a/lib/mnesia/test/mnesia.spec.vxworks
+++ /dev/null
@@ -1,362 +0,0 @@
-{topcase, {dir, "../mnesia_test"}}.
-{require_nodenames, 3}.
-{diskless, true}.
-{skip, {mnesia_measure_test, all, "Too heavy"}}.
-%{mnesia_install_test, silly_durability} 'IMPL'
-%{mnesia_install_test, silly_move} 'IMPL'
-{skip, {mnesia_install_test, silly_upgrade, "Uses disk"}}.
-%{mnesia_install_test, conflict} 'IMPL'
-%{mnesia_install_test, dist} 'IMPL'
-{skip, {mnesia_examples_test, all, "Uses disk"}}.
-{skip, {mnesia_nice_coverage_test, all, "Uses disk"}}.
-
-%{mnesia_evil_coverage_test, system_info} 'IMPL'
-%{mnesia_evil_coverage_test, table_info} 'IMPL'
-%{mnesia_evil_coverage_test, error_description} 'IMPL'
-{skip, {mnesia_evil_coverage_test, db_node_lifecycle, "Uses disk"}}.
-{skip, {mnesia_evil_coverage_test, local_content, "Uses disk"}}.
-%{mnesia_evil_coverage_test, start_and_stop} 'IMPL'
-%{mnesia_evil_coverage_test, transaction} 'IMPL'
-{skip, {mnesia_evil_coverage_test, checkpoint, "Uses disk"}}.
-{skip, {mnesia_evil_backup, backup, "Uses disk"}}.
-{skip, {mnesia_evil_backup, global_backup_checkpoint, "Uses disk"}}.
-{skip, {mnesia_evil_backup, incremental_backup_checkpoint, "Uses disk"}}.
-{skip, {mnesia_evil_backup, local_backup_checkpoint, "Uses disk"}}.
-{skip, {mnesia_evil_backup, selective_backup_checkpoint, "Uses disk"}}.
-{skip, {mnesia_evil_backup, restore_errors, "Uses disk"}}.
-{skip, {mnesia_evil_backup, restore_clear, "Uses disk"}}.
-{skip, {mnesia_evil_backup, restore_keep, "Uses disk"}}.
-{skip, {mnesia_evil_backup, restore_recreate, "Uses disk"}}.
-{skip, {mnesia_evil_backup, traverse_backup, "Uses disk"}}.
-{skip, {mnesia_evil_backup, install_fallback, "Uses disk"}}.
-{skip, {mnesia_evil_backup, uninstall_fallback, "Uses disk"}}.
-{skip, {mnesia_evil_backup, local_fallback, "Uses disk"}}.
-%{mnesia_evil_coverage_test, table_lifecycle} 'IMPL'
-{skip, {mnesia_evil_coverage_test, replica_management, "Uses disk"}}.
-%{mnesia_evil_coverage_test, change_table_access_mode} 'IMPL'
-%{mnesia_evil_coverage_test, change_table_load_order} 'IMPL'
-{skip, {mnesia_evil_coverage_test, set_master_nodes, "Uses disk"}}.
-{skip, {mnesia_evil_coverage_test, offline_set_master_nodes, "Uses disk"}}.
-{skip, {mnesia_evil_coverage_test, replica_location, "Uses disk"}}.
-%{mnesia_evil_coverage_test, add_table_index_ram} 'IMPL'
-{skip, {mnesia_trans_access_test, add_table_index_disc, "Uses disc"}}.
-{skip, {mnesia_trans_access_test, add_table_index_disc_only, "Uses disc"}}.
-%{mnesia_evil_coverage_test, create_live_table_index_ram} 'IMPL'
-{skip, {mnesia_trans_access_test, create_live_table_index_disc, "Uses disc"}}.
-{skip, {mnesia_trans_access_test, create_live_table_index_disc_only, "Uses disc"}}.
-%{mnesia_evil_coverage_test, del_table_index_ram} 'IMPL'
-{skip, {mnesia_trans_access_test, del_table_index_disc, "Uses disc"}}.
-{skip, {mnesia_trans_access_test, del_table_index_disc_only, "Uses disc"}}.
-{skip, {mnesia_trans_access_test, idx_schema_changes_ram, "Uses disk"}}.
-{skip, {mnesia_trans_access_test, idx_schema_changes_disc, "Uses disc"}}.
-{skip, {mnesia_trans_access_test, idx_schema_changes_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_write_ram} 'IMPL'
-
-{skip, {mnesia_dirty_access_test, dirty_write_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_write_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_read_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_read_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_read_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_update_counter_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_update_counter_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_update_counter_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_delete_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_delete_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_delete_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_delete_object_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_delete_object_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_delete_object_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_match_object_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_match_object_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_match_object_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_index_match_object_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_index_match_object_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_index_match_object_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_index_read_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_index_read_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_index_read_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_index_update_set_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_index_update_set_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_index_update_set_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_index_update_bag_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_index_update_bag_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_index_update_bag_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_iter_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_iter_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_iter_disc_only, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, admin_tests, "Uses disk"}}.
-
-%{mnesia_trans_access_test, write} 'IMPL'
-%{mnesia_trans_access_test, read} 'IMPL'
-%{mnesia_trans_access_test, wread} 'IMPL'
-%{mnesia_trans_access_test, delete} 'IMPL'
-%{mnesia_trans_access_test, delete_object} 'IMPL'
-%{mnesia_trans_access_test, match_object} 'IMPL'
-%{mnesia_trans_access_test, all_keys} 'IMPL'
-%{mnesia_trans_access_test, index_match_object} 'IMPL'
-%{mnesia_trans_access_test, index_read} 'IMPL'
-%{mnesia_trans_access_test, index_update_set} 'IMPL'
-%{mnesia_trans_access_test, index_update_bag} 'IMPL'
-{skip, {mnesia_evil_coverage_test, dump_tables, "Uses disk"}}.
-{skip, {mnesia_evil_coverage_test, dump_log, "Uses disk"}}.
-%{mnesia_evil_coverage_test, wait_for_tables} 'IMPL'
-{skip, {mnesia_evil_coverage_test, force_load_table, "Uses disk"}}.
-%{mnesia_evil_coverage_test, user_properties} 'IMPL'
-%{mnesia_evil_coverage_test, record_name_dirty_access_ram} 'IMPL'
-{skip, {mnesia_evil_coverage_test, record_name_dirty_access_disc, "Uses disc"}}.
-{skip, {mnesia_evil_coverage_test, record_name_dirty_access_disc_only, "Uses disc"}}.
-%{mnesia_evil_coverage_test, snmp_open_table} 'IMPL'
-%{mnesia_evil_coverage_test, snmp_close_table} 'IMPL'
-%{mnesia_evil_coverage_test, snmp_get_next_index} 'IMPL'
-%{mnesia_evil_coverage_test, snmp_get_row} 'IMPL'
-%{mnesia_evil_coverage_test, snmp_get_mnesia_key} 'IMPL'
-%{mnesia_evil_coverage_test, snmp_update_counter} 'IMPL'
-%{mnesia_evil_coverage_test, info} 'IMPL'
-%{mnesia_evil_coverage_test, schema_0} 'IMPL'
-%{mnesia_evil_coverage_test, schema_1} 'IMPL'
-%{mnesia_evil_coverage_test, view_0} 'IMPL'
-{skip, {mnesia_evil_coverage_test, view_1, "Uses disk"}}.
-{skip, {mnesia_evil_coverage_test, view_2, "Uses disk"}}.
-%{mnesia_evil_coverage_test, lkill} 'IMPL'
-%{mnesia_evil_coverage_test, kill} 'IMPL'
-
-%{mnesia_config_test, access_module} 'IMPL'
-%{mnesia_config_test, auto_repair} 'IMPL'
-{skip, {mnesia_config_test, backup_module, "Uses disk"}}.
-{skip, {mnesia_config_test, dynamic_connect, "Uses disk"}}.
-%{mnesia_config_test, debug} 'IMPL'
-%{mnesia_config_test, dir} 'IMPL'
-{skip, {mnesia_config_test, dump_log_load_regulation, "Uses disk"}}.
-{skip, {mnesia_config_test, dump_log_time_threshold, "Uses disk"}}.
-{skip, {mnesia_config_test, dump_log_write_threshold, "Uses disk"}}.
-{skip, {mnesia_config_test, dump_log_update_in_place, "Uses disk"}}.
-{skip, {mnesia_config_test, embedded_mnemosyne, "Uses Mnemosyne"}}.
-%{mnesia_config_test, event_module} 'IMPL'
-{skip, {mnesia_config_test, ignore_fallback_at_startup, "Not Yet impl"}}.
-%{mnesia_config_test, inconsistent_database} 'IMPL'
-{skip, {mnesia_config_test, max_wait_for_decision, "Not Yet impl"}}.
-{skip, {mnesia_config_test, start_one_disc_full_then_one_disc_less, "Uses disc"}}.
-{skip, {mnesia_config_test, start_first_one_disc_less_then_one_disc_full, "Uses disc"}}.
-%%{skip, {mnesia_config_test, start_first_one_disc_less_then_two_more_disc_less, "Uses disc"}}.
-{skip, {mnesia_config_test, schema_location_and_extra_db_nodes_combinations, "Uses disk"}}.
-{skip, {mnesia_config_test, table_load_to_disc_less_nodes, "Uses disc"}}.
-{skip, {mnesia_config_test, schema_merge, "Uses Disc"}}.
-%{mnesia_config_test, unknown_config} 'IMPL'
-%{mnesia_registry_test, good_dump} 'IMPL'
-%{mnesia_registry_test, bad_dump} 'IMPL'
-
-%{mnesia_atomicity_test, explicit_abort_in_middle_of_trans} 'IMPL'
-%{mnesia_atomicity_test, runtime_error_in_middle_of_trans} 'IMPL'
-%{mnesia_atomicity_test, kill_self_in_middle_of_trans} 'IMPL'
-%{mnesia_atomicity_test, throw_in_middle_of_trans} 'IMPL'
-%{mnesia_atomicity_test, mnesia_down_during_infinite_trans} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_sw_rt} 'IMPL' 
-%{mnesia_atomicity_test, lock_waiter_sw_wt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wr_r} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_sw_sw} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_sw_w} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_sw_wr} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wr_wt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wr_sw} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wr_w} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_r_sw} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_r_w} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_r_wt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_rt_sw} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_rt_w} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_rt_wt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wt_r} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wt_w} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wt_rt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wt_wt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wt_wr} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wt_sw} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_w_wr} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_w_sw} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_w_r} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_w_w} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_w_rt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_w_wt} 'IMPL'
-%{mnesia_atomicity_test, restart_r_one} 'IMPL'
-%{mnesia_atomicity_test, restart_w_one} 'IMPL'
-%{mnesia_atomicity_test, restart_rt_one} 'IMPL'
-%{mnesia_atomicity_test, restart_wt_one} 'IMPL'
-%{mnesia_atomicity_test, restart_wr_one} 'IMPL'
-%{mnesia_atomicity_test, restart_sw_one} 'IMPL'
-%{mnesia_atomicity_test, restart_r_two} 'IMPL'
-%{mnesia_atomicity_test, restart_w_two} 'IMPL'
-%{mnesia_atomicity_test, restart_rt_two} 'IMPL'
-%{mnesia_atomicity_test, restart_wt_two} 'IMPL'
-%{mnesia_atomicity_test, restart_wr_two} 'IMPL'
-%{mnesia_atomicity_test, restart_sw_two} 'IMPL'
-
-%{mnesia_isolation_test, no_conflict} 'IMPL'
-%{mnesia_isolation_test, simple_queue_conflict} 'IMPL'
-%{mnesia_isolation_test, advanced_queue_conflict} 'IMPL'
-%{mnesia_isolation_test, simple_deadlock_conflict} 'IMPL'
-%{mnesia_isolation_test, advanced_deadlock_conflict} 'IMPL'
-%{mnesia_isolation_test, lock_burst} 'IMPL'
-%{mnesia_isolation_test, basic_sticky_functionality} 'IMPL'
-%{mnesia_isolation_test, create_table} 'IMPL'
-%{mnesia_isolation_test, delete_table} 'IMPL'
-%{mnesia_isolation_test, move_table_copy} 'IMPL'
-%{mnesia_isolation_test, add_table_index} 'IMPL'
-%{mnesia_isolation_test, del_table_index} 'IMPL'
-%{mnesia_isolation_test, transform_table} 'IMPL'
-%{mnesia_isolation_test, snmp_open_table} 'IMPL'
-%{mnesia_isolation_test, snmp_close_table} 'IMPL'
-{skip, {mnesia_isolation_test, change_table_copy_type, "Uses disk"}}.
-%{mnesia_isolation_test, change_table_access} 'IMPL'
-%{mnesia_isolation_test, add_table_copy} 'IMPL'
-%{mnesia_isolation_test, del_table_copy} 'IMPL'
-{skip, {mnesia_isolation_test, dump_tables, "Uses disk"}}.
-{skip, {mnesia_isolation_test, extra_admin_tests, "Uses disk"}}.
-%{mnesia_isolation_test, del_table_copy_1} 'IMPL'
-%{mnesia_isolation_test, del_table_copy_2} 'IMPL'
-%{mnesia_isolation_test, del_table_copy_3} 'IMPL'
-%{mnesia_isolation_test, add_table_copy_1} 'IMPL'
-%{mnesia_isolation_test, add_table_copy_2} 'IMPL'
-%{mnesia_isolation_test, add_table_copy_3} 'IMPL'
-%{mnesia_isolation_test, add_table_copy_4} 'IMPL'
-%{mnesia_isolation_test, move_table_copy_1} 'IMPL'
-%{mnesia_isolation_test, move_table_copy_2} 'IMPL'
-%{mnesia_isolation_test, move_table_copy_3} 'IMPL'
-%{mnesia_isolation_test, move_table_copy_4} 'IMPL'
-%{mnesia_isolation_test, dirty_updates_visible_direct} 'IMPL'
-%{mnesia_isolation_test, dirty_reads_regardless_of_trans} 'IMPL'
-%{mnesia_isolation_test, trans_update_invisibible_outside_trans} 'IMPL'
-%{mnesia_isolation_test, trans_update_visible_inside_trans} 'IMPL'
-%{mnesia_isolation_test, write_shadows} 'IMPL'
-%{mnesia_isolation_test, delete_shadows} 'IMPL'
-%{mnesia_isolation_test, write_delete_shadows_bag} 'IMPL'
-
-{skip, {mnesia_durability_test, all, "Uses disk "}}.
-%{mnesia_durability_test, load_local_contents_directly} 'IMPL'
-%{mnesia_durability_test, load_directly_when_all_are_ram_copiesA} 'IMPL'
-%{mnesia_durability_test, load_directly_when_all_are_ram_copiesB} 'IMPL'
-%{skip, {mnesia_durability_test, late_load_when_all_are_ram_copies_on_ram_nodes1, "Uses disk schema"}}.
-%{skip, {mnesia_durability_test, late_load_when_all_are_ram_copies_on_ram_nodes2, "Uses disk schema"}}.
-%{skip, {mnesia_durability_test, load_when_last_replica_becomes_available, "Uses disk"}}.
-%{skip, {mnesia_durability_test, load_when_we_have_down_from_all_other_replica_nodes, "Uses disk"}}.
-%{skip, {mnesia_durability_test, late_load_transforms_into_disc_load, "Uses disc"}}.
-%{mnesia_durability_test, late_load_leads_to_hanging} 'IMPL'
-%{mnesia_durability_test, force_load_when_nobody_intents_to_load} 'IMPL'
-%{mnesia_durability_test, force_load_when_someone_has_decided_to_load} 'IMPL'
-%{mnesia_durability_test, force_load_when_someone_else_already_has_loaded} 'IMPL'
-%{mnesia_durability_test, force_load_when_we_has_loaded} 'IMPL'
-%{mnesia_durability_test, force_load_on_a_non_local_table} 'IMPL'
-%{mnesia_durability_test, force_load_when_the_table_does_not_exist} 'IMPL'
-%{mnesia_durability_test, master_nodes} 'IMPL'
-%{mnesia_durability_test, master_on_non_local_tables} 'IMPL'
-%{mnesia_durability_test, remote_force_load_with_local_master_node} 'IMPL'
-%{mnesia_durability_test, dump_ram_copies} 'IMPL'
-%{skip, {mnesia_durability_test, dump_disc_copies, "Uses disc"}}.
-%{skip, {mnesia_durability_test, dump_disc_only, "Uses disc"}}.
-%{skip, {mnesia_durability_test, durability_of_disc_copies, "Uses disc"}}.
-%{skip, {mnesia_durability_test, durability_of_disc_only_copies, "Uses disc"}}.
-
-{skip, {mnesia_recovery_test, mnesia_down, "Uses Disk"}}.
-%{mnesia_recovery_test, no_master_2} 'IMPL'
-%{mnesia_recovery_test, no_master_3} 'IMPL'
-%{mnesia_recovery_test, one_master_2} 'IMPL'
-%{mnesia_recovery_test, one_master_3} 'IMPL'
-%{mnesia_recovery_test, two_master_2} 'IMPL'
-%{mnesia_recovery_test, two_master_3} 'IMPL'
-%{mnesia_recovery_test, all_master_2} 'IMPL'
-%{mnesia_recovery_test, all_master_3} 'IMPL'
-{skip, {mnesia_recovery_test, mnesia_down_during_startup_disk_ram, "Uses disk"}}.
-%{mnesia_recovery_test, mnesia_down_during_startup_init_ram} 'IMPL'
-{skip, {mnesia_recovery_test, mnesia_down_during_startup_init_disc, "Uses disc"}}.
-{skip, {mnesia_recovery_test, mnesia_down_during_startup_init_disc_only, "Uses disc"}}.
-%{mnesia_recovery_test, mnesia_down_during_startup_tm_ram} 'IMPL'
-{skip, {mnesia_recovery_test, mnesia_down_during_startup_tm_disc, "Uses disc"}}.
-{skip, {mnesia_recovery_test, mnesia_down_during_startup_tm_disc_only, "Uses disc"}}.
-%{mnesia_recovery_test, explicit_stop_during_snmp} 'IMPL'
-
-{skip, {mnesia_recovery_test, schema_trans, "Uses Disk, needs disk log"}}.
-{skip, {mnesia_recovery_test, async_dirty, "Uses disc"}}.
-{skip, {mnesia_recovery_test, sync_dirty, "Uses disc"}}.
-{skip, {mnesia_recovery_test, sym_trans, "Uses disc"}}.
-{skip, {mnesia_recovery_test, asym_trans, "Uses disc"}}.
-
-{skip, {mnesia_recovery_test, after_full_disc_partition, "Not Yet impl"}}.
-{skip, {mnesia_recovery_test, after_corrupt_files, "Uses disk"}}.
-
-%{mnesia_evil_coverage_test, subscriptions} 'IMPL'
-%{mnesia_evil_coverage_test, nested_trans_both_ok} 'IMPL'
-%{mnesia_evil_coverage_test, nested_trans_child_dies} 'IMPL'
-%{mnesia_evil_coverage_test, nested_trans_parent_dies} 'IMPL'
-%{mnesia_evil_coverage_test, nested_trans_both_dies} 'IMPL'
-%{mnesia_evil_coverage_test, mix_of_trans_sync_dirty} 'IMPL'
-%{mnesia_evil_coverage_test, mix_of_trans_async_dirty} 'IMPL'
-%{mnesia_evil_coverage_test, mix_of_trans_ets} 'IMPL'
-
-{skip, {mnesia_recovery_test, disc_less, "Uses disc (on the other nodes)"}}.
-{skip, {mnesia_recovery_test, system_upgrade, "Not Yet impl"}}.
-%{mnesia_consistency_test, consistency_after_restart_1_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_restart_1_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_restart_1_disc_only, "Uses disc"}}.
-%{mnesia_consistency_test, consistency_after_restart_2_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_restart_2_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_restart_2_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_dump_tables_1_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, consistency_after_dump_tables_2_ram, "Uses disk"}}.
-%{mnesia_consistency_test, consistency_after_add_replica_2_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_add_replica_2_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_add_replica_2_disc_only, "Uses disc"}}.
-%{mnesia_consistency_test, consistency_after_add_replica_3_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_add_replica_3_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_add_replica_3_disc_only, "Uses disc"}}.
-%{mnesia_consistency_test, consistency_after_del_replica_2_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_del_replica_2_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_del_replica_2_disc_only, "Uses disc"}}.
-%{mnesia_consistency_test, consistency_after_del_replica_3_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_del_replica_3_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_del_replica_3_disc_only, "Uses disc"}}.
-%{mnesia_consistency_test, consistency_after_move_replica_2_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_move_replica_2_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_move_replica_2_disc_only, "Uses disc"}}.
-%{mnesia_consistency_test, consistency_after_move_replica_3_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_move_replica_3_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_move_replica_3_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_transform_table, "Not yet implemented"}}.
-{skip, {mnesia_consistency_test, consistency_after_change_table_copy_type, "Not yet implemented"}}.
-{skip, {mnesia_consistency_test, consistency_after_fallback_2_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, consistency_after_fallback_2_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_fallback_2_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_fallback_3_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, consistency_after_fallback_3_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_fallback_3_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_restore_clear_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, consistency_after_restore_clear_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_restore_clear_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_restore_recreate_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, consistency_after_restore_recreate_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_restore_recreate_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_rename_of_node, "Not yet implemented"}}.
-{skip, {mnesia_consistency_test, updates_during_checkpoint_activation, "Uses disk"}}.
-%{skip, {mnesia_consistency_test, updates_during_checkpoint_activation_2_disc, "Uses disc"}}.
-%{skip, {mnesia_consistency_test, updates_during_checkpoint_activation_2_disc_only, "Uses disc"}}.
-%%{mnesia_consistency_test, updates_during_checkpoint_activation_3_ram} 'IMPL'
-%{skip, {mnesia_consistency_test, updates_during_checkpoint_activation_3_disc, "Uses disc"}}.
-%{skip, {mnesia_consistency_test, updates_during_checkpoint_activation_3_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, updates_during_checkpoint_iteration, "Uses disk"}}.
-%{skip, {mnesia_consistency_test, updates_during_checkpoint_iteration_2_disc, "Uses disc"}}.
-%{skip, {mnesia_consistency_test, updates_during_checkpoint_iteration_2_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, load_table_with_activated_checkpoint_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, load_table_with_activated_checkpoint_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, load_table_with_activated_checkpoint_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, add_table_copy_to_table_with_activated_checkpoint_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, add_table_copy_to_table_with_activated_checkpoint_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, add_table_copy_to_table_with_activated_checkpoint_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, inst_fallback_process_dies, "Uses disk"}}.
-{skip, {mnesia_consistency_test, fatal_when_inconsistency, "Uses disk"}}.
-{skip, {mnesia_consistency_test, after_delete, "Uses disk"}}.
-{skip, {mnesia_consistency_test, mnesia_down_during_backup_causes_switch, "Uses disk"}}.
-{skip, {mnesia_consistency_test, mnesia_down_during_backup_causes_abort, "Uses disk"}}.
-%{mnesia_consistency_test, cause_switch_after} 'IMPL'
-%{mnesia_consistency_test, cause_abort_before} 'IMPL'
-%{mnesia_consistency_test, cause_abort_after} 'IMPL'
-%{mnesia_consistency_test, change_schema_before} 'IMPL'
-%{mnesia_consistency_test, change_schema_after} 'IMPL'
-
diff --git a/lib/mnesia/test/mnesia_test_lib.erl b/lib/mnesia/test/mnesia_test_lib.erl
index ba5bf84e24..57cbc61495 100644
--- a/lib/mnesia/test/mnesia_test_lib.erl
+++ b/lib/mnesia/test/mnesia_test_lib.erl
@@ -272,25 +272,13 @@ slave_start_link(Host, Name, Retries) ->
     end.
 
 starter(Host, Name, Args) ->
-    case os:type() of
-	vxworks ->
-	    X = test_server:start_node(Name, slave, [{args,Args}]),
-	    timer:sleep(5000),
-	    X;
-	_ ->
-	    slave:start(Host, Name, Args)
-    end.
+    slave:start(Host, Name, Args).
 
 slave_sup() ->
     process_flag(trap_exit, true),
     receive
 	{'EXIT', _, _} ->
-	    case os:type() of
-		vxworks ->
-		    erlang:halt();
-		_  ->
-		    ignore
-	    end
+	    ignore
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/orber/c_src/Makefile.in b/lib/orber/c_src/Makefile.in
index 5953d41ff3..4aee760189 100644
--- a/lib/orber/c_src/Makefile.in
+++ b/lib/orber/c_src/Makefile.in
@@ -58,15 +58,9 @@ ifeq ($(findstring win32,$(TARGET)),win32)
 orber: 
 	echo "Nothing to build on NT"
 else
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-orber: 
-	echo "Nothing to build for VxWorks"
-
-else
 orber: 
 	echo "Nothing to build"	
 endif
-endif
 
 clean:
 
@@ -94,20 +88,12 @@ release_spec: opt
 	$(INSTALL_PROGRAM) $(CC_FILES) "$(RELSYSDIR)/priv/src"
 	$(INSTALL_PROGRAM) $(HH_FILES) "$(RELSYSDIR)/priv/include"
 else
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-release_spec:
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/include"
-	$(INSTALL_PROGRAM) $(CC_FILES) "$(RELSYSDIR)/priv/src"
-	$(INSTALL_PROGRAM) $(HH_FILES) "$(RELSYSDIR)/priv/include"
-else
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/include"
 	$(INSTALL_DATA) $(CC_FILES) "$(RELSYSDIR)/priv/src"
 	$(INSTALL_DATA) $(HH_FILES) "$(RELSYSDIR)/priv/include"
 endif
-endif
 
 
 release_docs_spec:
diff --git a/lib/orber/test/csiv2_SUITE.erl b/lib/orber/test/csiv2_SUITE.erl
index 60ffa1eb09..b89bf0a56c 100644
--- a/lib/orber/test/csiv2_SUITE.erl
+++ b/lib/orber/test/csiv2_SUITE.erl
@@ -668,67 +668,57 @@ code_OpenSSL509_api(_Config) ->
 ssl_server_peercert_api(doc) -> ["Test ssl:peercert (server side)"];
 ssl_server_peercert_api(suite) -> [];
 ssl_server_peercert_api(_Config) ->
-    case os:type() of
-	vxworks ->
- 	    {skipped, "No SSL-support for VxWorks."};
-	_ ->
- 	    Options = orber_test_lib:get_options(iiop_ssl, server,
- 						 2, [{iiop_ssl_port, 0}]),
- 	    {ok, ServerNode, ServerHost} =
- 		?match({ok,_,_}, orber_test_lib:js_node(Options)),
- 	    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
- 	    SSLOptions = orber_test_lib:get_options(ssl, client),
-  	    {ok, Socket} =
- 		?match({ok, _}, fake_client_ORB(ssl, ServerHost, ServerPort, SSLOptions)),
- 	    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
-	    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
-	    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
-						%	    ?match({ok, #'Certificate'{}},
-						%		   'OrberCSIv2':decode('Certificate', PeerCert)),
- 	    destroy_fake_ORB(ssl, Socket),
- 	    ok
-    end.
+    Options = orber_test_lib:get_options(iiop_ssl, server,
+	2, [{iiop_ssl_port, 0}]),
+    {ok, ServerNode, ServerHost} =
+    ?match({ok,_,_}, orber_test_lib:js_node(Options)),
+    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
+    SSLOptions = orber_test_lib:get_options(ssl, client),
+    {ok, Socket} =
+    ?match({ok, _}, fake_client_ORB(ssl, ServerHost, ServerPort, SSLOptions)),
+    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
+    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
+    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
+    %	    ?match({ok, #'Certificate'{}},
+    %		   'OrberCSIv2':decode('Certificate', PeerCert)),
+    destroy_fake_ORB(ssl, Socket),
+    ok.
 
 ssl_client_peercert_api(doc) -> ["Test ssl:peercert (client side)"];
 ssl_client_peercert_api(suite) -> [];
 ssl_client_peercert_api(_Config) ->
-    case os:type() of
-	vxworks ->
- 	    {skipped, "No SSL-support for VxWorks."};
-	_ ->
- 	    Options = orber_test_lib:get_options(iiop_ssl, client,
- 						 2, [{iiop_ssl_port, 0}]),
- 	    {ok, ClientNode, _ClientHost} =
- 		?match({ok,_,_}, orber_test_lib:js_node(Options)),
- 	    crypto:start(),
- 	    ssl:start(),
- 	    SSLOptions = orber_test_lib:get_options(ssl, server),
- 	    {ok, LSock} = ?match({ok, _}, ssl:listen(0, SSLOptions)),
- 	    {ok, {_Address, LPort}} = ?match({ok, {_, _}}, ssl:sockname(LSock)),
- 	    IOR = ?match({'IOP_IOR',_,_},
- 			 iop_ior:create_external({1, 2}, "IDL:FAKE:1.0",
- 						 "localhost", 6004, "FAKE",
- 						 [#'IOP_TaggedComponent'
- 						  {tag=?TAG_SSL_SEC_TRANS,
- 						   component_data=#'SSLIOP_SSL'
- 						   {target_supports = 2,
- 						    target_requires = 2,
- 						    port = LPort}}])),
- 	    spawn(orber_test_lib, remote_apply,
- 		  [ClientNode, corba_object, non_existent, [IOR]]),
- 	    {ok, Socket} = ?match({ok, _}, ssl:transport_accept(LSock)),
- 	    ?match(ok, ssl:ssl_accept(Socket)),
-
- 	    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
-	    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
-	    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
-						%	    ?match({ok, #'Certificate'{}},
-						%		   'OrberCSIv2':decode('Certificate', PeerCert)),
- 	    ssl:close(Socket),
- 	    ssl:close(LSock),
- 	    ssl:stop(),
- 	    ok
-    end.
+    Options = orber_test_lib:get_options(iiop_ssl, client,
+	2, [{iiop_ssl_port, 0}]),
+    {ok, ClientNode, _ClientHost} =
+    ?match({ok,_,_}, orber_test_lib:js_node(Options)),
+    crypto:start(),
+    ssl:start(),
+    SSLOptions = orber_test_lib:get_options(ssl, server),
+    {ok, LSock} = ?match({ok, _}, ssl:listen(0, SSLOptions)),
+    {ok, {_Address, LPort}} = ?match({ok, {_, _}}, ssl:sockname(LSock)),
+    IOR = ?match({'IOP_IOR',_,_},
+	iop_ior:create_external({1, 2}, "IDL:FAKE:1.0",
+	    "localhost", 6004, "FAKE",
+	    [#'IOP_TaggedComponent'
+		{tag=?TAG_SSL_SEC_TRANS,
+		    component_data=#'SSLIOP_SSL'
+		    {target_supports = 2,
+			target_requires = 2,
+			port = LPort}}])),
+    spawn(orber_test_lib, remote_apply,
+	[ClientNode, corba_object, non_existent, [IOR]]),
+    {ok, Socket} = ?match({ok, _}, ssl:transport_accept(LSock)),
+    ?match(ok, ssl:ssl_accept(Socket)),
+
+    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
+    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
+    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
+    %	    ?match({ok, #'Certificate'{}},
+    %		   'OrberCSIv2':decode('Certificate', PeerCert)),
+    ssl:close(Socket),
+    ssl:close(LSock),
+    ssl:stop(),
+    ok.
 
 %%-----------------------------------------------------------------
 %% Local functions.
diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl
index 2bfa1ef871..00fd1e0625 100644
--- a/lib/orber/test/orber_test_lib.erl
+++ b/lib/orber/test/orber_test_lib.erl
@@ -278,24 +278,13 @@ check_options(Options) ->
     end.
 
 starter(Host, Name, Args) ->
-    case os:type() of
-        vxworks ->
-            test_server:start_node(Name, slave, [{args,Args}]);
-        _ ->
-	    io:format("slave:start_link(~p,~p,~p).~n",[Host,Name,Args]),
-            slave:start_link(Host, Name, Args)
-    end.
+    io:format("slave:start_link(~p,~p,~p).~n",[Host,Name,Args]),
+    slave:start_link(Host, Name, Args).
 
 slave_sup() ->
     process_flag(trap_exit, true),
     receive
-        {'EXIT', _, _} ->
-            case os:type() of
-                vxworks ->
-                    erlang:halt();
-                _  ->
-                    ignore
-            end
+        {'EXIT', _, _} -> ignore
     end.
 
 start_ssl(true, Node) ->
@@ -419,12 +408,7 @@ destroy_node(Node, Type) ->
     stopper(Node, Type).
 
 stopper(Node, _Type) ->
-    case os:type() of
-        vxworks ->
-            test_server:stop_node(Node);
-        _ ->
-            slave:stop(Node)
-    end.
+    slave:stop(Node).
 
 
 %%------------------------------------------------------------
diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
index 45dc01e993..adc14f0bb1 100644
--- a/lib/os_mon/c_src/Makefile.in
+++ b/lib/os_mon/c_src/Makefile.in
@@ -63,14 +63,10 @@ ENTRY_OBJ=$(ERL_TOP)/erts/obj/$(TARGET)/port_entry.o
 PORT_ENTRY_POINT=erl_port_entry
 ENTRY_LDFLAGS=-entry:$(PORT_ENTRY_POINT)
 else
-ifeq ($(findstring vxworks_simso,$(TARGET)),vxworks_simso)
-PROGRAMS =
-else
 PROGRAMS = \
 	memsup @os_mon_programs@
 C_FILES= $(PROGRAMS:%=%.c)
 endif
-endif
 
 TARGET_FILES= $(PROGRAMS:%=$(BINDIR)/%)
 
@@ -127,14 +123,10 @@ $(OBJDIR)/memsup.o: memsup.h
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifeq ($(findstring vxworks_simso,$(TARGET)),vxworks_simso)
-release_spec:
-else
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DATA) $(C_FILES) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
 	$(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin"
-endif
 
 release_docs_spec:
diff --git a/lib/os_mon/c_src/memsup.c b/lib/os_mon/c_src/memsup.c
index 078f20ff98..b1a001f9c5 100644
--- a/lib/os_mon/c_src/memsup.c
+++ b/lib/os_mon/c_src/memsup.c
@@ -31,7 +31,7 @@
  *
  *  This program is started from Erlang as follows,
  *
- *      Port = open_port({spawn, 'memsup'}, [{packet,1}]) for UNIX and VxWorks
+ *      Port = open_port({spawn, 'memsup'}, [{packet,1}]) for UNIX
  *
  *  Erlang sends one of the request condes defined in memsup.h and this program
  *  answers in one of two ways:
@@ -75,10 +75,6 @@
  *  that there is no process at the other end of the connection
  *  having the connection open for writing (end-of-file).
  *
- *  COMPILING
- *
- *  When the target is VxWorks the identifier VXWORKS must be defined for
- *  the preprocessor (usually by a -D option).
  */
 
 #if defined(sgi) || defined(__sgi) || defined(__sgi__)
@@ -90,9 +86,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#ifndef VXWORKS
 #include <unistd.h>
-#endif
 
 #if (defined(__unix__) || defined(unix)) && !defined(USG)
 #include <sys/param.h>
@@ -104,12 +98,6 @@
 #include <time.h>
 #include <errno.h>
 
-#ifdef VXWORKS
-#include <vxWorks.h>
-#include <ioLib.h>
-#include <memLib.h>
-#endif
-
 #ifdef BSD4_4
 #include <sys/types.h>
 #include <sys/sysctl.h>
@@ -143,20 +131,8 @@
 /*  prototypes */
 
 static void print_error(const char *,...);
-#ifdef VXWORKS
-extern int erl_mem_info_get(MEM_PART_STATS *);
-#endif
-
-#ifdef VXWORKS
-#define MAIN memsup
 
-static MEM_PART_STATS latest;
-static unsigned long latest_system_total; /* does not fit in the struct */
-
-#else
 #define MAIN main
-#endif
-
 
 /*
  * example, we want procfs information, now give them something equivalent: 
@@ -282,16 +258,6 @@ send_tag(int value){
     }
 }
 
-
-#ifdef VXWORKS
-static void load_statistics(void){
-    if(memPartInfoGet(memSysPartId,&latest) != OK)
-	memset(&latest,0,sizeof(latest));
-    latest_system_total = latest.numBytesFree + latest.numBytesAlloc;
-    erl_mem_info_get(&latest); /* if it fails, latest is untouched */
-}
-#endif
-
 #ifdef BSD4_4
 static int
 get_vmtotal(struct vmtotal *vt) {
@@ -358,19 +324,6 @@ get_mem_procfs(memory_ext *me){
 
 /* arch specific functions */
 
-#if defined(VXWORKS)
-static int
-get_extended_mem_vxwork(memory_ext *me) {
-    load_statistics();
-    me->total    = (latest.numBytesFree + latest.numBytesAlloc);
-    me->free     = latest.numBytesFree;
-    me->pagesize = 1;
-    me->flag     = F_MEM_TOTAL | F_MEM_FREE;
-    return 1;
-}
-#endif
-
-
 #if defined(__linux__) /* ifdef SYSINFO */
 /* sysinfo does not include cached memory which is a problem. */
 static int
@@ -442,12 +395,8 @@ get_extended_mem_sgi(memory_ext *me) {
 
 static void
 get_extended_mem(memory_ext *me) {
-/* vxworks */
-#if defined(VXWORKS)
-    if (get_extended_mem_vxworks(me)) return;
-
 /* linux */
-#elif defined(__linux__)
+#if defined(__linux__)
     if (get_mem_procfs(me))  return;
     if (get_extended_mem_sysinfo(me)) return;
 
@@ -477,12 +426,7 @@ get_extended_mem(memory_ext *me) {
 
 static void 
 get_basic_mem(unsigned long *tot, unsigned long *used, unsigned long *pagesize){
-#if defined(VXWORKS)
-    load_statistics();
-    *tot = (latest.numBytesFree + latest.numBytesAlloc);
-    *used = latest.numBytesAlloc;
-    *pagesize = 1;
-#elif defined(_SC_AVPHYS_PAGES)	/* Does this exist on others than Solaris2? */
+#if defined(_SC_AVPHYS_PAGES)	/* Does this exist on others than Solaris2? */
     unsigned long avPhys, phys, pgSz;
     
     phys = sysconf(_SC_PHYS_PAGES);
@@ -557,17 +501,8 @@ extended_show_mem(void){
     if (me.flag & F_SWAP_TOTAL) { send_tag(SWAP_TOTAL);       send(me.total_swap, ps); }
     if (me.flag & F_SWAP_FREE)  { send_tag(SWAP_FREE);        send(me.free_swap, ps);  }
     
-#ifdef VXWORKS
-    send_tag(SM_SYSTEM_TOTAL);
-    send(latest_system_total, 1);
-    send_tag(SM_LARGEST_FREE);
-    send(latest.maxBlockSizeFree, 1);
-    send_tag(SM_NUMBER_OF_FREE);
-    send(latest.numBlocksFree, 1);
-#else
     /* total is system total*/
     if (me.flag & F_MEM_TOTAL)  { send_tag(MEM_SYSTEM_TOTAL); send(me.total, ps);     }
-#endif
     send_tag(SHOW_SYSTEM_MEM_END);
 }    
 
diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl
index 54771b4703..a1b8591c8c 100644
--- a/lib/os_mon/src/memsup.erl
+++ b/lib/os_mon/src/memsup.erl
@@ -185,7 +185,6 @@ init([]) ->
 		   {unix, irix} -> true;
 		   {unix, sunos} -> true;
 		   {win32, _OSname} -> false;
-		   vxworks -> true;
 		   _ ->
 		       exit({unsupported_os, OS})
 	       end,
@@ -617,8 +616,7 @@ code_change(Vsn, PrevState, "1.8") ->
 			   {unix, openbsd} -> true;
 			   {unix, netbsd} -> true;
 			   {unix, sunos} -> true;
-			   {win32, _OSname} -> false;
-			   vxworks -> true
+			   {win32, _OSname} -> false
 		       end,
 	    Pid = if
 		      PortMode -> spawn_link(fun() -> port_init() end);
diff --git a/lib/os_mon/src/os_mon.erl b/lib/os_mon/src/os_mon.erl
index 2b6cd7c498..df1eccb064 100644
--- a/lib/os_mon/src/os_mon.erl
+++ b/lib/os_mon/src/os_mon.erl
@@ -177,8 +177,6 @@ services({unix, _}) -> % Other unix.
     [cpu_sup, disksup, memsup];
 services({win32, _}) ->
     [disksup, memsup, os_sup, sysinfo];
-services(vxworks) ->
-    [memsup];
 services(_) ->
     [].
 
diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
index 754e6ccd78..586f649924 100644
--- a/lib/runtime_tools/c_src/Makefile.in
+++ b/lib/runtime_tools/c_src/Makefile.in
@@ -46,9 +46,6 @@ LDFLAGS += $(DED_LDFLAGS)
 DTRACE_LIBNAME = dyntrace
 
 SYSINCLUDE = $(DED_SYS_INCLUDE)
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-	SYSINCLUDE += -I$(ERL_TOP)/erts/etc/vxworks
-endif
 
 TRACE_DRV_INCLUDES = $(SYSINCLUDE)
 
@@ -101,12 +98,8 @@ ifeq ($(findstring win32,$(TARGET)), win32)
 SOLIBS = $(LIBDIR)/trace_ip_drv.dll $(LIBDIR)/trace_file_drv.dll
 LN=cp
 else
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-SOLIBS = $(LIBDIR)/trace_ip_drv.eld $(LIBDIR)/trace_file_drv.eld
-else
 SOLIBS = $(LIBDIR)/trace_ip_drv.so $(LIBDIR)/trace_file_drv.so
 endif
-endif
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
@@ -165,15 +158,6 @@ $(LIBDIR)/trace_ip_drv.dll: $(TRACE_IP_DRV_OBJS)
 	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 $(LIBDIR)/trace_file_drv.dll: $(TRACE_FILE_DRV_OBJS)
 	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-#
-# VxWorks is simply to different from Unix in this sense.
-# Here are the inference rules for VxWorks
-#
-$(LIBDIR)/trace_ip_drv.eld: $(TRACE_IP_DRV_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $^ 
-
-$(LIBDIR)/trace_file_drv.eld: $(TRACE_FILE_DRV_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $^ 
 
 clean:
 	rm -f $(SOLIBS) $(TRACE_IP_DRV_OBJS) $(TRACE_FILE_DRV_OBJS)
diff --git a/lib/runtime_tools/c_src/trace_ip_drv.c b/lib/runtime_tools/c_src/trace_ip_drv.c
index 6b77128761..a7d132ca6e 100644
--- a/lib/runtime_tools/c_src/trace_ip_drv.c
+++ b/lib/runtime_tools/c_src/trace_ip_drv.c
@@ -34,21 +34,12 @@
 #include <stdlib.h>
 #include <string.h>
 #ifndef __WIN32__
-#    ifdef VXWORKS
-#        include <sockLib.h>
-#        include <sys/times.h>
-#        include <iosLib.h>
-#        include <taskLib.h>
-#        include <selectLib.h>
-#        include <ioLib.h>
-#        include "reclaim.h"
-#    endif 
-#        include <unistd.h>
-#        include <errno.h>
-#        include <sys/types.h>
-#        include <sys/socket.h>
-#        include <netinet/in.h>
-#        include <fcntl.h>
+# include <unistd.h>
+# include <errno.h>
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <fcntl.h>
 #endif
 
 #ifdef DEBUG
@@ -910,7 +901,7 @@ static void stop_select(ErlDrvEvent event, void* _)
     WSACloseEvent((HANDLE)event);
 }
 
-#else /* UNIX/VXWORKS */
+#else /* UNIX */
 
 static int my_driver_select(TraceIpData *desc, SOCKET fd, int flags, enum MySelectOp op)
 {
diff --git a/lib/runtime_tools/src/dbg.erl b/lib/runtime_tools/src/dbg.erl
index 385047ee73..d35c8e781e 100644
--- a/lib/runtime_tools/src/dbg.erl
+++ b/lib/runtime_tools/src/dbg.erl
@@ -431,10 +431,8 @@ trace_port1(file, Filename, Options) ->
     fun() ->
 	    Name = filename:absname(Filename), 
 	    %% Absname is needed since the driver uses 
-	    %% the supplied name without further investigations, 
-	    %% and if the name is relative the resulting path 
-	    %% might be too long which can cause a bus error
-	    %% on vxworks instead of a nice error code return.
+	    %% the supplied name without further investigations.
+
 	    %% Also, the absname must be found inside the fun,
 	    %% in case the actual node where the port shall be
 	    %% started is on another node (or even another host)
diff --git a/lib/runtime_tools/test/dbg_SUITE.erl b/lib/runtime_tools/test/dbg_SUITE.erl
index bd908c1f3a..4071b159a1 100644
--- a/lib/runtime_tools/test/dbg_SUITE.erl
+++ b/lib/runtime_tools/test/dbg_SUITE.erl
@@ -394,41 +394,36 @@ file_port2(suite) ->
 file_port2(doc) ->
     ["Test tracing to file port with 'follow_file'"];
 file_port2(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skipped, "VxWorks NFS cache ruins it all."};
-	_ ->
-	    ?line stop(),
-	    ?line {A,B,C} = erlang:now(),
-	    ?line FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++
-		"-" ++ integer_to_list(B) ++ "-" ++ integer_to_list(C),
-	    ?line FName = filename:join([?config(data_dir, Config), FTMP]),
-	    %% Ok, lets try with flush and follow_file, not a chance on VxWorks
-	    %% with NFS caching...
-	    ?line Port2 = dbg:trace_port(file, FName),
-	    ?line {ok, _} = dbg:tracer(port, Port2),
-	    try
-		?line {ok, [{matched, _node, 1}]} = dbg:p(self(),call),
-		?line {ok, _} = dbg:tp(dbg, ltp,[{'_',[],[{message, {self}}]}]),
-		?line {ok, _} = dbg:tp(dbg, ln, [{'_',[],[{message, hej}]}]),
-		?line ok = dbg:ltp(),
-		?line ok = dbg:flush_trace_port(),
-		?line dbg:trace_client(follow_file, FName,
-				       {fun myhandler/2, self()}),
-		?line S = self(),
-		?line [{trace,S,call,{dbg,ltp,[]},S}] = flush(),
-		?line ok = dbg:ln(),
-		?line ok = dbg:flush_trace_port(),
-		?line receive after 1000 -> ok end, %% Polls every second...
-		?line [{trace,S,call,{dbg,ln,[]},hej}] = flush(),
-		?line stop(),
-		?line [] = flush()
-	    after
-		?line stop(),
-		?line file:delete(FName)
-	    end,
-	    ok
-    end.
+    stop(),
+    {A,B,C} = erlang:now(),
+    FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++
+	"-" ++ integer_to_list(B) ++ "-" ++ integer_to_list(C),
+    FName = filename:join([?config(data_dir, Config), FTMP]),
+    %% Ok, lets try with flush and follow_file, not a chance on VxWorks
+    %% with NFS caching...
+    Port2 = dbg:trace_port(file, FName),
+    {ok, _} = dbg:tracer(port, Port2),
+    try
+	{ok, [{matched, _node, 1}]} = dbg:p(self(),call),
+	{ok, _} = dbg:tp(dbg, ltp,[{'_',[],[{message, {self}}]}]),
+	{ok, _} = dbg:tp(dbg, ln, [{'_',[],[{message, hej}]}]),
+	ok = dbg:ltp(),
+	ok = dbg:flush_trace_port(),
+	dbg:trace_client(follow_file, FName,
+	  	       {fun myhandler/2, self()}),
+	S = self(),
+	[{trace,S,call,{dbg,ltp,[]},S}] = flush(),
+	ok = dbg:ln(),
+	ok = dbg:flush_trace_port(),
+	receive after 1000 -> ok end, %% Polls every second...
+	[{trace,S,call,{dbg,ln,[]},hej}] = flush(),
+	stop(),
+	[] = flush()
+    after
+	stop(),
+	file:delete(FName)
+    end,
+    ok.
 
 file_port_schedfix(suite) ->
     [];
diff --git a/lib/snmp/test/exp/snmp_agent_bl_test.erl b/lib/snmp/test/exp/snmp_agent_bl_test.erl
index a5a6e8260b..263319aa5d 100644
--- a/lib/snmp/test/exp/snmp_agent_bl_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_bl_test.erl
@@ -95,24 +95,13 @@ end_per_testcase(_Case, Config) when list(Config) ->
     Config.
 
 cases() ->
-    case ?OSTYPE() of
-	vxworks ->
-	    %% No crypto app, so skip v3 testcases
- 	    [
-	     app_info, 
-	     test_v1, test_v2, test_v1_v2, 
-	     test_multi_threaded, 
- 	     mib_storage, 
-	     tickets];
-	_Else ->
-  	    [
-	     app_info, 
- 	     test_v1, test_v2, test_v1_v2, test_v3, 
-   	     test_multi_threaded, 
-	     mib_storage, 
-	     tickets
-	    ]
-    end.
+    [
+	app_info, 
+	test_v1, test_v2, test_v1_v2, test_v3, 
+	test_multi_threaded, 
+	mib_storage, 
+	tickets
+    ].
 
 
 %%%-----------------------------------------------------------------
@@ -1187,21 +1176,16 @@ init_v3(Config) when list(Config) ->
     %% and we will be stuck with a bunch of mnesia tables for
     %% the rest of this suite...
     ?DBG("start_agent -> start crypto app",[]),
-    case os:type() of
-	vxworks ->
-	    no_crypto;
-	_ ->
-	    case ?CRYPTO_START() of
-		ok ->
-		    case ?CRYPTO_SUPPORT() of
-			{no, Reason} ->
-			    ?SKIP({unsupported_encryption, Reason});
-			yes ->
-			    ok
-		    end;
-		{error, Reason} ->
-		    ?SKIP({failed_starting_crypto, Reason})
-	    end
+    case ?CRYPTO_START() of
+	ok ->
+	    case ?CRYPTO_SUPPORT() of
+		{no, Reason} ->
+		    ?SKIP({unsupported_encryption, Reason});
+		yes ->
+		    ok
+	    end;
+	{error, Reason} ->
+	    ?SKIP({failed_starting_crypto, Reason})
     end,
     SaNode = ?config(snmp_sa, Config),
     create_tables(SaNode),
@@ -5071,12 +5055,7 @@ run(F, A, Opts) ->
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
     Community = snmp_misc:get_option(community, Opts, "all-rights"),
     ?DBG("run -> start crypto app",[]),
-    Crypto = case os:type() of
-		 vxworks ->
-		     no_crypto;
-		 _ ->
-		     ?CRYPTO_START()
-	     end,
+    Crypto = ?CRYPTO_START(),
     ?DBG("run -> Crypto: ~p",[Crypto]),
     catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
     StdM = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
diff --git a/lib/snmp/test/exp/snmp_agent_ms_test.erl b/lib/snmp/test/exp/snmp_agent_ms_test.erl
index d5eaea55fa..340b95f512 100644
--- a/lib/snmp/test/exp/snmp_agent_ms_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_ms_test.erl
@@ -231,17 +231,13 @@ end_per_testcase(_Case, Config) when list(Config) ->
     Config.
 
 cases() -> 
-case ?OSTYPE() of
-  vxworks ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_multi_threaded},
-       {group, mib_storage}, {group, tickets}];
-  _Else ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_v3},
-       {group, test_multi_threaded}, {group, mib_storage},
-       {group, tickets}]
-end.
+    [
+	app_info,
+	{group, test_v1}, {group, test_v2},
+	{group, test_v1_v2}, {group, test_v3},
+	{group, test_multi_threaded}, {group, mib_storage},
+	{group, tickets}
+    ].
 
 
 %%%-----------------------------------------------------------------
@@ -1221,21 +1217,16 @@ init_v3(Config) when list(Config) ->
     %% and we will be stuck with a bunch of mnesia tables for
     %% the rest of this suite...
     ?DBG("start_agent -> start crypto app",[]),
-    case os:type() of
-	vxworks ->
-	    no_crypto;
-	_ ->
-	    case ?CRYPTO_START() of
-		ok ->
-		    case ?CRYPTO_SUPPORT() of
-			{no, Reason} ->
-			    ?SKIP({unsupported_encryption, Reason});
-			yes ->
-			    ok
-		    end;
-		{error, Reason} ->
-		    ?SKIP({failed_starting_crypto, Reason})
-	    end
+    case ?CRYPTO_START() of
+	ok ->
+	    case ?CRYPTO_SUPPORT() of
+		{no, Reason} ->
+		    ?SKIP({unsupported_encryption, Reason});
+		yes ->
+		    ok
+	    end;
+	{error, Reason} ->
+	    ?SKIP({failed_starting_crypto, Reason})
     end,
     SaNode = ?config(snmp_sa, Config),
     create_tables(SaNode),
@@ -5066,12 +5057,7 @@ run(F, A, Opts) ->
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
     Community = snmp_misc:get_option(community, Opts, "all-rights"),
     ?DBG("run -> start crypto app",[]),
-    Crypto = case os:type() of
-		 vxworks ->
-		     no_crypto;
-		 _ ->
-		     ?CRYPTO_START()
-	     end,
+    Crypto = ?CRYPTO_START(),
     ?DBG("run -> Crypto: ~p",[Crypto]),
     catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
     StdM = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
diff --git a/lib/snmp/test/exp/snmp_agent_mt_test.erl b/lib/snmp/test/exp/snmp_agent_mt_test.erl
index d62bc6c2e7..33d104305a 100644
--- a/lib/snmp/test/exp/snmp_agent_mt_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_mt_test.erl
@@ -231,17 +231,13 @@ end_per_testcase(_Case, Config) when list(Config) ->
     Config.
 
 cases() -> 
-case ?OSTYPE() of
-  vxworks ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_multi_threaded},
-       {group, mib_storage}, {group, tickets}];
-  _Else ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_v3},
-       {group, test_multi_threaded}, {group, mib_storage},
-       {group, tickets}]
-end.
+    [
+	app_info,
+	{group, test_v1}, {group, test_v2},
+	{group, test_v1_v2}, {group, test_v3},
+	{group, test_multi_threaded}, {group, mib_storage},
+	{group, tickets}
+    ].
 
 
 %%%-----------------------------------------------------------------
@@ -1221,21 +1217,16 @@ init_v3(Config) when list(Config) ->
     %% and we will be stuck with a bunch of mnesia tables for
     %% the rest of this suite...
     ?DBG("start_agent -> start crypto app",[]),
-    case os:type() of
-	vxworks ->
-	    no_crypto;
-	_ ->
-	    case ?CRYPTO_START() of
-		ok ->
-		    case ?CRYPTO_SUPPORT() of
-			{no, Reason} ->
-			    ?SKIP({unsupported_encryption, Reason});
-			yes ->
-			    ok
-		    end;
-		{error, Reason} ->
-		    ?SKIP({failed_starting_crypto, Reason})
-	    end
+    case ?CRYPTO_START() of
+	ok ->
+	    case ?CRYPTO_SUPPORT() of
+		{no, Reason} ->
+		    ?SKIP({unsupported_encryption, Reason});
+		yes ->
+		    ok
+	    end;
+	{error, Reason} ->
+	    ?SKIP({failed_starting_crypto, Reason})
     end,
     SaNode = ?config(snmp_sa, Config),
     create_tables(SaNode),
@@ -5066,12 +5057,7 @@ run(F, A, Opts) ->
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
     Community = snmp_misc:get_option(community, Opts, "all-rights"),
     ?DBG("run -> start crypto app",[]),
-    Crypto = case os:type() of
-		 vxworks ->
-		     no_crypto;
-		 _ ->
-		     ?CRYPTO_START()
-	     end,
+    Crypto = ?CRYPTO_START(),
     ?DBG("run -> Crypto: ~p",[Crypto]),
     catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
     StdM = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
diff --git a/lib/snmp/test/exp/snmp_agent_v2_test.erl b/lib/snmp/test/exp/snmp_agent_v2_test.erl
index a86449ca72..dc3d2efbb3 100644
--- a/lib/snmp/test/exp/snmp_agent_v2_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_v2_test.erl
@@ -231,17 +231,13 @@ end_per_testcase(_Case, Config) when list(Config) ->
     Config.
 
 cases() -> 
-case ?OSTYPE() of
-  vxworks ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_multi_threaded},
-       {group, mib_storage}, {group, tickets}];
-  _Else ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_v3},
-       {group, test_multi_threaded}, {group, mib_storage},
-       {group, tickets}]
-end.
+    [
+	app_info,
+	{group, test_v1}, {group, test_v2},
+	{group, test_v1_v2}, {group, test_v3},
+	{group, test_multi_threaded}, {group, mib_storage},
+	{group, tickets}
+    ].
 
 
 %%%-----------------------------------------------------------------
@@ -1221,21 +1217,16 @@ init_v3(Config) when list(Config) ->
     %% and we will be stuck with a bunch of mnesia tables for
     %% the rest of this suite...
     ?DBG("start_agent -> start crypto app",[]),
-    case os:type() of
-	vxworks ->
-	    no_crypto;
-	_ ->
-	    case ?CRYPTO_START() of
-		ok ->
-		    case ?CRYPTO_SUPPORT() of
-			{no, Reason} ->
-			    ?SKIP({unsupported_encryption, Reason});
-			yes ->
-			    ok
-		    end;
-		{error, Reason} ->
-		    ?SKIP({failed_starting_crypto, Reason})
-	    end
+    case ?CRYPTO_START() of
+	ok ->
+	    case ?CRYPTO_SUPPORT() of
+		{no, Reason} ->
+		    ?SKIP({unsupported_encryption, Reason});
+		yes ->
+		    ok
+	    end;
+	{error, Reason} ->
+	    ?SKIP({failed_starting_crypto, Reason})
     end,
     SaNode = ?config(snmp_sa, Config),
     create_tables(SaNode),
@@ -5066,12 +5057,7 @@ run(F, A, Opts) ->
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
     Community = snmp_misc:get_option(community, Opts, "all-rights"),
     ?DBG("run -> start crypto app",[]),
-    Crypto = case os:type() of
-		 vxworks ->
-		     no_crypto;
-		 _ ->
-		     ?CRYPTO_START()
-	     end,
+    Crypto = ?CRYPTO_START(),
     ?DBG("run -> Crypto: ~p",[Crypto]),
     catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
     StdM = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
diff --git a/lib/snmp/test/exp/snmp_agent_v3_test.erl b/lib/snmp/test/exp/snmp_agent_v3_test.erl
index c72d845bf2..b0bc6384e8 100644
--- a/lib/snmp/test/exp/snmp_agent_v3_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_v3_test.erl
@@ -231,17 +231,12 @@ end_per_testcase(_Case, Config) when list(Config) ->
     Config.
 
 cases() -> 
-case ?OSTYPE() of
-  vxworks ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_multi_threaded},
-       {group, mib_storage}, {group, tickets}];
-  _Else ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_v3},
-       {group, test_multi_threaded}, {group, mib_storage},
-       {group, tickets}]
-end.
+    [
+	app_info, {group, test_v1}, {group, test_v2},
+	{group, test_v1_v2}, {group, test_v3},
+	{group, test_multi_threaded}, {group, mib_storage},
+	{group, tickets}
+    ].
 
 
 %%%-----------------------------------------------------------------
@@ -1221,21 +1216,16 @@ init_v3(Config) when list(Config) ->
     %% and we will be stuck with a bunch of mnesia tables for
     %% the rest of this suite...
     ?DBG("start_agent -> start crypto app",[]),
-    case os:type() of
-	vxworks ->
-	    no_crypto;
-	_ ->
-	    case ?CRYPTO_START() of
-		ok ->
-		    case ?CRYPTO_SUPPORT() of
-			{no, Reason} ->
-			    ?SKIP({unsupported_encryption, Reason});
-			yes ->
-			    ok
-		    end;
-		{error, Reason} ->
-		    ?SKIP({failed_starting_crypto, Reason})
-	    end
+    case ?CRYPTO_START() of
+	ok ->
+	    case ?CRYPTO_SUPPORT() of
+		{no, Reason} ->
+		    ?SKIP({unsupported_encryption, Reason});
+		yes ->
+		    ok
+	    end;
+	{error, Reason} ->
+	    ?SKIP({failed_starting_crypto, Reason})
     end,
     SaNode = ?config(snmp_sa, Config),
     create_tables(SaNode),
@@ -5066,12 +5056,7 @@ run(F, A, Opts) ->
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
     Community = snmp_misc:get_option(community, Opts, "all-rights"),
     ?DBG("run -> start crypto app",[]),
-    Crypto = case os:type() of
-		 vxworks ->
-		     no_crypto;
-		 _ ->
-		     ?CRYPTO_START()
-	     end,
+    Crypto = ?CRYPTO_START(),
     ?DBG("run -> Crypto: ~p",[Crypto]),
     catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
     StdM = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
diff --git a/lib/snmp/test/modules.mk b/lib/snmp/test/modules.mk
index a444cab6d6..3d658bf8e8 100644
--- a/lib/snmp/test/modules.mk
+++ b/lib/snmp/test/modules.mk
@@ -79,5 +79,5 @@ MIB_FILES = \
 	Test2.mib \
 	Test3.mib
 
-SPECS = snmp.spec snmp.spec.vxworks 
+SPECS = snmp.spec
 
diff --git a/lib/snmp/test/snmp.spec.vxworks b/lib/snmp/test/snmp.spec.vxworks
deleted file mode 100644
index 654aa96d8c..0000000000
--- a/lib/snmp/test/snmp.spec.vxworks
+++ /dev/null
@@ -1,4 +0,0 @@
-{topcase, {dir, "../snmp_test"}}.
-{skip, {snmp_SUITE, test_v3, "Requires crypto"}}.
-
-
diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index 8ee5dd534d..3575dcc970 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -433,29 +433,16 @@ end_per_testcase2(_Case, Config) ->
 
 
 cases() -> 
-    case ?OSTYPE() of
-	vxworks ->
-	    [
-	     {group, misc}, 
-	     {group, test_v1}, 
-	     {group, test_v2},
-	     {group, test_v1_v2}, 
-	     {group, test_multi_threaded},
-	     {group, mib_storage}, 
-	     {group, tickets1}
-	    ];
-	_Else ->
-	    [
-	     {group, misc}, 
-	     {group, test_v1}, 
-	     {group, test_v2},
-	     {group, test_v1_v2}, 
-	     {group, test_v3},
-	     {group, test_multi_threaded}, 
-	     {group, mib_storage},
-	     {group, tickets1}
-	    ]
-    end.
+    [
+	{group, misc}, 
+	{group, test_v1}, 
+	{group, test_v2},
+	{group, test_v1_v2}, 
+	{group, test_v3},
+	{group, test_multi_threaded}, 
+	{group, mib_storage},
+	{group, tickets1}
+    ].
 
 
 %%%-----------------------------------------------------------------
@@ -1280,21 +1267,16 @@ init_v3(Config) when is_list(Config) ->
     %% and we will be stuck with a bunch of mnesia tables for
     %% the rest of this suite...
     ?DBG("start_agent -> start crypto app",[]),
-    case os:type() of
-	vxworks ->
-	    no_crypto;
-	_ ->
-	    case ?CRYPTO_START() of
-		ok ->
-		    case ?CRYPTO_SUPPORT() of
-			{no, Reason} ->
-			    ?SKIP({unsupported_encryption, Reason});
-			yes ->
-			    ok
-		    end;
-		{error, Reason} ->
-		    ?SKIP({failed_starting_crypto, Reason})
-	    end
+    case ?CRYPTO_START() of
+	ok ->
+	    case ?CRYPTO_SUPPORT() of
+		{no, Reason} ->
+		    ?SKIP({unsupported_encryption, Reason});
+		yes ->
+		    ok
+	    end;
+	{error, Reason} ->
+	    ?SKIP({failed_starting_crypto, Reason})
     end,
     SaNode = ?config(snmp_sa, Config),
     create_tables(SaNode),
diff --git a/lib/snmp/test/snmp_agent_test_lib.erl b/lib/snmp/test/snmp_agent_test_lib.erl
index 238832b7c1..757aebfa9b 100644
--- a/lib/snmp/test/snmp_agent_test_lib.erl
+++ b/lib/snmp/test/snmp_agent_test_lib.erl
@@ -338,12 +338,7 @@ run(Mod, Func, Args, Opts) ->
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
     Community = snmp_misc:get_option(community, Opts, "all-rights"),
     ?DBG("run -> start crypto app",[]),
-    Crypto = case os:type() of
-		 vxworks ->
-		     no_crypto;
-		 _ ->
-		     ?CRYPTO_START()
-	     end,
+    Crypto = ?CRYPTO_START(),
     ?DBG("run -> Crypto: ~p", [Crypto]),
     catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
     StdM = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
@@ -729,7 +724,6 @@ expect2(Id, F) ->
 get_timeout() ->
     get_timeout(os:type()).
 
-get_timeout(vxworks) -> 7000;
 get_timeout(_)       -> 3500.
 
 receive_pdu(To) ->
@@ -1540,7 +1534,6 @@ rpc(Node, F, A) ->
 %% timeout() ->
 %%     timeout(os:type()).
 %% 
-%% timeout(vxworks) -> 7000;
 %% timeout(_)       -> 3500.
     
 
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index 26115a0c74..e327456bc4 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -516,8 +516,6 @@ warning_msg(F, A) ->
 timeout(T) ->
     trunc(timeout(T, os:type())).
 
-timeout(T, vxworks) ->
-    5 * T * timetrap_scale_factor();
 timeout(T, _) ->
     T * timetrap_scale_factor().
             
diff --git a/lib/snmp/test/snmp_test_mgr.erl b/lib/snmp/test/snmp_test_mgr.erl
index 499cf7abcf..40fcbce8f1 100644
--- a/lib/snmp/test/snmp_test_mgr.erl
+++ b/lib/snmp/test/snmp_test_mgr.erl
@@ -161,7 +161,6 @@ get_timeout() ->
 	    get_timeout(os:type())
     end.
 
-get_timeout(vxworks) -> 7000;
 get_timeout(_)       -> 3500.
 
 %%----------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh.spec.vxworks b/lib/ssh/test/ssh.spec.vxworks
deleted file mode 100644
index 81f665283c..0000000000
--- a/lib/ssh/test/ssh.spec.vxworks
+++ /dev/null
@@ -1,3 +0,0 @@
-{topcase, {dir, "../ssh_test"}}.
-{require_nodenames, 1}.
-%{skip, {M, F, "Not yet implemented"}}.
diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index 6f77cff2b9..7b7bb1a713 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_SUITE.erl
@@ -38,7 +38,7 @@
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, 
-	 not_run/1, newly_started/1, basic_v8/1, basic_v9/1,
+	 newly_started/1, basic_v8/1, basic_v9/1,
 	 open_v8/1, open_v9/1, sets_v8/1, sets_v9/1, bags_v8/1,
 	 bags_v9/1, duplicate_bags_v8/1, duplicate_bags_v9/1,
 	 access_v8/1, access_v9/1, dirty_mark/1, dirty_mark2/1,
@@ -95,27 +95,25 @@ end_per_testcase(_Case, _Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    case os:type() of
-	vxworks -> [not_run];
-	_ ->
-	    [basic_v8, basic_v9, open_v8, open_v9, sets_v8, sets_v9,
-	     bags_v8, bags_v9, duplicate_bags_v8, duplicate_bags_v9,
-	     newly_started, open_file_v8, open_file_v9,
-	     init_table_v8, init_table_v9, repair_v8, repair_v9,
-	     access_v8, access_v9, oldbugs_v8, oldbugs_v9,
-	     unsafe_assumptions, truncated_segment_array_v8,
-	     truncated_segment_array_v9, dirty_mark, dirty_mark2,
-	     bag_next_v8, bag_next_v9, hash_v8b_v8c, phash, fold_v8,
-	     fold_v9, fixtable_v8, fixtable_v9, match_v8, match_v9,
-	     select_v8, select_v9, update_counter, badarg,
-	     cache_sets_v8, cache_sets_v9, cache_bags_v8,
-	     cache_bags_v9, cache_duplicate_bags_v8,
-	     cache_duplicate_bags_v9, otp_4208, otp_4989,
-	     many_clients, otp_4906, otp_5402, simultaneous_open,
-	     insert_new, repair_continuation, otp_5487, otp_6206,
-	     otp_6359, otp_4738, otp_7146, otp_8070, otp_8856, otp_8898,
-	     otp_8899, otp_8903, otp_8923, otp_9282, otp_9607]
-    end.
+    [
+	basic_v8, basic_v9, open_v8, open_v9, sets_v8, sets_v9,
+	bags_v8, bags_v9, duplicate_bags_v8, duplicate_bags_v9,
+	newly_started, open_file_v8, open_file_v9,
+	init_table_v8, init_table_v9, repair_v8, repair_v9,
+	access_v8, access_v9, oldbugs_v8, oldbugs_v9,
+	unsafe_assumptions, truncated_segment_array_v8,
+	truncated_segment_array_v9, dirty_mark, dirty_mark2,
+	bag_next_v8, bag_next_v9, hash_v8b_v8c, phash, fold_v8,
+	fold_v9, fixtable_v8, fixtable_v9, match_v8, match_v9,
+	select_v8, select_v9, update_counter, badarg,
+	cache_sets_v8, cache_sets_v9, cache_bags_v8,
+	cache_bags_v9, cache_duplicate_bags_v8,
+	cache_duplicate_bags_v9, otp_4208, otp_4989,
+	many_clients, otp_4906, otp_5402, simultaneous_open,
+	insert_new, repair_continuation, otp_5487, otp_6206,
+	otp_6359, otp_4738, otp_7146, otp_8070, otp_8856, otp_8898,
+	otp_8899, otp_8903, otp_8923, otp_9282, otp_9607
+    ].
 
 groups() -> 
     [].
@@ -132,10 +130,6 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-not_run(suite) -> [];
-not_run(Conf) when is_list(Conf) ->
-    {comment, "Not runnable VxWorks/NFS"}.
-
 newly_started(doc) ->
     ["OTP-3621"];
 newly_started(suite) -> 
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 297c4ec1c9..e916846084 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -4204,21 +4204,13 @@ heavy_lookup_element(Config) when is_list(Config) ->
     repeat_for_opts(heavy_lookup_element_do).
 
 heavy_lookup_element_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(foobar_table, [set, protected, {keypos, 2} | Opts]),
-    ?line ok = fill_tab2(Tab, 0, 7000),
-    case os:type() of
-	vxworks ->
-	    ?line ?t:do_times(5, ?MODULE, do_lookup_element,
-				       [Tab, 6999, 1]);
-						% lookup ALL elements 5 times.
-	_ ->
-	    ?line ?t:do_times(50, ?MODULE, do_lookup_element,
-				       [Tab, 6999, 1])
-						% lookup ALL elements 50 times.
-    end,
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
+    EtsMem = etsmem(),
+    Tab = ets_new(foobar_table, [set, protected, {keypos, 2} | Opts]),
+    ok = fill_tab2(Tab, 0, 7000),
+    % lookup ALL elements 50 times
+    ?t:do_times(50, ?MODULE, do_lookup_element, [Tab, 6999, 1]),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
 
 do_lookup_element(_Tab, 0, _) -> ok;
 do_lookup_element(Tab, N, M) ->
diff --git a/lib/stdlib/test/filename_SUITE.erl b/lib/stdlib/test/filename_SUITE.erl
index 4cfa589660..1f3bdbc115 100644
--- a/lib/stdlib/test/filename_SUITE.erl
+++ b/lib/stdlib/test/filename_SUITE.erl
@@ -112,19 +112,6 @@ absname(Config) when is_list(Config) ->
 	    ?line "/erlang/src" = filename:absname(["/erl",'a','ng',"/",'s',"rc"]),
 	    ?line "/erlang/src" = filename:absname("/erlang///src"),
 	    ?line "/file_sorter.erl" = filename:absname([file_sorter|'.erl']),
-	    ok;
-	vxworks ->
-	    Test_dir = ?config(priv_dir, Config),
-	    Test1 = Test_dir ++ "/foo",
-	    Test2 = Test_dir ++ "/ebin",
-	    ?line ok = file:set_cwd(Test_dir),
-	    ?line Test1 = filename:absname(foo),
-	    ?line Test1= filename:absname("foo"),
-	    ?line Test2 = filename:absname("foo/../ebin"),
-	    ?line "/erlang" = filename:absname("/erlang"),
-	    ?line "/erlang/src" = filename:absname("/erlang/src"),
-	    ?line "/erlang/src" = filename:absname(["/erlan",'g/s',"rc"]),
-	    ?line "/erlang/src" = filename:absname("/erlang///src"),
 	    ok
     end.
 
@@ -179,15 +166,6 @@ absname_2(Config) when is_list(Config) ->
 	    ?line "/erlang" = filename:absname("/erlang", "/"),
 	    ?line "/erlang/src" = filename:absname("/erlang/src", "/"),
 	    ?line "/erlang/src" = filename:absname("/erlang///src", "/"),
-	    ok;
-	vxworks ->
-	    ?line "/usr/foo" = filename:absname(foo, "/usr"),
-	    ?line "/usr/foo" = filename:absname("foo", "/usr"),
-	    ?line "/usr/ebin" = filename:absname("../ebin", "/usr"),
-	    ?line "/usr/ebin" = filename:absname("../ebin", "/usr/src"),
-	    ?line "/erlang" = filename:absname("/erlang", "/usr"),
-	    ?line "/erlang/src" = filename:absname("/erlang/src", "/usr"),
-	    ?line "/erlang/src" = filename:absname("/erlang///src", "/usr"),
 	    ok
     end.
 
@@ -213,11 +191,7 @@ basename_1(Config) when is_list(Config) ->
 		  ?line "foo" = filename:basename("A:foo");
 	      {unix, _} ->
 		  ?line "strange\\but\\true" =
-		      filename:basename("strange\\but\\true");
-	      vxworks -> 
-		  ?line "foo" =  filename:basename(["usr\\foo\\"]),
-		  ?line "foo" =  filename:basename("elrond:usr\\foo\\"),
-		  ?line "foo" =  filename:basename("disk:/foo")
+		      filename:basename("strange\\but\\true")
 	  end,
     ?line test_server:timetrap_cancel(Dog),
     ok.
@@ -249,15 +223,7 @@ basename_2(Config) when is_list(Config) ->
 		  ?line "strange\\but\\true" =
 		      filename:basename("strange\\but\\true.erl", ".erl"),
 		  ?line "strange\\but\\true" =
-		      filename:basename("strange\\but\\true", ".erl");
-	      vxworks ->
-		  ?line "foo" = filename:basename("net:foo", ".erl"),
-		  ?line "foo.erl" = filename:basename("net:\\usr\\foo.erl",
-						      ".hrl"),
-		  ?line "foo.erl" =
-		      filename:basename("/disk0:\\usr.hrl\\foo.erl",
-						      ".hrl"),
-		  ?line "foo" = filename:basename("/home\\usr\\foo", ".hrl")
+		      filename:basename("strange\\but\\true", ".erl")
 	  end,
     ?line test_server:timetrap_cancel(Dog),
     ok.
@@ -267,37 +233,25 @@ basename_2(Config) when is_list(Config) ->
 dirname(Config) when is_list(Config) ->
     case os:type() of
        {win32,_} ->
-	    ?line "A:/usr" = filename:dirname("A:/usr/foo.erl"),
-	    ?line "A:usr" = filename:dirname("A:usr/foo.erl"),
-	    ?line "/usr" = filename:dirname("\\usr\\foo.erl"),
-	    ?line "/" = filename:dirname("\\usr"),
-	    ?line "A:" = filename:dirname("A:");
-       vxworks ->
-	    ?line "net:/usr" = filename:dirname("net:/usr/foo.erl"),
-	    ?line "/disk0:/usr" = filename:dirname("/disk0:/usr/foo.erl"),
-	    ?line "/usr" = filename:dirname("\\usr\\foo.erl"),
-	    ?line "/usr" = filename:dirname("\\usr"),
-	    ?line "net:" = filename:dirname("net:");
+	    "A:/usr" = filename:dirname("A:/usr/foo.erl"),
+	    "A:usr" = filename:dirname("A:usr/foo.erl"),
+	    "/usr" = filename:dirname("\\usr\\foo.erl"),
+	    "/" = filename:dirname("\\usr"),
+	    "A:" = filename:dirname("A:");
 	_ -> true
     end,
-    ?line "usr" = filename:dirname("usr///foo.erl"),
-    ?line "." = filename:dirname("foo.erl"),
-    ?line "." = filename:dirname("."),
-    ?line "usr" = filename:dirname('usr/foo.erl'),
-    ?line "usr" = filename:dirname(['usr','/foo.erl']),
-    ?line "usr" = filename:dirname(['us','r/foo.erl']),
-    ?line "usr" = filename:dirname(['usr/','/foo.erl']),
-    ?line "usr" = filename:dirname(['usr/','foo.erl']),
-    ?line "usr" = filename:dirname(['usr/'|'foo.erl']),
-    ?line "usr" = filename:dirname(['usr/f','oo.erl']),
-    case os:type() of
-	vxworks -> 
-	    ?line "/" = filename:dirname("/"),
-	    ?line "/usr" = filename:dirname("/usr");
-	_ ->
-	    ?line "/" = filename:dirname("/"),
-	    ?line "/" = filename:dirname("/usr")
-    end,
+    "usr" = filename:dirname("usr///foo.erl"),
+    "." = filename:dirname("foo.erl"),
+    "." = filename:dirname("."),
+    "usr" = filename:dirname('usr/foo.erl'),
+    "usr" = filename:dirname(['usr','/foo.erl']),
+    "usr" = filename:dirname(['us','r/foo.erl']),
+    "usr" = filename:dirname(['usr/','/foo.erl']),
+    "usr" = filename:dirname(['usr/','foo.erl']),
+    "usr" = filename:dirname(['usr/'|'foo.erl']),
+    "usr" = filename:dirname(['usr/f','oo.erl']),
+    "/" = filename:dirname("/"),
+    "/" = filename:dirname("/usr"),
     ok.
     
 
@@ -319,12 +273,6 @@ extension(Config) when is_list(Config) ->
 		      filename:extension("A:/usr.bar/foo.nisse.erl"),
 		  ?line "" = filename:extension("A:/usr.bar/foo"),
 		  ok;
-	      vxworks ->
-		  ?line "" = filename:extension("/disk0:\\usr\\foo"),
-		  ?line ".erl" =
-		      filename:extension("net:/usr.bar/foo.nisse.erl"),
-		  ?line "" = filename:extension("net:/usr.bar/foo"),
-		  ok;
 	      _ -> ok
 	  end.
 
@@ -369,25 +317,6 @@ join(Config) when is_list(Config) ->
 		      filename:join(["A:","C:usr","foo.erl"]),
 		  ?line "d:/foo" = filename:join([$D, $:, $/, []], "foo"),
 		  ok;
-	      vxworks ->
-		  ?line "Net:" = filename:join(["Net:/"]),
-		  ?line "net:" = filename:join(["net:\\"]),
-		  ?line "net:/abc" = filename:join(["net:/", "abc"]),
-		  ?line "net:/abc" = filename:join(["net:", "abc"]),
-		  ?line "a/b/c/d/e/f/g" =
-		      filename:join(["a//b\\c//\\/\\d/\\e/f\\g"]),
-		  ?line "net:/usr/foo.erl" =
-		      filename:join(["net:","usr","foo.erl"]),
-		  ?line "/usr/foo.erl" =
-		      filename:join(["net:","/usr","foo.erl"]),
-		  ?line "/target:usr" = filename:join("net:","/target:usr"),
-		  ?line "kernel:/usr" = filename:join("net:", "kernel:/usr"),
-		  ?line "foo:/usr/foo.erl" =
-		      filename:join(["A:","foo:/usr","foo.erl"]),
-		  ?line "/disk0:usr/foo.erl" =
-		      filename:join(["kalle:","/disk0:usr","foo.erl"]),
-		  ?line "D:/foo" = filename:join([$D, $:, $/, []], "foo"),
-		  ok;
 	      {unix, _} ->
 		  ok
 	  end.
@@ -406,10 +335,6 @@ pathtype(Config) when is_list(Config) ->
 	{unix, _} ->
 	    ?line absolute = filename:pathtype("/"),
 	    ?line absolute = filename:pathtype("/usr/local/bin"),
-	    ok;
-	vxworks ->
-	    ?line absolute = filename:pathtype("/usr/local/bin"),
-	    ?line absolute = filename:pathtype("net:usr/local/bin"),
 	    ok
     end.
 
@@ -424,12 +349,7 @@ rootname(Config) when is_list(Config) ->
     ok.
 
 split(Config) when is_list(Config) ->
-    case os:type() of 
-	vxworks ->
-	    ?line ["/usr","local","bin"] = filename:split("/usr/local/bin");
-	_ ->
-	    ?line ["/","usr","local","bin"] = filename:split("/usr/local/bin")
-    end,
+    ?line ["/","usr","local","bin"] = filename:split("/usr/local/bin"),
     ?line ["foo","bar"]= filename:split("foo/bar"),
     ?line ["foo", "bar", "hello"]= filename:split("foo////bar//hello"),
     ?line ["foo", "bar", "hello"]= filename:split(["foo//",'//bar//h',"ello"]),
@@ -447,18 +367,6 @@ split(Config) when is_list(Config) ->
 	    ?line ["a:","msdev","include"] =
 		filename:split("a:msdev\\include"),
 	    ok;
-	vxworks ->
-	    ?line ["net:","msdev","include"] =
-		filename:split("net:/msdev/include"),
-	    ?line ["Target:","msdev","include"] =
-		filename:split("Target:/msdev/include"),
-	    ?line ["msdev","include"] =
-		filename:split("msdev\\include"),
-	    ?line ["/disk0:","msdev","include"] =
-		filename:split("/disk0:\\msdev\\include"),
-	    ?line ["a:","msdev","include"] =
-		filename:split("a:msdev\\include"),
-	    ok;
        _ ->
 	    ok
     end.
@@ -657,56 +565,38 @@ basename_bin_2(Config) when is_list(Config) ->
 dirname_bin(Config) when is_list(Config) ->
     case os:type() of
        {win32,_} ->
-	    ?line <<"A:/usr">> = filename:dirname(<<"A:/usr/foo.erl">>),
-	    ?line <<"A:usr">> = filename:dirname(<<"A:usr/foo.erl">>),
-	    ?line <<"/usr">> = filename:dirname(<<"\\usr\\foo.erl">>),
-	    ?line <<"/">> = filename:dirname(<<"\\usr">>),
-	    ?line <<"A:">> = filename:dirname(<<"A:">>);
-       vxworks ->
-	    ?line <<"net:/usr">> = filename:dirname(<<"net:/usr/foo.erl">>),
-	    ?line <<"/disk0:/usr">> = filename:dirname(<<"/disk0:/usr/foo.erl">>),
-	    ?line <<"/usr">> = filename:dirname(<<"\\usr\\foo.erl">>),
-	    ?line <<"/usr">> = filename:dirname(<<"\\usr">>),
-	    ?line <<"net:">> = filename:dirname(<<"net:">>);
+	    <<"A:/usr">> = filename:dirname(<<"A:/usr/foo.erl">>),
+	    <<"A:usr">> = filename:dirname(<<"A:usr/foo.erl">>),
+	    <<"/usr">> = filename:dirname(<<"\\usr\\foo.erl">>),
+	    <<"/">> = filename:dirname(<<"\\usr">>),
+	    <<"A:">> = filename:dirname(<<"A:">>);
 	_ -> true
     end,
-    ?line <<"usr">> = filename:dirname(<<"usr///foo.erl">>),
-    ?line <<".">> = filename:dirname(<<"foo.erl">>),
-    ?line <<".">> = filename:dirname(<<".">>),
-    case os:type() of
-	vxworks -> 
-	    ?line <<"/">> = filename:dirname(<<"/">>),
-	    ?line <<"/usr">> = filename:dirname(<<"/usr">>);
-	_ ->
-	    ?line <<"/">> = filename:dirname(<<"/">>),
-	    ?line <<"/">> = filename:dirname(<<"/usr">>)
-    end,
+    <<"usr">> = filename:dirname(<<"usr///foo.erl">>),
+    <<".">> = filename:dirname(<<"foo.erl">>),
+    <<".">> = filename:dirname(<<".">>),
+    <<"/">> = filename:dirname(<<"/">>),
+    <<"/">> = filename:dirname(<<"/usr">>),
     ok.
     
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 extension_bin(Config) when is_list(Config) ->
-    ?line <<".erl">> = filename:extension(<<"A:/usr/foo.erl">>),
-    ?line <<".erl">> = filename:extension(<<"A:/usr/foo.nisse.erl">>),
-    ?line <<".erl">> = filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
-    ?line <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
-    ?line <<"">> = filename:extension(<<"A:/usr/foo">>),
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line <<"">> = filename:extension(<<"A:\\usr\\foo">>),
-		  ?line <<".erl">> =
-		      filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
-		  ?line <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
-		  ok;
-	      vxworks ->
-		  ?line <<"">> = filename:extension(<<"/disk0:\\usr\\foo">>),
-		  ?line <<".erl">> =
-		      filename:extension(<<"net:/usr.bar/foo.nisse.erl">>),
-		  ?line <<"">> = filename:extension(<<"net:/usr.bar/foo">>),
-		  ok;
-	      _ -> ok
-	  end.
+    <<".erl">> = filename:extension(<<"A:/usr/foo.erl">>),
+    <<".erl">> = filename:extension(<<"A:/usr/foo.nisse.erl">>),
+    <<".erl">> = filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
+    <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
+    <<"">> = filename:extension(<<"A:/usr/foo">>),
+    case os:type() of
+        {win32, _} ->
+            ?line <<"">> = filename:extension(<<"A:\\usr\\foo">>),
+            ?line <<".erl">> =
+                filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
+            ?line <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
+            ok;
+        _ -> ok
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     
@@ -754,53 +644,47 @@ join_bin(Config) when is_list(Config) ->
 	  end.
 
 pathtype_bin(Config) when is_list(Config) ->
-    ?line relative = filename:pathtype(<<"..">>),
-    ?line relative = filename:pathtype(<<"foo">>),
-    ?line relative = filename:pathtype(<<"foo/bar">>),
-    ?line relative = filename:pathtype('foo/bar'),
+    relative = filename:pathtype(<<"..">>),
+    relative = filename:pathtype(<<"foo">>),
+    relative = filename:pathtype(<<"foo/bar">>),
+    relative = filename:pathtype('foo/bar'),
     case os:type() of
 	{win32, _} ->
-	    ?line volumerelative = filename:pathtype(<<"/usr/local/bin">>),
-	    ?line volumerelative = filename:pathtype(<<"A:usr/local/bin">>),
+	    volumerelative = filename:pathtype(<<"/usr/local/bin">>),
+	    volumerelative = filename:pathtype(<<"A:usr/local/bin">>),
 	    ok;
 	{unix, _} ->
-	    ?line absolute = filename:pathtype(<<"/">>),
-	    ?line absolute = filename:pathtype(<<"/usr/local/bin">>),
+	    absolute = filename:pathtype(<<"/">>),
+	    absolute = filename:pathtype(<<"/usr/local/bin">>),
 	    ok
     end.
 
 rootname_bin(Config) when is_list(Config) ->
-    ?line <<"/jam.src/kalle">> = filename:rootname(<<"/jam.src/kalle">>),
-    ?line <<"/jam.src/foo">> = filename:rootname(<<"/jam.src/foo.erl">>),
-    ?line <<"/jam.src/foo">> = filename:rootname(<<"/jam.src/foo.erl">>, <<".erl">>),
-    ?line <<"/jam.src/foo.jam">> = filename:rootname(<<"/jam.src/foo.jam">>, <<".erl">>),
-    ?line <<"/jam.src/foo.jam">> = filename:rootname(["/jam.sr",'c/foo.j',"am"],<<".erl">>),
-    ?line <<"/jam.src/foo.jam">> = filename:rootname(["/jam.sr",'c/foo.j'|am],<<".erl">>),
+    <<"/jam.src/kalle">> = filename:rootname(<<"/jam.src/kalle">>),
+    <<"/jam.src/foo">> = filename:rootname(<<"/jam.src/foo.erl">>),
+    <<"/jam.src/foo">> = filename:rootname(<<"/jam.src/foo.erl">>, <<".erl">>),
+    <<"/jam.src/foo.jam">> = filename:rootname(<<"/jam.src/foo.jam">>, <<".erl">>),
+    <<"/jam.src/foo.jam">> = filename:rootname(["/jam.sr",'c/foo.j',"am"],<<".erl">>),
+    <<"/jam.src/foo.jam">> = filename:rootname(["/jam.sr",'c/foo.j'|am],<<".erl">>),
     ok.
 
 split_bin(Config) when is_list(Config) ->
-    case os:type() of 
-	vxworks ->
-	    ?line [<<"/usr">>,<<"local">>,<<"bin">>] = filename:split(<<"/usr/local/bin">>);
-	_ ->
-	    ?line [<<"/">>,<<"usr">>,<<"local">>,<<"bin">>] = filename:split(<<"/usr/local/bin">>)
-    end,
-    ?line [<<"foo">>,<<"bar">>]= filename:split(<<"foo/bar">>),
-    ?line [<<"foo">>, <<"bar">>, <<"hello">>]= filename:split(<<"foo////bar//hello">>),
+    [<<"/">>,<<"usr">>,<<"local">>,<<"bin">>] = filename:split(<<"/usr/local/bin">>),
+    [<<"foo">>,<<"bar">>]= filename:split(<<"foo/bar">>),
+    [<<"foo">>, <<"bar">>, <<"hello">>]= filename:split(<<"foo////bar//hello">>),
     case os:type() of
        {win32,_} ->
-	    ?line [<<"a:/">>,<<"msdev">>,<<"include">>] =
+	    [<<"a:/">>,<<"msdev">>,<<"include">>] =
 		filename:split(<<"a:/msdev/include">>),
-	    ?line [<<"a:/">>,<<"msdev">>,<<"include">>] =
+	    [<<"a:/">>,<<"msdev">>,<<"include">>] =
 		filename:split(<<"A:/msdev/include">>),
-	    ?line [<<"msdev">>,<<"include">>] =
+	    [<<"msdev">>,<<"include">>] =
 		filename:split(<<"msdev\\include">>),
-	    ?line [<<"a:/">>,<<"msdev">>,<<"include">>] =
+	    [<<"a:/">>,<<"msdev">>,<<"include">>] =
 		filename:split(<<"a:\\msdev\\include">>),
-	    ?line [<<"a:">>,<<"msdev">>,<<"include">>] =
+	    [<<"a:">>,<<"msdev">>,<<"include">>] =
 		filename:split(<<"a:msdev\\include">>),
 	    ok;
        _ ->
 	    ok
     end.
-
diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl
index bdb4ea65b5..22f66a6c14 100644
--- a/lib/stdlib/test/gen_fsm_SUITE.erl
+++ b/lib/stdlib/test/gen_fsm_SUITE.erl
@@ -281,21 +281,12 @@ start12(Config) when is_list(Config) ->
 %% Check that time outs in calls work
 abnormal1(suite) -> [];
 abnormal1(Config) when is_list(Config) ->
-    ?line {ok, _Pid} = 
-	gen_fsm:start({local, my_fsm}, gen_fsm_SUITE, [], []),
+    {ok, _Pid} = gen_fsm:start({local, my_fsm}, gen_fsm_SUITE, [], []),
 
     %% timeout call.
-    case os:type() of
-	vxworks ->
-	    %% timeout call for VxWorks must be in 16ms increments.
-	    ?line delayed = gen_fsm:sync_send_event(my_fsm, {delayed_answer,1}, 17),
-	    ?line {'EXIT',{timeout,_}} =
-		(catch gen_fsm:sync_send_event(my_fsm, {delayed_answer,17}, 1));
-	_ ->
-	    ?line delayed = gen_fsm:sync_send_event(my_fsm, {delayed_answer,1}, 100),
-	    ?line {'EXIT',{timeout,_}} =
-		(catch gen_fsm:sync_send_event(my_fsm, {delayed_answer,10}, 1))
-    end,
+    delayed = gen_fsm:sync_send_event(my_fsm, {delayed_answer,1}, 100),
+    {'EXIT',{timeout,_}} =
+    (catch gen_fsm:sync_send_event(my_fsm, {delayed_answer,10}, 1)),
     test_server:messages_get(),
     ok.
 
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl
index 48ef7e55ed..24c72e4f31 100644
--- a/lib/stdlib/test/gen_server_SUITE.erl
+++ b/lib/stdlib/test/gen_server_SUITE.erl
@@ -231,14 +231,6 @@ start(Config) when is_list(Config) ->
 	  end,
     test_server:messages_get(),
 
-    %% Must wait for all error messages before going to next test.
-    %% (otherwise it interferes too much with real time characteristics).
-    case os:type() of
-	vxworks ->
-	    receive after 5000 -> ok end;
-	_ ->
-	    ok
-    end,
     process_flag(trap_exit, OldFl),
     ok.
 
diff --git a/lib/stdlib/test/stdlib.spec.vxworks b/lib/stdlib/test/stdlib.spec.vxworks
deleted file mode 100644
index ddc804b831..0000000000
--- a/lib/stdlib/test/stdlib.spec.vxworks
+++ /dev/null
@@ -1,8 +0,0 @@
-{topcase, {dir, "../stdlib_test"}}.
-{skip,{dets_SUITE,"Not runnable VxWorks/NFS"}}.
-{skip,{slave_SUITE,"VxWorks: slave nodes are not supported"}}.
-{skip,{tar_SUITE,errors,"VxWorks filesystem too primitive"}}.
-{skip,{tar_SUITE,create_long_names,"VxWorks names too short"}}.
-{skip,{epp_SUITE,"Test not adopted to VxWorks"}}.
-{skip,{select_SUITE,"Test too memory consuming for VxWorks"}}.
-{skip,{beam_lib_SUITE,error,"All sections not present in stripped beam files"}}.
diff --git a/lib/stdlib/test/sys_SUITE.erl b/lib/stdlib/test/sys_SUITE.erl
index fe039e8bcc..b2e1d12b2a 100644
--- a/lib/stdlib/test/sys_SUITE.erl
+++ b/lib/stdlib/test/sys_SUITE.erl
@@ -56,70 +56,60 @@ end_per_group(_GroupName, Config) ->
 
 log(suite) -> [];
 log(Config) when is_list(Config) ->
-    ?line {ok,_Server} = start(),
-    ?line ok = sys:log(?server,true),
-    ?line {ok,-44} = public_call(44),
-    ?line ok = sys:log(?server,false),
-    ?line ok = sys:log(?server,print),
-    ?line stop(),
+    {ok,_Server} = start(),
+    ok = sys:log(?server,true),
+    {ok,-44} = public_call(44),
+    ok = sys:log(?server,false),
+    ok = sys:log(?server,print),
+    stop(),
     ok.
 
 log_to_file(suite) -> [];
 log_to_file(Config) when is_list(Config) ->
     TempName = test_server:temp_name(?config(priv_dir,Config) ++ "sys."),
-    ?line {ok,_Server} = start(),
-    ?line ok = sys:log_to_file(?server,TempName),
-    ?line {ok,-44} = public_call(44),
-    ?line ok = sys:log_to_file(?server,false),
-    ?line {ok,Fd} = file:open(TempName,[read]),
-    ?line Msg1 = io:get_line(Fd,''),
-    ?line Msg2 = io:get_line(Fd,''),
-    ?line file:close(Fd),
-    ?line lists:prefix("*DBG* sys_SUITE_server got call {req,44} from ",Msg1),
-    ?line lists:prefix("*DBG* sys_SUITE_server sent {ok,-44} to ",Msg2),
-    ?line stop(),
+    {ok,_Server} = start(),
+    ok = sys:log_to_file(?server,TempName),
+    {ok,-44} = public_call(44),
+    ok = sys:log_to_file(?server,false),
+    {ok,Fd} = file:open(TempName,[read]),
+    Msg1 = io:get_line(Fd,''),
+    Msg2 = io:get_line(Fd,''),
+    file:close(Fd),
+    lists:prefix("*DBG* sys_SUITE_server got call {req,44} from ",Msg1),
+    lists:prefix("*DBG* sys_SUITE_server sent {ok,-44} to ",Msg2),
+    stop(),
     ok.
 
 stats(suite) -> [];
 stats(Config) when is_list(Config) ->
-    ?line Self = self(),
-    ?line {ok,_Server} = start(),
-    ?line ok = sys:statistics(?server,true),
-    ?line {ok,-44} = public_call(44),
-    ?line {ok,Stats} = sys:statistics(?server,get),
-    ?line lists:member({messages_in,1},Stats),
-    ?line lists:member({messages_out,1},Stats),
-    ?line ok = sys:statistics(?server,false),
-    ?line {status,_Pid,{module,_Mod},[_PDict,running,Self,_,_]} =
+    Self = self(),
+    {ok,_Server} = start(),
+    ok = sys:statistics(?server,true),
+    {ok,-44} = public_call(44),
+    {ok,Stats} = sys:statistics(?server,get),
+    lists:member({messages_in,1},Stats),
+    lists:member({messages_out,1},Stats),
+    ok = sys:statistics(?server,false),
+    {status,_Pid,{module,_Mod},[_PDict,running,Self,_,_]} =
 	sys:get_status(?server),
-    ?line {ok,no_statistics} = sys:statistics(?server,get),
-    ?line stop(),
+    {ok,no_statistics} = sys:statistics(?server,get),
+    stop(),
     ok.
 
 trace(suite) -> [];
 trace(Config) when is_list(Config) ->
-    ?line {ok,_Server} = start(),
-    case os:type() of
-	vxworks ->
-	    ?line test_server:sleep(20000);
-	_ ->
-	    ?line test_server:sleep(2000)
-    end,
-    ?line test_server:capture_start(),
-    ?line sys:trace(?server,true),
-    ?line {ok,-44} = public_call(44),
+    {ok,_Server} = start(),
+    test_server:sleep(2000),
+    test_server:capture_start(),
+    sys:trace(?server,true),
+    {ok,-44} = public_call(44),
     %% ho, hum, allow for the io to reach us..
-    case os:type() of
-	vxworks ->
-	    ?line test_server:sleep(10000);
-	_ ->
-	    ?line test_server:sleep(1000)
-    end,
-    ?line test_server:capture_stop(),
-    ?line [Msg1,Msg2] = test_server:capture_get(),
-    ?line lists:prefix("*DBG* sys_SUITE_server got call {req,44} from ",Msg1),
-    ?line lists:prefix("*DBG* sys_SUITE_server sent {ok,-44} to ",Msg2),
-    ?line stop(),
+    test_server:sleep(1000),
+    test_server:capture_stop(),
+    [Msg1,Msg2] = test_server:capture_get(),
+    lists:prefix("*DBG* sys_SUITE_server got call {req,44} from ",Msg1),
+    lists:prefix("*DBG* sys_SUITE_server sent {ok,-44} to ",Msg2),
+    stop(),
     ok.
 
 suspend(suite) -> [];
diff --git a/lib/stdlib/test/timer_SUITE.erl b/lib/stdlib/test/timer_SUITE.erl
index f84c72b0f8..1110891ab8 100644
--- a/lib/stdlib/test/timer_SUITE.erl
+++ b/lib/stdlib/test/timer_SUITE.erl
@@ -32,7 +32,6 @@
 %% functions I guess. But I don't have time for that now.
 %%
 %% Expect it to run for at least 5-10 minutes!
-%% Except for VxWorks of course, where a couple of hours is more apropriate...
 
 
 %% The main test case in this module is "do_big_test", which
@@ -77,12 +76,7 @@ end_per_group(_GroupName, Config) ->
 do_big_test(TConfig) when is_list(TConfig) ->
     Dog = ?t:timetrap(?t:minutes(20)),
     Save = process_flag(trap_exit, true),
-    Result = case os:type() of
-		 vxworks ->
-		     big_test(10);
-		 _ ->
-		     big_test(200)
-	     end,
+    Result = big_test(200),
     process_flag(trap_exit, Save),
     ?t:timetrap_cancel(Dog),
     report_result(Result).
diff --git a/lib/test_server/doc/src/ts.xml b/lib/test_server/doc/src/ts.xml
index f9b48d8372..7a356755ba 100644
--- a/lib/test_server/doc/src/ts.xml
+++ b/lib/test_server/doc/src/ts.xml
@@ -85,8 +85,7 @@
     <p><c>ts:install/1</c> or <c>ts:install/2</c> is used if the
         target platform is different from the controller host, i.e. if
         you run on "remote target" or if special options are required
-        for your system. VxWorks is currently supported
-        as remote target platform.
+        for your system.
         </p>
       <p>See the reference manual for detailed information about
         <c>ts:install/0/1/2</c>.
@@ -249,9 +248,8 @@
         <p>Installs and configures the Test Server Framework for
           running test suites. If a remote host is to be used, the
           <c>TargetSystem</c> argument must be given so that "cross
-          installation" can be done. This should be used for testing on
-          VxWorks. Installation is required for any of the
-          functions in <c>ts</c> to work.
+		  installation" can be done. Installation is required for
+		  any of the functions in <c>ts</c> to work.
           </p>
         <p>Opts may be one or more of
           </p>
diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
index b47cf9ff64..682507ba65 100644
--- a/lib/test_server/src/Makefile
+++ b/lib/test_server/src/Makefile
@@ -44,8 +44,7 @@ MODULES= test_server_ctrl \
 	 test_server \
 	 test_server_sup \
 	 test_server_h \
-	 erl2html2 \
-	 vxworks_client
+	 erl2html2
 
 TS_MODULES= \
 	ts \
@@ -55,7 +54,6 @@ TS_MODULES= \
 	ts_make \
 	ts_erl_config \
 	ts_autoconf_win32 \
-        ts_autoconf_vxworks \
 	ts_install \
 	ts_install_cth \
 	ts_benchmark
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 6e94e4861a..1b8221e73c 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -2118,14 +2118,10 @@ timetrap_scale_factor() ->
 	     {false,true} -> 2 * F0;
 	     {false,false} -> F0
 	 end,
-    F2 = case has_superfluous_schedulers() of
+    F = case has_superfluous_schedulers() of
 	     true -> 3*F1;
 	     false -> F1
 	 end,
-    F = case test_server_sup:get_os_family() of
-	    vxworks -> 5 * F2;
-	    _ -> F2
-	end,
     case test_server:is_cover() of
 	true -> 10 * F;
 	false -> F
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index 5ed296d215..803406bcb2 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -429,14 +429,6 @@ run_test(CommandLine) ->
     testcase_callback(TCCB),
     add_job(Name, {command_line,SpecList}),
 
-    %% adding of jobs involves file i/o which may take long time
-    %% when running a nfs mounted file system (VxWorks).
-    case controller_call(get_target_info) of
-	#target_info{os_family=vxworks} ->
-	    receive after 30000 -> ready_to_wait end;
-	_ ->
-	    wait_now
-    end,
     wait_finish().
 
 %% Converted CoverFile to a string unless it is 'none'
diff --git a/lib/test_server/src/test_server_internal.hrl b/lib/test_server/src/test_server_internal.hrl
index c9c52854e3..b58b42805e 100644
--- a/lib/test_server/src/test_server_internal.hrl
+++ b/lib/test_server/src/test_server_internal.hrl
@@ -25,7 +25,7 @@
 %% test_server_ctrl:contact_main_target/2
 %% Once initiated, this information will never change!!
 -record(target_info, {where,           % local | Socket
-		      os_family,       % atom(); win32 | unix | vxworks | ose
+		      os_family,       % atom(); win32 | unix
 		      os_type,         % result of os:type()
 		      host,            % string(); the name of the target machine
 		      version,         % string()
diff --git a/lib/test_server/src/test_server_node.erl b/lib/test_server/src/test_server_node.erl
index 6358efa764..17c02dfbe5 100644
--- a/lib/test_server/src/test_server_node.erl
+++ b/lib/test_server/src/test_server_node.erl
@@ -35,7 +35,6 @@
 
 -include("test_server_internal.hrl").
 -record(slave_info, {name,socket,client}).
--define(VXWORKS_ACCEPT_TIMEOUT,?ACCEPT_TIMEOUT).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%                                                                  %%%
@@ -72,14 +71,6 @@ start_remote_main_target(Parameters) ->
     lists:foreach(fun(T) -> maybe_reboot_target({TargetType,T}) end,
 		  [list_to_atom(TargetHost)|SlaveTargets]),
 
-    % Must give the targets a chance to reboot...
-    case TargetType of
-	vxworks ->
-	    receive after 15000 -> ok end;
-	_ ->
-	    ok
-    end,
-
     Cmd0 = get_main_target_start_command(TargetType,TargetHost,Naming,
 					 MasterNode,MasterCookie),
     Cmd = 
@@ -462,9 +453,6 @@ start_node_peer(SlaveName, OptList, From, TI) ->
 %%
 %% Slave nodes are started on a remote host if
 %% - the option remote is given when calling test_server:start_node/3
-%% or
-%% - the target type is vxworks, since only one erlang node
-%%   can be started on each vxworks host.
 %%
 start_node_slave(SlaveName, OptList, From, TI) ->
     SuppliedArgs = start_node_get_option_value(args, OptList, []),
@@ -787,19 +775,6 @@ kill_node(SI,TI) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Platform specific code
 
-start_target(vxworks,TargetHost,Cmd) ->
-    case vxworks_client:open(TargetHost) of
-	{ok,P} ->
-	    case vxworks_client:send_data(P,Cmd,"start_erl called") of
-		{ok,_} -> 
-		    {ok,{vxworks,P},?VXWORKS_ACCEPT_TIMEOUT};
-		Error -> 
-		    Error
-	    end;
-	Error ->
-	    Error
-    end;
-
 start_target(unix,TargetHost,Cmd0) ->
     Cmd = 
 	case test_server_sup:hoststr() of
@@ -809,19 +784,9 @@ start_target(unix,TargetHost,Cmd0) ->
     open_port({spawn, Cmd}, [stream]),
     {ok,undefined,?ACCEPT_TIMEOUT}.
 
-maybe_reboot_target({vxworks,P}) when is_pid(P) ->
-    %% Reboot the vxworks card.
-    %% Client is also closed after this, even if reboot fails
-    vxworks_client:send_data_wait_for_close(P,"q");
-maybe_reboot_target({vxworks,T}) when is_atom(T) ->
-    %% Reboot the vxworks card.
-    %% Client is also closed after this, even if reboot fails
-    vxworks_client:reboot(T);
 maybe_reboot_target(_) ->
     {error, cannot_reboot_target}.
 
-close_target_client({vxworks,P}) ->
-    vxworks_client:close(P);
 close_target_client(undefined) ->
     ok.
 
@@ -830,11 +795,6 @@ close_target_client(undefined) ->
 %%
 %% Command for starting main target
 %% 
-get_main_target_start_command(vxworks,_TargetHost,Naming,
-			      _MasterNode,_MasterCookie) ->
-    "e" ++ Naming ++ " test_server -boot start_sasl"
-	" -sasl errlog_type error"
-	" -s test_server start " ++ test_server_sup:hoststr();
 get_main_target_start_command(unix,_TargetHost,Naming,
 			      _MasterNode,_MasterCookie) ->
     Prog = pick_erl_program(default),
@@ -845,9 +805,6 @@ get_main_target_start_command(unix,_TargetHost,Naming,
 %% 
 %% Command for starting slave nodes
 %% 
-get_slave_node_start_command(vxworks, _Prog, _MasterNode) ->
-    "e";
-    %"e-noinput -master " ++ MasterNode;
 get_slave_node_start_command(unix, Prog, MasterNode) ->
     cast_to_list(Prog) ++ " -detached -master " ++ MasterNode.
 
diff --git a/lib/test_server/src/ts.erl b/lib/test_server/src/ts.erl
index 75631216b0..a30f6c65fe 100644
--- a/lib/test_server/src/ts.erl
+++ b/lib/test_server/src/ts.erl
@@ -41,8 +41,8 @@
 %%% the modules:
 %%%
 %%%       +-- ts_install --+------  ts_autoconf_win32
-%%%       |                |
-%%%       |                +------  ts_autoconf_vxworks
+%%%       |
+%%%       |
 %%%       |
 %%% ts ---+                +------  ts_erl_config
 %%%       |                |				     ts_lib
@@ -64,8 +64,7 @@
 %%% ts			 Frontend to the test server framework.  Contains all
 %%%			 interface functions.
 %%% ts_install		 Installs the test suite.  On Unix, `autoconf' is
-%%%			 is used; on Windows, ts_autoconf_win32 is used,
-%%%                      on VxWorks, ts_autoconf_vxworks is used.
+%%%			 is used; on Windows, ts_autoconf_win32 is used.
 %%%			 The result is written to the file `variables'.
 %%% ts_run		 Supervises running of the tests.
 %%% ts_autconf_win32	 An `autoconf' for Windows.
diff --git a/lib/test_server/src/ts_autoconf_vxworks.erl b/lib/test_server/src/ts_autoconf_vxworks.erl
deleted file mode 100644
index f4535cd89a..0000000000
--- a/lib/test_server/src/ts_autoconf_vxworks.erl
+++ /dev/null
@@ -1,191 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%% Purpose : Autoconf for cross environments.
-
--module(ts_autoconf_vxworks).
--export([configure/1]).
-%%% Supported cross platforms:
--define(PLATFORMS, ["vxworks_cpu32", "vxworks_ppc860", "vxworks_ppc603", 
-		    "vxworks_sparc", "vxworks_ppc750", "vxworks_simso"]).
--include("ts.hrl").
-
-%% takes an argument {Target_arch, Target_host} (e.g. {vxworks_ppc860, thorin}).
-configure({Target_arch, Target_host}) ->
-    case variables({Target_arch, Target_host}) of
-	{ok, Vars} ->
-	    ts_lib:subst_file("conf_vars.in", "conf_vars", Vars);
-	Error ->
-	    Error
-    end.
-
-variables(Cross_spec) ->
-    run_tests(Cross_spec, tests(), []).
-
-run_tests(Cross_spec, [{Prompt, Tester}|Rest], Vars) ->
-    io:format("checking ~s... ", [Prompt]),
-    case catch Tester(Cross_spec, Vars) of
-	{'EXIT', Reason} ->
-	    io:format("FAILED~nExit status: ~p~n", [Reason]),
-	    {error, auto_conf_failed};
-	{Result, NewVars} ->
-	    io:format("~s~n", [lists:concat([Result])]),
-	    run_tests(Cross_spec, Rest, NewVars)
-    end;
-run_tests(_Cross_spec, [], Vars) ->
-    {ok, Vars}.
-
-
-%%% The tests.
-
-tests() ->
-    [{"supported target architecture", fun target_architecture/2},
-     {"cross target host to run tests on", fun target_host/2},
-     {"CPU type", fun cpu/2},
-     {"for cross-compiling gcc", fun find_gcc/2},
-     {"for cross-linker", fun find_ld/2},
-     {"for object extension", fun find_obj/2},
-     {"for shared libraries extension", fun find_dll/2},
-     {"for executables extension", fun find_exe/2},
-     {"for make", fun find_make/2}].
-
-target_architecture({Architecture, _Target_host}, Vars) ->
-    case lists:member(Architecture, ?PLATFORMS) of
-	true ->
-	    {Architecture, [{host_os, os_type(Architecture)}, {host,  Architecture}|Vars]};    
-	false ->
-	    {"unsupported_platform", Vars} 
-    end.
-
-target_host({_Architecture, Target_host}, Vars) ->
-    {Target_host, [{target_host, Target_host} | Vars]}.
-
-cpu({Arch, _Target_host}, Vars) ->
-    Cpu = processor(Arch),
-    {Cpu, [{host_cpu, Cpu}|Vars]}.
-		
-find_gcc({Arch, _Target_host}, Vars) ->
-    Gcc = "cc" ++ gnu_suffix(Arch),
-    case os:find_executable(Gcc) of
-	false ->
-	    {no, Vars};
-	Path when is_list(Path) ->
-	    Cflags = cflags(Arch),
-	    {Path, [{'CC', Gcc},
-		    {'CFLAGS', Cflags},
-		    {'EI_CFLAGS', Cflags},
-		    {'ERTS_CFLAGS', Cflags},
-		    {'DEFS', ""},
-		    {'ERTS_LIBS', ""},
-		    {'LIBS', ""},
-		    {'SHLIB_CFLAGS', Cflags},
-		    {test_c_compiler, "{gnuc, undefined}"} | Vars]}
-    end.
-
-find_ld({Arch, _Target_host}, Vars) ->
-    Linker = "ld" ++ gnu_suffix(Arch),
-    case os:find_executable(Linker) of
-	false ->
-	    {no, Vars};
-	Path when is_list(Path) ->
-	    {Path, [{'LD', Linker},
-		    {'CROSSLDFLAGS', ldflags(Arch)},
-		    {'SHLIB_EXTRACT_ALL', ""},
-		    {'SHLIB_LD', Linker},
-		    {'SHLIB_LDFLAGS', ""},
-		    {'SHLIB_LDLIBS', ""} | Vars]}
-    end.
-
-find_obj({Arch, _Target_host}, Vars) ->
-    Obj = obj_ext(Arch),
-    {Obj, [{obj, Obj}|Vars]}.
-
-find_dll({Arch, _Target_host}, Vars) ->
-    Dll = dll_ext(Arch),
-    {Dll, [{'SHLIB_SUFFIX', Dll}|Vars]}.
-
-find_exe({Arch, _Target_host}, Vars) ->
-    Exe = exe_ext(Arch),
-    {Exe, [{exe, Exe}|Vars]}.
-
-find_make(_, Vars) ->
-    {"make", [{make_command, "make"} | Vars]}.
-
-%%% some utility functions 
-gnu_suffix(Arch) ->
-    {_, _, _, _, Suffix, _Cpu, _Cflags, _} = cross_data(Arch),
-    Suffix.
-
-processor(Arch) ->
-    {_, _, _, _, _Suffix, Cpu, _Cflags, _} = cross_data(Arch),
-    Cpu.
-
-cflags(Arch) ->
-    {_, _, _, _, _Suffix, _Cpu, Cflags, _} = cross_data(Arch),
-    Cflags.
-
-ldflags(Arch) ->
-    {_, _, _, _, _Suffix, _Cpu, _Cflags, Ldflags} = cross_data(Arch),
-    Ldflags.
-
-os_type(Arch) ->
-    {Os_type, _, _, _, _, _, _, _} = cross_data(Arch),
-    Os_type.
-
-obj_ext(Arch) ->
-    {_, _, Obj, _, _, _, _, _} = cross_data(Arch),
-    Obj.
-
-dll_ext(Arch) ->
-    {_, _, _, Dll, _, _, _, _} = cross_data(Arch),
-    Dll.
-
-exe_ext(Arch) ->
-    {_, Exe, _, _, _, _, _, _} = cross_data(Arch),
-    Exe.
-
-cross_data(Arch) ->
-    case Arch of
-	"vxworks_cpu32" ->
-	    {"VxWorks", "", ".o", ".eld", "68k", "cpu32",
-	    "-DCPU=CPU32 -DVXWORKS -I$(WIND_BASE)/target/h -mnobitfield -fno-builtin -nostdinc -fvolatile -msoft-float",
-	    "-r -d"};
-	"vxworks_ppc860" ->
-	    {"VxWorks", "", ".o", ".eld", "ppc", "ppc860",
-	     "-DCPU=PPC860 -DVXWORKS -I$(WIND_BASE)/target/h -mcpu=860 -fno-builtin -fno-for-scope -msoft-float -D_GNU_TOOL -nostdinc",
-	    "-r -d"};
-	"vxworks_ppc603" ->
-	    {"VxWorks", "", ".o", ".eld", "ppc", "ppc603",
-	     "-DCPU=PPC603 -DVXWORKS -I$(WIND_BASE)/target/h -fno-builtin -fno-for-scope -D_GNU_TOOL -nostdinc",
-	    "-r -d"};
-	"vxworks_sparc" ->
-	    %%% The Sparc Architecture is included for private use (i.e. not Tornado 1.0.1 compatible).
-	    {"VxWorks", "", ".o", ".eld", "sparc", "sparc",
-	    "-DCPU=SPARC -DVXWORKS  -I/home/gandalf/bsproj/BS.2/UOS/vw/5.2/h -fno-builtin -nostdinc",
-	    "-r -d"};
-	"vxworks_ppc750" ->
-	    {"VxWorks", "", ".o", ".eld", "ppc", "ppc604",
-	     "-DCPU=PPC604 -DVXWORKS -DTOOL_FAMILY=gnu -DTOOL=gnu -I$(WIND_BASE)/target/h -fno-builtin -fno-for-scope -D_GNU_TOOL",
-	    "-r -d"};
-	"vxworks_simso" ->
-	    {"VxWorks", "", ".o", ".eld", "simso", "simso",
-	     "-DCPU=SIMSPARCSOLARIS -DVXWORKS -DTOOL_FAMILY=gnu -DTOOL=gnu -I$(WIND_BASE)/target/h -I$(WIND_GCC_INCLUDE) -fno-builtin -fno-for-scope -D_GNU_TOOL",
-	    "-r -d"}
-	
-    end.
diff --git a/lib/test_server/src/ts_erl_config.erl b/lib/test_server/src/ts_erl_config.erl
index 45d88016a4..83f8362735 100644
--- a/lib/test_server/src/ts_erl_config.erl
+++ b/lib/test_server/src/ts_erl_config.erl
@@ -160,7 +160,6 @@ system_include(Root, Vars) ->
     SysDir =
 	case ts_lib:var(os, Vars) of
 	    "Windows" ++ _T -> "sys/win32";
-	    "VxWorks" -> "sys.vxworks";
 	    _ -> "sys/unix"
 	end,
     " -I" ++ quote(filename:nativename(filename:join([Root, "erts", "emulator", SysDir]))).
@@ -176,9 +175,6 @@ erl_interface(Vars,OsType) ->
 		     {installed, _Root} ->
 			 {filename:join(Dir, "lib"),
 			  filename:join(Dir, "src")};
-		     {srctree, _Root, _Target} when OsType =:= vxworks ->
-			 {filename:join(Dir, "lib"),
-			  filename:join([Dir, "src"])};
 		     {srctree, _Root, Target} ->
 			 {filename:join([Dir, "obj", Target]),
 			  filename:join([Dir, "src", Target])}
@@ -218,7 +214,7 @@ erl_interface(Vars,OsType) ->
 		    {unix,_} ->
 			"-lpthread";
 		    _ -> 
-			"" % VxWorks
+			""
 		end,
     [{erl_interface_libpath, quote(filename:nativename(LibPath))},
      {erl_interface_sock_libs, sock_libraries(OsType)},
@@ -318,16 +314,12 @@ get_var(Key, Vars) ->
 sock_libraries({win32, _}) ->
     "ws2_32.lib";
 sock_libraries({unix, _}) ->
-    "";	% Included in general libraries if needed.
-sock_libraries(vxworks) ->
-    "".
+    "".	% Included in general libraries if needed.
 
 link_library(LibName,{win32, _}) ->
     LibName ++ ".lib";
 link_library(LibName,{unix, _}) ->
     "lib" ++ LibName ++ ".a";
-link_library(LibName,vxworks) ->
-    "lib" ++ LibName ++ ".a";
 link_library(_LibName,_Other) ->
     exit({link_library, not_supported}).
 
diff --git a/lib/test_server/src/ts_install.erl b/lib/test_server/src/ts_install.erl
index 99ccfbc9bc..8edb1ed5c6 100644
--- a/lib/test_server/src/ts_install.erl
+++ b/lib/test_server/src/ts_install.erl
@@ -55,8 +55,7 @@ build_install(TargetSystem, Options) ->
     end.
 
 os_type({unix,_}=OsType) -> OsType;
-os_type({win32,_}=OsType) -> OsType;
-os_type(_Other) -> vxworks.
+os_type({win32,_}=OsType) -> OsType.
 
 target_install(CrossVars) ->
     io:format("Cross installation detected, skipping configure and data_dir make~n"),
@@ -76,7 +75,6 @@ target_install(CrossVars) ->
 %% Autoconf for various platforms.
 %% unix uses the configure script
 %% win32 uses ts_autoconf_win32
-%% VxWorks uses ts_autoconf_vxworks.
 
 autoconf(TargetSystem, XComp) ->
     case autoconf1(TargetSystem, XComp) of
@@ -90,8 +88,6 @@ autoconf1({win32, _},[{cross,"no"}]) ->
     ts_autoconf_win32:configure();
 autoconf1({unix, _},XCompFile) ->
     unix_autoconf(XCompFile);
-autoconf1(Other,[{cross,"no"}]) ->
-    ts_autoconf_vxworks:configure(Other);
 autoconf1(_,_) ->
     io:format("cross compilation not supported for that this platform~n"),
     throw(cross_installation_failed).
diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl
index a61028e4bc..5ce8e66660 100644
--- a/lib/test_server/src/ts_run.erl
+++ b/lib/test_server/src/ts_run.erl
@@ -157,7 +157,6 @@ get_config_files() ->
     [TSConfig | case os:type() of
 		    {unix,_} -> ["ts.unix.config"];
 		    {win32,_} -> ["ts.win32.config"];
-		    vxworks -> ["ts.vxworks.config"];
 		    _ -> []
 		end].
 
@@ -329,8 +328,7 @@ start_xterm(Command) ->
 path_separator() ->
     case os:type() of
 	{win32, _} -> ";";
-	{unix, _}  -> ":";
-	vxworks ->    ":"
+	{unix, _}  -> ":"
     end.
 
 
diff --git a/lib/test_server/src/vxworks_client.erl b/lib/test_server/src/vxworks_client.erl
deleted file mode 100644
index ca65eca02a..0000000000
--- a/lib/test_server/src/vxworks_client.erl
+++ /dev/null
@@ -1,243 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
--module(vxworks_client).
-
--export([open/1, close/1, send_data/2, send_data/3, send_data_wait_for_close/2, reboot/1]).
--export([init/2]).    
-
--include("ts.hrl").
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% This is a client talking to a test server daemon on a VxWorks card.
-%%% 
-%%% User interface:
-%%%
-%%% open/1
-%%% Start a client and establish the connection with the test server daemon
-%%% 
-%%% send_data/2
-%%% Send data/command to the test server daemon, don't wait for any return
-%%% 
-%%% send_data/3
-%%% Send data/command to the test server daemon and wait for the given
-%%% return value.
-%%%
-%%% send_data_wait_for_close/2
-%%% Send data/command to the test server daemon and wait for the daemon to
-%%% close the connection.
-%%% 
-%%% close/1
-%%% Close the client.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-%%
-%% User interface
-%%
-
-reboot(Target) ->
-    {ok, {_,_,_,_,_,[Addr|_]}} = inet:gethostbyname(Target),
-    Fun = fun({ok, Socket}) ->
-		  gen_tcp:send(Socket, "q\n"),
-		  receive
-		      {tcp_closed, Socket} ->
-			  gen_tcp:close(Socket),
-			  {ok, socket_closed}
-		  after 5000 ->
-			  exit({timeout, tryagain})
-		  end
-	  end,
-    io:format("Stopping (rebooting) ~p ",[Target]),
-    case fun_target(Addr, Fun) of
-	{ok, socket_closed} ->
-	    ok;
-	_Else ->
-	    io:format("No contact with ts daemon - exiting ...~n"),
-	    exit({stop, no_ts_daemon_contact})
-    end.
-			    
-
-%% open(Target) -> {ok,Client} | {error, Reason}
-open(Target) ->
-    {ok, {_,_,_,_,_,[Addr|_]}} = inet:gethostbyname(Target),
-    Fun = fun({ok, Socket}) ->
-		  P = spawn(?MODULE,init,[Target,Socket]),
-		  inet_tcp:controlling_process(Socket,P),
-		  {ok,P}
-	  end,
-    case fun_target(Addr,Fun) of
-	{ok, Pid} ->
-	    {ok, Pid};
-	{error,Reason} ->
-	    {error, Reason}
-    end.
-
-%% send_data(Client,Data) -> ok
-send_data(Pid,Data) ->
-    Pid ! {send_data,Data++"\n"},
-    ok.
-
-%% send_data(Client,Data,ExpectedReturn) -> {ok,ExpectedReturn} | {error,Reason}
-send_data(Pid,Data,Return) ->
-    Pid ! {send_data,Data++"\n",Return,self()},
-    receive {Pid,Result} -> Result end.
-
-%% send_data_wait_for_close(Client,Data) -> ok | {error,Reason}
-send_data_wait_for_close(Pid,Data) ->
-    send_data(Pid,Data,tcp_closed).
-
-%% close(Client) -> ok
-close(Pid) ->
-    Pid ! close,
-    ok.
-
-
-%%
-%% Internal
-%%
-
-init(Target,Socket) ->
-    process_flag(trap_exit,true),
-    loop(Target,Socket).
-
-loop(Target,Socket) ->
-    receive
-	{send_data,Data} ->
-	    %% io:format("vx client sending: ~p~n", [Data]),
-	    gen_tcp:send(Socket, Data),
-	    loop(Socket,Target);
-	{send_data,Data,tcp_closed,From} ->
-	    %% io:format("vx client sending: ~p~n", [Data]),
-	    gen_tcp:send(Socket, Data),
-	    receive
-		{tcp_closed, Socket} ->
-		    From ! {self(),ok}
-	    after 5000 ->
-		    From ! {self(),{error,timeout}}
-	    end,
-	    closed(Socket,normal);
-	{send_data,Data,Return,From} ->
-	    %% io:format("vx client sending: ~p~n", [Data]),
-	    gen_tcp:send(Socket, Data),
-	    case receive_line(Socket,[],Return,200) of
-		{tcp_closed, Socket} ->
-		    From ! {self(),{error,{socket_closed,Target}}},
-		    closed(Socket,{socket_closed,Target});
-		{tcp,Socket,_Rest} ->
-		    From ! {self(),{ok,Data}},
-		    got_data(Target,Socket,Data);
-		error ->
-		    From ! {self(),{error,{catatonic,Target}}}
-	    end;
-	close ->
-	    closed(Socket,normal);
-	{tcp_closed, Socket} ->
-	    closed(Socket,{socket_closed,Target});
-	{tcp,Socket,Data} ->
-	    got_data(Target,Socket,Data)
-    end.
-	    
-
-
-closed(Socket,Reason) ->
-    gen_tcp:close(Socket),
-    exit(Reason).
-
-got_data(Target,Socket,Data) ->
-    if is_atom(Target) ->
-	    io:format("~w: ~s",[Target,uncr(Data)]);
-       true ->
-	     io:format("~s: ~s",[Target,uncr(Data)])
-    end,
-    loop(Target,Socket).
-	
-uncr([]) ->
-    [];
-uncr([$\r | T]) ->
-    uncr(T);
-uncr([H | T]) ->
-    [H | uncr(T)].
-
-strip_line(Line) ->
-    RPos = string:rchr(Line, $\n),
-    string:substr(Line,RPos+1).
-
-maybe_done_receive(Socket,Ack,Match,C) ->
-    case string:str(Ack,Match) of
-	0 ->
-	    receive_line(Socket,strip_line(Ack),Match,C);
-	_ ->
-	    {tcp,Socket,strip_line(Ack)}
-    end.
-    
-
-receive_line(_Socket,_Ack,_Match,0) ->
-    error;
-receive_line(Socket,Ack,Match,Counter) ->
-    receive
-	{tcp_closed, Socket} ->
-	    {tcp_closed, Socket};
-	{tcp,Socket,Data} ->
-	    NewAck = Ack ++ Data,
-	    case {string:str(NewAck,"\r") > 0,
-		  string:str(NewAck,"\n") > 0} of
-		{true,_} ->
-		    maybe_done_receive(Socket,NewAck,Match,Counter-1);
-		{_,true} ->
-		    maybe_done_receive(Socket,NewAck,Match,Counter-1);
-		_ ->
-		    receive_line(Socket,NewAck,Match,Counter)
-	    end
-    after 20000 ->
-	    error
-    end.
-   
-
-%% Misc functions
-fun_target(Addr, Fun) ->
-    io:format("["),
-    fun_target(Addr, Fun, 60).		%Vx-cards need plenty of time.
-
-fun_target(_Addr, _Fun, 0) ->
-    io:format(" no contact with ts daemon]~n"),
-    {error,failed_to_connect};
-fun_target(Addr, Fun, Tries_left) ->
-    receive after 1 -> ok end,
-    case do_connect(Addr, Fun) of
-	{ok, Value} ->
-	    io:format(" ok]~n"),
-	    {ok, Value};
-	_Error -> % typical {error, econnrefused}
-	    io:format("."),
-	    receive after 10000 -> ok end,
-	    fun_target(Addr, Fun, Tries_left-1)
-    end.
-	    
-do_connect(Addr, Fun) ->
-    case gen_tcp:connect(Addr, ?TS_PORT, [{reuseaddr, true}], 60000) of
-	{ok, Socket} ->
-	    Fun({ok, Socket});
-	Error ->
-	    Error
-    end.
-
-
-    
diff --git a/lib/test_server/test/test_server.cover b/lib/test_server/test/test_server.cover
index 5c59bab494..c16212567e 100644
--- a/lib/test_server/test/test_server.cover
+++ b/lib/test_server/test/test_server.cover
@@ -11,12 +11,11 @@
 			  test_server_node,
 			  test_server_sup,
 			  ts,
-			  ts_autoconf_vxworks,
 			  ts_autoconf_win32,
 			  ts_erl_config,
 			  ts_install,
 			  ts_lib,
 			  ts_make,
-			  ts_run,
-			  vxworks_client]}.
+			  ts_run
+		      ]}.
 
diff --git a/lib/typer/src/typer.erl b/lib/typer/src/typer.erl
index 1e40b8926e..4f1d46ee6c 100644
--- a/lib/typer/src/typer.erl
+++ b/lib/typer/src/typer.erl
@@ -1007,7 +1007,7 @@ msg(Msg) ->
       port_command(P, Msg),
       true = port_close(P),
       ok;
-    _ ->  % win32, vxworks
+    _ ->  % win32
       io:format("~s", [Msg])
   end.
 
diff --git a/make/otp.mk.in b/make/otp.mk.in
index 756cc85443..ed2fd8a70b 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -77,19 +77,13 @@ OTP_RELEASE = @OTP_RELEASE@
 #	Erlang language section
 # ----------------------------------------------------
 EMULATOR = beam
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-# VxWorks object files should be compressed.
-# Other object files should have debug_info.
-  ERL_COMPILE_FLAGS += +compressed
+ifeq ($(findstring ose_ppc750,$(TARGET)),ose_ppc750)
+ERL_COMPILE_FLAGS += +compressed
 else
-  ifeq ($(findstring ose_ppc750,$(TARGET)),ose_ppc750)
-    ERL_COMPILE_FLAGS += +compressed
+  ifdef BOOTSTRAP
+    ERL_COMPILE_FLAGS += +slim
   else
-    ifdef BOOTSTRAP
-      ERL_COMPILE_FLAGS += +slim
-    else
-      ERL_COMPILE_FLAGS += +debug_info
-    endif
+    ERL_COMPILE_FLAGS += +debug_info
   endif
 endif
 ERLC_WFLAGS = -W
diff --git a/system/README b/system/README
index b8ff18119d..b1e18ef55c 100644
--- a/system/README
+++ b/system/README
@@ -51,10 +51,9 @@ Release of Erlang 5.9/OTP R15B
         -------------------------------
 
 3.1	The platform VxWorks is discontinued in the sense that only the 
-	libraries (erl_interface and ic's libraries) are supported. Running
-	the Erlang emulator on VxWorks might still possible but it's no longer
-	maintained. The VxWorks release is still packaged as a full release,
-	but no support will be available for anything but the communication libraries. 
+	libraries (erl_interface and ic's libraries) are supported. The VxWorks
+	release is still packaged as a full release, but no support will be
+	available for anything but the communication libraries. 
 
 4       NOTES ABOUT THE LINUX VERSIONS
         -----------------------------
diff --git a/system/doc/embedded/vxworks.xml b/system/doc/embedded/vxworks.xml
deleted file mode 100644
index 52143a42e3..0000000000
--- a/system/doc/embedded/vxworks.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1997</year><year>2009</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
-    
-    </legalnotice>
-
-    <title>VxWorks</title>
-    <prepared>Patrik Winroth</prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-10-17</date>
-    <rev></rev>
-    <file>vxworks.xml</file>
-  </header>
-  <p>This chapter describes the OS specific parts of OTP which relate
-    to VxWorks.
-    </p>
-
-  <section>
-    <title>Introduction</title>
-    <p>The Erlang/OTP distribution for VxWorks is limited to what
-      Switchboard requires (Switchboard is a general purpose
-      switching hardware developed by Ericsson).
-      </p>
-    <p>Please consult the README file, included at root level in the
-      installation, for latest information on the distribution.
-      </p>
-  </section>
-
-  <section>
-    <title>Memory Usage</title>
-    <p>Memory required is 32 Mbyte.
-      </p>
-  </section>
-
-  <section>
-    <title>Disk Usage</title>
-    <p>The disk space required is 22 Mbyte, the documentation included.   
-      </p>
-  </section>
-
-  <section>
-    <title>Installation</title>
-    <p>OTP/VxWorks is supplied in a distribution file named
-      <c><![CDATA[<PREFIX>.tar.gz]]></c>; i.e.  a tar archive that is
-      compressed with gzip. <c><![CDATA[<PREFIX>]]></c> represents the
-      name of the release,
-      e.g. <c>otp_LXA12345_vxworks_cpu32_R42A</c>. Assuming you are
-      installing to a Solaris file system, the installation is
-      performed by following these steps: &lt;
-      </p>
-    <p></p>
-    <list type="bulleted">
-      <item>Change to the directory where you want to install
-       OTP/VxWorks (<c><![CDATA[<ROOTDIR>]]></c>): <c><![CDATA[cd <ROOTDIR>]]></c></item>
-      <item>Make a directory to put OTP/VxWorks in: <c>mkdir otp_vxworks_cpu32</c> (or whatever you want to call it)</item>
-      <item>Change directory to the newly created one: <c>cd otp_vxworks_cpu32</c></item>
-      <item>Copy the distribution file there from where it is located
-       (<c><![CDATA[<RELDIR>]]></c>): <c><![CDATA[cp <RELDIR>/<PREFIX>.tar.gz .]]></c></item>
-      <item>Unzip the distribution file: <c><![CDATA[gunzip <PREFIX>.tar.gz]]></c></item>
-      <item>Untar <c><![CDATA[<PREFIX>.tar]]></c>: <c><![CDATA[tar xvf <PREFIX>.tar]]></c></item>
-      <item>Create a bin directory: <c>mkdir bin</c></item>
-      <item>Copy the VxWorks Erlang/OTP start-up script to the bin directory:
-      <c>cp erts-Vsn/bin/erl bin/.</c></item>
-      <item>Copy the example start scripts to the bin directory: 
-      <c>cp releases/R42A/*.boot bin/.</c></item>
-    </list>
-    <p>If you use VxWorks nfs mounting facility to mount the Solaris
-      file system, this installation may be directly used. An other
-      possibility is to copy the installation to a local VxWorks DOS
-      file system, from where it is used.
-      </p>
-  </section>
-
-  <section>
-    <title>OS Specific Functionality/Information</title>
-    <p>There are a couple of files that are unique to the VxWorks
-      distribution of Erlang/OTP, these files are described here.
-      </p>
-    <list type="bulleted">
-      <item>README - this files has some information on VxWorks
-       specifics that you are advised to consult. This includes the
-       latest information on what parts of OTP are included in the
-       VxWorks distribution of Erlang/OTP. If you want us to
-       include more parts, please contact us to discuss
-       this.</item>
-      <item>erts-Vsn/bin/resolv.conf - A resolver configuration EXAMPLE file. 
-       You have to edit this file.</item>
-      <item>erts-Vsn/bin/erl - This is an EXAMPLE start script for VxWorks.
-       You have to edit this file to suit your needs.</item>
-      <item>erts-Vsn/bin/erl_io - One possible solution to the problem
-       of competing Erlang and VxWorks shell. Contains the function
-       'start_erl' called by the erl script. Also contains the
-       function 'to_erl' to be used when connecting to the Erlang
-       shell from VxWorks' shell.</item>
-      <item>erts-Vsn/bin/erl_exec - Rearranges command line arguments
-       and starts Erlang.</item>
-      <item>erts-Vsn/bin/vxcall - Allows spawning of standard VxWorks
-       shell functions (which is just about any function in the
-       system...) from open_port/2.  E.g. open_port({spawn, 'vxcall
-       func arg1 arg2'}, []) will cause the output that 'func arg1,
-       arg2' would have given in the shell to be received from the
-       port.</item>
-      <item>erts-Vsn/bin/rdate - Set the time from a networked host,
-       like the SunOS command.  Nothing Erlang-specific, but nice
-       if you want date/0 and time/0 to give meaningful values (you
-       also need a TIMEZONE environment setting if GMT isn't
-       acceptable).  For example: <c>putenv "TIMEZONE=CET::-60:033002:102603"</c> sets central european
-       time.</item>
-      <item>erts-Vsn/src - Contains source for the above files, and
-       additionally config.c, driver.h, preload.c and
-       reclaim.h. Reclaim.h defines the interface to a simple
-       mechanism for "resource reclamation" that is part of the
-       Erlang runtime system - may be useful to "port program" writers (and
-       possibly others). Take careful note of the caveats listed in
-       the file!</item>
-    </list>
-  </section>
-
-  <section>
-    <title>Starting Erlang</title>
-    <p>Start (and restart) of the system depends on what file system
-      is used. To be able to start the system from a nfs mounted
-      file system you can use VxWorks start script facility to run a
-      start script similar to the example below. Note that the
-      Erlang/OTP start-up script is run at the end of this script.
-      </p>
-    <code type="none"><![CDATA[
-#  start.script v1.0 1997/09/08 patrik
-#  
-#  File name:  start.script 
-#  Purpose:    Starting the VxWorks/cpu32 erlang/OTP
-#  Author:     [email protected]
-#  Resides in: ~tornado/wind/target/config/ads360/
-
-#
-# Set shell prompt
-#
-shellPromptSet("sauron-> ")
-
-#
-# Set default gateway
-#
-hostAdd "router-20","150.236.20.251"
-routeAdd "0","router-20"
-
-#
-# Mount /home from gandalf
-#
-hostAdd "gandalf","150.236.20.16"
-usergroup=10 
-nfsAuthUnixSet("gandalf", 452, 10, 1, &usergroup) 
-nfsMount("gandalf", "/export/home", "/home")
-
-#
-# Load and run rdate.o to set correct date on the target
-#
-ld < /home/gandalf/tornado/wind/target/config/ads360/rdate.o
-rdate("gandalf")
-
-#
-# Setup timezone information (Central European time)
-#
-putenv "TIMEZONE=CET::-60:033002:102603"
-
-#
-# Run the Erlang/OTP start script
-#
-cd "/home/gandalf/tornado/wind/target/erlang_cpu32_R42A/bin"
-<erl
-    ]]></code>
-  </section>
-</chapter>
-
diff --git a/system/doc/embedded/xmlfiles.mk b/system/doc/embedded/xmlfiles.mk
index 2bdc34ae28..0001a55b9a 100644
--- a/system/doc/embedded/xmlfiles.mk
+++ b/system/doc/embedded/xmlfiles.mk
@@ -18,5 +18,4 @@
 #
 EMBEDDED_CHAPTER_FILES = \
 	embedded_solaris.xml \
-	embedded_nt.xml \
-	vxworks.xml
+	embedded_nt.xml
author	Björn-Egil Dahlberg <[email protected]>	2012-07-25 15:00:32 +0200
committer	Björn-Egil Dahlberg <[email protected]>	2012-07-25 15:00:32 +0200
commit	a7bcc6aa05bc61edd1ac178b6331e780aeab940f (patch)
tree	af6cb90b11c95744135e233478c89b55fede8bf7
parent	81664b189c21710767b78a9db9d74d55585cfeed (diff)
parent	84bc4fb47b58f258a50e23ba96db51608272b859 (diff)
download	otp-a7bcc6aa05bc61edd1ac178b6331e780aeab940f.tar.gz otp-a7bcc6aa05bc61edd1ac178b6331e780aeab940f.tar.bz2 otp-a7bcc6aa05bc61edd1ac178b6331e780aeab940f.zip