svn commit: r515208 - in head/devel/llvm-devel: . files files/clang

[Brooks Davis]

Author: brooks
Date: Tue Oct 22 18:40:11 2019
New Revision: 515208
URL: https://svnweb.freebsd.org/changeset/ports/515208

Log:
  Fix typo in patch to fix clang build.
  
  Adjust the set of headers installed with clang to match llvm90.  Also
  correct the location of the patch.
  
  Reported by:	yuri (lack on unwind.h)

Added:
  head/devel/llvm-devel/files/clang/patch-tools_clang_lib_Headers_CMakeLists.txt
     - copied, changed from r515207, head/devel/llvm-devel/files/patch-tools_clang_lib_Headers_CMakeLists.txt
Deleted:
  head/devel/llvm-devel/files/patch-tools_clang_lib_Headers_CMakeLists.txt
Modified:
  head/devel/llvm-devel/files/clang/patch-fformat_extensions.diff
  head/devel/llvm-devel/pkg-plist

Modified: head/devel/llvm-devel/files/clang/patch-fformat_extensions.diff
==============================================================================
--- head/devel/llvm-devel/files/clang/patch-fformat_extensions.diff	Tue Oct 22 18:33:14 2019	(r515207)
+++ head/devel/llvm-devel/files/clang/patch-fformat_extensions.diff	Tue Oct 22 18:40:11 2019	(r515208)
@@ -4,7 +4,7 @@
    Flags<[CC1Option]>;
  def fno_use_line_directives : Flag<["-"], "fno-use-line-directives">, Group<f_Group>;
  
-+def fformat_extensions: Flag<["-"], "fformat-extensions">, Group<f_Group>, Flag s<[CC1Option]>,
++def fformat_extensions: Flag<["-"], "fformat-extensions">, Group<f_Group>, Flags<[CC1Option]>,
 +  HelpText<"Enable FreeBSD kernel specific format string extensions">;
  def ffreestanding : Flag<["-"], "ffreestanding">, Group<f_Group>, Flags<[CC1Option]>,
    HelpText<"Assert that the compilation takes place in a freestanding environment">;

Copied and modified: head/devel/llvm-devel/files/clang/patch-tools_clang_lib_Headers_CMakeLists.txt (from r515207, head/devel/llvm-devel/files/patch-tools_clang_lib_Headers_CMakeLists.txt)
==============================================================================
--- head/devel/llvm-devel/files/patch-tools_clang_lib_Headers_CMakeLists.txt	Tue Oct 22 18:33:14 2019	(r515207, copy source)
+++ head/devel/llvm-devel/files/clang/patch-tools_clang_lib_Headers_CMakeLists.txt	Tue Oct 22 18:40:11 2019	(r515208)
@@ -1,26 +1,14 @@
---- ./tools/clang/lib/Headers/CMakeLists.txt-orig	2018-10-23 20:12:12.000000000 -0300
-+++ ./tools/clang/lib/Headers/CMakeLists.txt	2018-12-06 12:47:11.915695000 -0200
-@@ -47,7 +47,6 @@
-   clwbintrin.h
-   emmintrin.h
-   f16cintrin.h
--  float.h
-   fma4intrin.h
-   fmaintrin.h
-   fxsrintrin.h
-@@ -56,11 +55,7 @@
-   htmxlintrin.h
-   ia32intrin.h
-   immintrin.h
--  intrin.h
--  inttypes.h
-   invpcidintrin.h
--  iso646.h
+--- tools/clang/lib/Headers/CMakeLists.txt.orig
++++ tools/clang/lib/Headers/CMakeLists.txt
+@@ -56,7 +56,6 @@
+   intrin.h
+   inttypes.h
+   iso646.h
 -  limits.h
    lwpintrin.h
    lzcntintrin.h
    mm3dnow.h
-@@ -84,21 +79,11 @@
+@@ -76,21 +75,13 @@
    s390intrin.h
    shaintrin.h
    smmintrin.h
@@ -33,12 +21,12 @@
 -  stdint.h
 -  stdnoreturn.h
    tbmintrin.h
--  tgmath.h
+   tgmath.h
    tmmintrin.h
--  unwind.h
+   unwind.h
    vadefs.h
    vaesintrin.h
 -  varargs.h
    vecintrin.h
    vpclmulqdqintrin.h
-   waitpkgintrin.h
+   wmmintrin.h

Modified: head/devel/llvm-devel/pkg-plist
==============================================================================
--- head/devel/llvm-devel/pkg-plist	Tue Oct 22 18:33:14 2019	(r515207)
+++ head/devel/llvm-devel/pkg-plist	Tue Oct 22 18:40:11 2019	(r515208)
@@ -2843,6 +2843,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/emmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/enqcmdintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/f16cintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/float.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fma4intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fmaintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fxsrintrin.h
@@ -2851,7 +2852,10 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/htmxlintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ia32intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/immintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/inttypes.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/invpcidintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/iso646.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/lwpintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/lzcntintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/mm3dnow.h
@@ -2891,7 +2895,9 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tbmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tgmath.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tmmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/unwind.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vadefs.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vaesintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vecintrin.h