[meta-intel] Quilt failure when building against Clang master

[MikeB]

I'm trying to get the Clang compiler to support the x32 architecture.

Clang has recently upgraded 9.0-rc and I was asked to try building
against Clang Master.

It looks like of the meta-intel patch files in Master are not
compatible with the latest upgrade of Clang (see below).

Is there a timeframe for bringing meta-intel back in sync with meta-clang?

Regards, Mike

MACHINE = "intel-corei7-64"
DEFAULTTUNE = "x86-64-x32"
Loading cache: 100%
|################################################################################################|
Time: 0:00:00
Loaded 1374 entries from dependency cache.
NOTE: Resolving any missing task queue dependencies

Build Configuration:
BB_VERSION           = "1.43.1"
BUILD_SYS            = "x86_64-linux"
NATIVELSBSTRING      = "universal"
TARGET_SYS           = "x86_64-poky-linux-gnux32"
MACHINE              = "intel-corei7-64"
DISTRO               = "poky"
DISTRO_VERSION       = "2.7+snapshot-20190819"
TUNE_FEATURES        = "mx32"
TARGET_FPU           = ""
meta
meta-poky
meta-yocto-bsp       = "master:20946c63c272b2128e6dc76490313b174ee97d8e"
meta-intel           = "master:14415d0d3ce280ce20eafb40cb3008a05f8e2003"
meta-clang           = "master:4e05dac9af2b9f000e31f799511899870663b482"
meta-hack            = "master:20946c63c272b2128e6dc76490313b174ee97d8e"

Initialising tasks: 100%
|###########################################################################################|
Time: 0:00:03
Sstate summary: Wanted 796 Found 0 Missed 796 Current 88 (0% match, 9% complete)
NOTE: Executing Tasks
NOTE: Setscene tasks completed
ERROR: llvm-project-source-9.0.0-9.0.0-r0 do_patch: Command Error:
'quilt --quiltrc
/home/mabnhdev/clang-issue-123-repro/build/tmp/work-shared/llvm-project-source-9.0.0-r0/recipe-sysroot-native/etc/quiltrc
push' exited with 0  Output:
Applying patch 0001-OpenCL-Change-type-of-block-pointer-for-OpenCL.patch
patching file lib/CodeGen/CodeGenTypes.cpp
Hunk #1 FAILED at 637.
1 out of 1 hunk FAILED -- rejects in file lib/CodeGen/CodeGenTypes.cpp
patching file test/CodeGenOpenCL/blocks.cl
Hunk #1 FAILED at 35.
Hunk #2 FAILED at 50.
2 out of 2 hunks FAILED -- rejects in file test/CodeGenOpenCL/blocks.cl
patching file test/CodeGenOpenCL/cl20-device-side-enqueue.cl
Hunk #1 FAILED at 11.
Hunk #2 FAILED at 77.
Hunk #3 FAILED at 95.
Hunk #4 FAILED at 300.
Hunk #5 FAILED at 346.
5 out of 5 hunks FAILED -- rejects in file
test/CodeGenOpenCL/cl20-device-side-enqueue.cl
Patch 0001-OpenCL-Change-type-of-block-pointer-for-OpenCL.patch does
not apply (enforce with -f)
ERROR: Logfile of failure stored in:
/home/mabnhdev/clang-issue-123-repro/build/tmp/work-shared/llvm-project-source-9.0.0-r0/temp/log.do_patch.24369
ERROR: Task (/home/mabnhdev/clang-issue-123-repro/meta-clang/recipes-devtools/clang/llvm-project-source.bb:do_patch)
failed with exit code '1'
NOTE: Tasks Summary: Attempted 934 tasks of which 922 didn't need to
be rerun and 1 failed.

Summary: 1 task failed:
  /home/mabnhdev/clang-issue-123-repro/meta-clang/recipes-devtools/clang/llvm-project-source.bb:do_patch
Summary: There was 1 ERROR message shown, returning a non-zero exit code.