VxWorks Patches Back from the Dead!

[Bruce Korb]

On 08/22/12 17:05, rbmj wrote:
> Hello Everyone,
>
> I have ten patches which are approved or obvious but waiting on commit


The include fixing stuff looks fine to me.
However I think it might be simpler to tweak mkfixinc.sh to

   sed '/if test -s .{MACRO_LIST}/s/$/ && false/' \
      ${srcdir}/fixinc.in > ${target}

for vxworks rather than all that configury rigmarole.
That would eliminate changes to gcc/configure.ac and gcc/Makefile.in.

Basically degrading the entire first patch to this:

$ svn diff mkfixinc.sh
Index: mkfixinc.sh
===================================================================

   1 == '-u'
   2 == '-L'
   3 == 'mkfixinc.sh	(revision 190448)'
   4 == '-L'
   5 == 'mkfixinc.sh	(working copy)'
   6 == '.svn/text-base/mkfixinc.sh.svn-base'
   7 == 'mkfixinc.sh'
--- mkfixinc.sh	(revision 190448)
+++ mkfixinc.sh	(working copy)
@@ -15,7 +15,6 @@
      i?86-*-mingw32* | \
      x86_64-*-mingw32* | \
      i?86-*-interix* | \
-    *-*-vxworks* | \
      powerpc-*-eabisim* | \
      powerpc-*-eabi*    | \
      powerpc-*-rtems*   | \
@@ -26,6 +25,11 @@
  	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
          ;;

+    *-*-vxworks* )
+        sed '/if test -s .{MACRO_LIST}/s/$/ && false/' \
+            ${srcdir}/fixinc.in > ${target}
+        ;;
+
      *)
  	cat < ${srcdir}/fixinc.in > ${target} || exit 1
  	;;