[PATCH] fix matching of vxworks7 in libgcc's configuration

[PATCH] fix matching of vxworks7 in libgcc's configuration

[Olivier Hainque]

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


Part of the VxWorks 7 configuration specificities is triggered by this piece
in libgcc/config.host:

  # Common parts for widely ported systems.
  case ${host} in
  ...
  *-*-vxworks7)
    tmake_file=t-vxworks7
    ;;

For the powerpc family of targets, this should apply to SPE targets as well.

However, these are typically canonicalized as *-vxworks7spe and the case filter
above fails to match that.

This causes a build failure of libgcc when configured for e500v2-wrs-vxworks,
complaining that semLib.h could not be found while compiling vxlib-tls.c,
despite VSB_DIR being set and the sequence of -I that should allow finding it
in t-vxworks7.

Indeed, we mistakenly use t-vxworks instead of t-vxworks7, and the former
relies on a different environment variable to locate the header files (as
expected for versions of VxWorks prior to 7).

The attached patch fixes this by adding a wildcard after vxworks7 in the
case filter quoted above.

Committing to mainline, after checking that it has the intended effect and
lets the build proceed further.

Olivier

2018-09-01  Olivier Hainque  <hainque@adacore.com>

	libgcc/
	* config.host (*-*-vxworks7): Widen scope to vxworks7*.


[-- Attachment #2: libgcc-vx7.diff --]
[-- Type: application/octet-stream, Size: 261 bytes --]

--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -307,7 +307,7 @@ case ${host} in
   tmake_file="vms/t-vms"
   extra_parts="crt0.o crtbegin.o crtbeginS.o crtend.o crtendS.o"
   ;;
-*-*-vxworks7)
+*-*-vxworks7*)
   tmake_file=t-vxworks7
   ;;
 *-*-vxworks*)