--- ./libg++/src/timer.c~	Fri Jun 16 15:45:16 1995
+++ ./libg++/src/timer.c	Wed Jun 21 12:58:27 1995
@@ -26,7 +26,7 @@
 
 /* If this does not work on your system, change this to #if 0, and 
    report the problem. */
-
+#ifndef __vxworks
 #if 1
 
 #include <_G_config.h>
@@ -163,3 +163,4 @@
 #endif /* timing stuff */
 
 
+#endif /* __vxworks */
--- ./include/libiberty.h~	Thu Feb  9 22:12:44 1995
+++ ./include/libiberty.h	Wed Jun 21 09:25:40 1995
@@ -11,6 +11,9 @@
 #define LIBIBERTY_H
 
 #include "ansidecl.h"
+#ifdef __vxworks
+#include <vxWorks.h>
+#endif
 
 /* Build an argument vector from a string.  Allocates memory using
    malloc.  Use freeargv to free the vector.  */
--- ./libstdc++/std/typeinfo.h~	Fri Jun 16 15:15:07 1995
+++ ./libstdc++/std/typeinfo.h	Wed Jun 21 09:21:02 1995
@@ -32,6 +32,8 @@
 #pragma interface "std/typeinfo.h"
 #endif
 
+#include <std/cstring.h>
+
 class type_info {
 private:
   // assigning type_info is not supported.  made private.
--- ./libstdc++/typeinfo.cc~	Fri Jun 16 15:14:35 1995
+++ ./libstdc++/typeinfo.cc	Wed Jun 21 09:18:32 1995
@@ -31,6 +31,7 @@
 
 #include <std/cstdlib.h>
 #include <std/typeinfo.h>
+#include <std/cstring.h>
 
 // Offset functions for the class type.
 
--- ./libstdc++/Makefile~	Tue Jun 20 13:38:28 1995
+++ ./libstdc++/Makefile	Wed Jun 21 09:52:50 1995
@@ -285,15 +285,12 @@
 .PHONY: libs
 libs: $(LIBS)
 
-stdlist: $(IO_DIR)/iostream.list $(OBJS) $(SUBLIBS) ../$(LIBIBERTY)/libiberty.a
+stdlist: $(IO_DIR)/iostream.list $(OBJS) $(SUBLIBS)
 	-rm -f tlist
 	touch tlist
 	echo *.o >> tlist
 	for f in `cat $(IO_DIR)/iostream.list` ; do \
 	  echo "$(IO_DIR)/$$f" >> tlist ; \
-	done
-	for f in $(LIBIBERTY_OBJS) ; do \
-	  echo "../$(LIBIBERTY)/$$f" >> tlist ; \
 	done
 	mv tlist stdlist
 
--- ./libio/libioP.h~	Thu Jun 15 21:42:16 1995
+++ ./libio/libioP.h	Wed Jun 21 08:30:43 1995
@@ -22,6 +22,10 @@
 This exception does not however invalidate any other reasons why
 the executable file might be covered by the GNU General Public License. */
 
+#ifdef __vxworks
+#include <vxWorks.h>
+#endif
+
 #include <errno.h>
 #ifndef errno
 extern int errno;
--- ./libio/gen-params~	Fri Jun 16 15:07:45 1995
+++ ./libio/gen-params	Wed Jun 21 08:25:11 1995
@@ -51,6 +51,7 @@
 CC=${CC-`if [ -f ${gccdir}/xgcc ] ; \
 	then echo ${gccdir}/xgcc -B${gccdir}/ ; \
 	else echo cc ; fi`}
+CC="${CC} -I/vx/h"
 CXX=${CXX-`if [ -f ${gccdir}/xgcc ] ; \
 	then echo ${gccdir}/xgcc -B${gccdir}/ ; \
 	else echo gcc ; fi`}
--- ./libio/parsestream.cc~	Thu Jun 15 21:42:21 1995
+++ ./libio/parsestream.cc	Wed Jun 21 08:36:52 1995
@@ -30,6 +30,9 @@
 #include "libioP.h"
 #include "parsestream.h"
 #include <stdlib.h>
+#ifdef __vxworks
+#include <string.h>
+#endif
 
 streambuf* parsebuf::setbuf(char*, int)
 {
--- ./libio/pfstream.cc~	Thu Jun 15 21:42:24 1995
+++ ./libio/pfstream.cc	Wed Jun 21 08:37:44 1995
@@ -30,6 +30,9 @@
 #include "libioP.h"
 #include <pfstream.h>
 #include <procbuf.h>
+#ifdef __vxworks
+#include <string.h>
+#endif
 
 ipfstream::ipfstream(const char *name, int mode, int prot)
 {
--- ./libio/editbuf.cc~	Thu Jun 15 21:40:55 1995
+++ ./libio/editbuf.cc	Wed Jun 21 08:38:40 1995
@@ -31,6 +31,9 @@
 #include "editbuf.h"
 #include <stddef.h>
 #include <stdlib.h>
+#ifdef __vxworks
+#include <string.h>
+#endif
 
 /* NOTE: Some of the code here is taken from GNU emacs */
 /* Hence this file falls under the GNU License! */
--- ./xiberty/Makefile~	Tue Jun 20 13:37:18 1995
+++ ./xiberty/Makefile	Wed Jun 21 09:48:17 1995
@@ -1,6 +1,6 @@
 # This file was generated automatically by configure.  Do not edit.
 VPATH = .
-links = alloca-conf.h alloca-botch.h alloca-conf.h alloca-norm.h alloca.c argv.c basename.c bcmp.c bcopy.c bzero.c clock.c concat.c copysign.c cplus-dem.c dummy.c fdmatch.c floatformat.c getcwd.c getopt.c getopt1.c getpagesize.c getruntime.c hex.c index.c insque.c memchr.c memcmp.c memcpy.c memmove.c memset.c mpw.c msdos.c obstack.c random.c rename.c rindex.c sigsetmask.c spaces.c strcasecmp.c strchr.c strdup.c strerror.c strncasecmp.c strrchr.c strsignal.c strstr.c strtod.c strtol.c strtoul.c tmpnam.c vasprintf.c vfork.c vfprintf.c vprintf.c vsprintf.c waitpid.c win32.c xatexit.c xexit.c xmalloc.c functions.def
+links = alloca-conf.h alloca-botch.h alloca-conf.h alloca-norm.h alloca.c argv.c basename.c clock.c concat.c copysign.c cplus-dem.c dummy.c fdmatch.c floatformat.c getopt.c getopt1.c hex.c index.c insque.c mpw.c msdos.c obstack.c random.c xatexit.c xexit.c xmalloc.c functions.def
 host_alias = sparc-sun-solaris2.4
 host_cpu = sparc
 host_vendor = sun
@@ -182,10 +182,10 @@
 	 vasprintf.c vfork.c vfprintf.c vprintf.c vsprintf.c waitpid.c \
 	 xatexit.c xexit.c xmalloc.c
 # These are always included in the library.
-REQUIRED_OFILES = argv.o basename.o concat.o cplus-dem.o fdmatch.o \
-  getopt.o getopt1.o getruntime.o hex.o \
-  floatformat.o obstack.o spaces.o strerror.o strsignal.o \
-  vasprintf.o xatexit.o xexit.o xmalloc.o 
+REQUIRED_OFILES = basename.o concat.o cplus-dem.o fdmatch.o \
+  hex.o \
+  floatformat.o obstack.o spaces.o \
+  xatexit.o xexit.o xmalloc.o 
 
 # Do we want/need any config overrides?
 #	 
--- ./Makefile~	Tue Jun 20 13:36:13 1995
+++ ./Makefile	Wed Jun 21 09:32:25 1995
@@ -70,7 +70,7 @@
 AS = as
 AR = ar
 AR_FLAGS = rc
-CC = cc
+CC = gcc68k
 
 # Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
 # here so that they can be overridden by Makefile fragments.
@@ -80,17 +80,17 @@
 
 # We don't specify -g -O because many compilers don't support -g -O,
 # and/or -O is broken in and of itself.
-CFLAGS = -g
+CFLAGS = -O2 -I/vx/h -DNO_SYS_PARAM_H
 LIBCFLAGS = $(CFLAGS)
 CFLAGS_FOR_TARGET = $(CFLAGS)
 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 PICFLAG = 
 PICFLAG_FOR_TARGET = 
 
-CXX = gcc
+CXX = gcc68k
 
 # Use -O2 to stress test the compiler.
-CXXFLAGS = -g -O2
+CXXFLAGS = -O2 -I/vx/h
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
 CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
@@ -227,7 +227,6 @@
 
 SYSV = -DSYSV
 RANLIB = true
-CFLAGS = -g 
 
 # X11 
 OPENWINHOME = /usr/openwin
@@ -925,10 +924,10 @@
 all-indent:
 all-ispell: all-emacs19
 all-ld: all-libiberty all-bfd all-byacc all-flex
-all-libg++: all-gas all-ld all-gcc all-xiberty all-newlib all-libio all-librx all-libstdc++
-all-libio: all-gas all-ld all-gcc all-xiberty all-newlib 
+all-libg++: all-libio all-librx all-libstdc++
+all-libio:
 all-libiberty:
-all-libstdc++: all-gas all-ld all-gcc all-xiberty all-newlib all-libio
+all-libstdc++: all-libio
 all-m4: all-libiberty
 all-make: all-libiberty
 all-mmalloc: