fix libgcc build for VxWorks

fix libgcc build for VxWorks

[Olivier Hainque]

[-- Attachment #1: Type: text/plain, Size: 1175 bytes --]

Hello,

A build of the current mainline for e.g. powerpc-wrs-vxworks
fails during the libgcc stage with something like:

  xgcc ... -I `case "/$(MULTIDIR)" in */mrtp*) echo .../target/usr/h ;; *) echo .../target/h ;; esac` ...
  /bin/bash: MULTIDIR: command not found

The problem is the double dollar sign in:

  libgcc/config/t-vxworks:

# This ensures that the correct target headers are used; some
# VxWorks system headers have names that collide with GCC's
# internal (host) headers, e.g. regs.h.
LIBGCC2_INCLUDES = -nostdinc -I \
 `case "/$$(MULTIDIR)" in \
    */mrtp*) echo $(WIND_USR)/h ;; \
    *) echo $(WIND_BASE)/target/h ;; \
  esac`

Removing the extraneous dollar sign lets the build proceed, with expected
behavior for the example target used above.

The attached patch does just that.

Committing, to restore basic build functionality before proposing further
changes (preparing the submission of VxWorks 7 ports for a few targets).

With Kind Regards,

Olivier


2017-05-30  Olivier Hainque  <hainque@adacore.com>

	libgcc/
	* config/t-vxworks (LIBGCC2_INCLUDES): Remove extraneous
	dollar sign before $(MULTIDIR).


[-- Attachment #2: vx-multidir.diff --]
[-- Type: application/octet-stream, Size: 490 bytes --]

Index: libgcc/config/t-vxworks
===================================================================
--- libgcc/config/t-vxworks	(revision 248673)
+++ libgcc/config/t-vxworks	(working copy)
@@ -8,7 +8,7 @@
 # VxWorks system headers have names that collide with GCC's
 # internal (host) headers, e.g. regs.h.
 LIBGCC2_INCLUDES = -nostdinc -I \
-  `case "/$$(MULTIDIR)" in \
+  `case "/$(MULTIDIR)" in \
      */mrtp*) echo $(WIND_USR)/h ;; \
      *) echo $(WIND_BASE)/target/h ;; \
    esac`