svn commit: r461160 - in head/devel/llvm-devel: . files files/clang files/openmp
Brooks Davis
brooks at FreeBSD.org
Wed Feb 7 18:03:26 UTC 2018
Author: brooks
Date: Wed Feb 7 18:03:24 2018
New Revision: 461160
URL: https://svnweb.freebsd.org/changeset/ports/461160
Log:
Switch to EXTRA_PATCHES directories.
Delete unreferenced patches.
No functional changes.
Added:
head/devel/llvm-devel/files/clang/
head/devel/llvm-devel/files/clang/patch-fformat_extensions.diff
- copied unchanged from r461159, head/devel/llvm-devel/files/clang-patch-fformat_extensions.diff
head/devel/llvm-devel/files/clang/patch-fopenmp.diff
- copied unchanged from r461159, head/devel/llvm-devel/files/clang-patch-fopenmp.diff
head/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_clang-format-sublime.py
- copied unchanged from r461159, head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py
head/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_clang-format.py
- copied unchanged from r461159, head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format.py
head/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_git-clang-format
- copied unchanged from r461159, head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_git-clang-format
head/devel/llvm-devel/files/openmp/
head/devel/llvm-devel/files/openmp/patch-bug32279
- copied unchanged from r461159, head/devel/llvm-devel/files/openmp-patch-bug32279
Deleted:
head/devel/llvm-devel/files/clang-patch-fformat_extensions.diff
head/devel/llvm-devel/files/clang-patch-fopenmp.diff
head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py
head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format.py
head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_git-clang-format
head/devel/llvm-devel/files/compiler-rt-patch-canonical-syscalls
head/devel/llvm-devel/files/compiler-rt-patch-ino64
head/devel/llvm-devel/files/openmp-patch-bug32279
head/devel/llvm-devel/files/openmp-patch-tools_openmp_libomptarget_CMakeLists.txt
Modified:
head/devel/llvm-devel/Makefile
Modified: head/devel/llvm-devel/Makefile
==============================================================================
--- head/devel/llvm-devel/Makefile Wed Feb 7 17:52:31 2018 (r461159)
+++ head/devel/llvm-devel/Makefile Wed Feb 7 18:03:24 2018 (r461160)
@@ -59,12 +59,7 @@ OPTIONS_SUB= yes
PLIST_FILES=
CLANG_DESC= Build clang
-CLANG_EXTRA_PATCHES= \
- ${PATCHDIR}/clang-patch-fformat_extensions.diff \
- ${PATCHDIR}/clang-patch-fopenmp.diff \
- ${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py \
- ${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py \
- ${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_git-clang-format
+CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang
CLANG_CONFLICTS_INSTALL= clang-devel-3.[1234567]*
CLANG_GH_PROJECT= clang:clang
CLANG_GH_SUBDIR= tools/clang:clang
@@ -104,8 +99,7 @@ OPENMP_CONFLICTS_INSTALL= libiomp5-devel-*
OPENMP_GH_PROJECT= openmp:openmp
OPENMP_GH_SUBDIR= projects/openmp:openmp
OPENMP_GH_TAGNAME= ${OPENMP_COMMIT}:openmp
-OPENMP_EXTRA_PATCHES= \
- ${PATCHDIR}/openmp-patch-bug32279
+OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp
GOLD_DESC= Build the LLVM Gold plugin for LTO
GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils
Copied: head/devel/llvm-devel/files/clang/patch-fformat_extensions.diff (from r461159, head/devel/llvm-devel/files/clang-patch-fformat_extensions.diff)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/llvm-devel/files/clang/patch-fformat_extensions.diff Wed Feb 7 18:03:24 2018 (r461160, copy of r461159, head/devel/llvm-devel/files/clang-patch-fformat_extensions.diff)
@@ -0,0 +1,45 @@
+diff -ruN tools/clang/include/clang/Basic/LangOptions.def tools/clang/include/clang/Basic/LangOptions.def
+--- tools/clang/include/clang/Basic/LangOptions.def 2015-08-18 08:10:39 UTC
++++ tools/clang/include/clang/Basic/LangOptions.def
+@@ -114,6 +114,7 @@
+ LANGOPT(RTTIData , 1, 1, "emit run-time type information data")
+ LANGOPT(MSBitfields , 1, 0, "Microsoft-compatible structure layout")
+ LANGOPT(Freestanding, 1, 0, "freestanding implementation")
++LANGOPT(FormatExtensions , 1, 0, "FreeBSD format extensions")
+ LANGOPT(NoBuiltin , 1, 0, "disable builtin functions")
+ LANGOPT(NoMathBuiltin , 1, 0, "disable math builtin functions")
+ LANGOPT(GNUAsm , 1, 1, "GNU-style inline assembly")
+diff -ruN tools/clang/include/clang/Driver/Options.td tools/clang/include/clang/Driver/Options.td
+--- tools/clang/include/clang/Driver/Options.td 2015-08-18 08:10:39 UTC
++++ tools/clang/include/clang/Driver/Options.td
+@@ -660,6 +660,8 @@
+
+ def ffreestanding : Flag<["-"], "ffreestanding">, Group<f_Group>, Flags<[CC1Option]>,
+ HelpText<"Assert that the compilation takes place in a freestanding environment">;
++def fformat_extensions: Flag<["-"], "fformat-extensions">, Group<f_Group>, Flags<[CC1Option]>,
++ HelpText<"Enable FreeBSD kernel specific format string extensions">;
+ def fgnu_keywords : Flag<["-"], "fgnu-keywords">, Group<f_Group>, Flags<[CC1Option]>,
+ HelpText<"Allow GNU-extension keywords regardless of language standard">;
+ def fgnu89_inline : Flag<["-"], "fgnu89-inline">, Group<f_Group>, Flags<[CC1Option]>,
+diff -ruN tools/clang/lib/Driver/ToolChains/Clang.cpp tools/clang/lib/Driver/ToolChains/Clang.cpp
+--- tools/clang/lib/Driver/ToolChains/Clang.cpp.orig 2017-03-27 21:06:42.969177000 +0000
++++ tools/clang/lib/Driver/ToolChains/Clang.cpp 2017-03-27 21:07:03.523370000 +0000
+@@ -3188,6 +3188,7 @@
+
+ // Forward -f (flag) options which we can pass directly.
+ Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls);
++ Args.AddLastArg(CmdArgs, options::OPT_fformat_extensions);
+ Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions);
+ Args.AddLastArg(CmdArgs, options::OPT_fno_operator_names);
+ // Emulated TLS is enabled by default on Android, and can be enabled manually
+diff -ruN tools/clang/lib/Frontend/CompilerInvocation.cpp tools/clang/lib/Frontend/CompilerInvocation.cpp
+--- tools/clang/lib/Frontend/CompilerInvocation.cpp 2015-08-18 08:10:39 UTC
++++ tools/clang/lib/Frontend/CompilerInvocation.cpp
+@@ -1559,6 +1559,7 @@
+ Opts.ShortWChar = Args.hasFlag(OPT_fshort_wchar, OPT_fno_short_wchar, false);
+ Opts.ShortEnums = Args.hasArg(OPT_fshort_enums);
+ Opts.Freestanding = Args.hasArg(OPT_ffreestanding);
++ Opts.FormatExtensions = Args.hasArg(OPT_fformat_extensions);
+ Opts.NoBuiltin = Args.hasArg(OPT_fno_builtin) || Opts.Freestanding;
+ Opts.NoMathBuiltin = Args.hasArg(OPT_fno_math_builtin);
+ Opts.AssumeSaneOperatorNew = !Args.hasArg(OPT_fno_assume_sane_operator_new);
Copied: head/devel/llvm-devel/files/clang/patch-fopenmp.diff (from r461159, head/devel/llvm-devel/files/clang-patch-fopenmp.diff)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/llvm-devel/files/clang/patch-fopenmp.diff Wed Feb 7 18:03:24 2018 (r461160, copy of r461159, head/devel/llvm-devel/files/clang-patch-fopenmp.diff)
@@ -0,0 +1,14 @@
+--- tools/clang/lib/Driver/ToolChains/CommonArgs.cpp.orig 2017-05-10 17:18:56.000000000 +0000
++++ tools/clang/lib/Driver/ToolChains/CommonArgs.cpp 2017-05-10 23:01:17.087686000 +0000
+@@ -441,7 +441,10 @@
+
+ switch (TC.getDriver().getOpenMPRuntime(Args)) {
+ case Driver::OMPRT_OMP:
+- CmdArgs.push_back("-lomp");
++ if (TC.getTriple().getOS() != llvm::Triple::FreeBSD || TC.isCrossCompiling() || !llvm::sys::fs::exists("%%LLVM_PREFIX%%/lib/libomp.so"))
++ CmdArgs.push_back("-lomp");
++ else
++ CmdArgs.push_back("%%LLVM_PREFIX%%/lib/libomp.so");
+ break;
+ case Driver::OMPRT_GOMP:
+ CmdArgs.push_back("-lgomp");
Copied: head/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_clang-format-sublime.py (from r461159, head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_clang-format-sublime.py Wed Feb 7 18:03:24 2018 (r461160, copy of r461159, head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py)
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- tools/clang/tools/clang-format/clang-format-sublime.py.orig
++++ tools/clang/tools/clang-format/clang-format-sublime.py
+@@ -18,7 +18,7 @@
+ import subprocess
+
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = 'clang-format%%LLVM_SUFFIX%%'
+
+ # Change this to format according to other formatting styles. See the output of
+ # 'clang-format --help' for a list of supported styles. The default looks for
Copied: head/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_clang-format.py (from r461159, head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format.py)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_clang-format.py Wed Feb 7 18:03:24 2018 (r461160, copy of r461159, head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format.py)
@@ -0,0 +1,11 @@
+--- tools/clang/tools/clang-format/clang-format.py.orig 2015-09-08 20:44:00 UTC
++++ tools/clang/tools/clang-format/clang-format.py
+@@ -34,7 +34,7 @@ import vim
+
+ # set g:clang_format_path to the path to clang-format if it is not on the path
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = 'clang-format%%LLVM_SUFFIX%%'
+ if vim.eval('exists("g:clang_format_path")') == "1":
+ binary = vim.eval('g:clang_format_path')
+
Copied: head/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_git-clang-format (from r461159, head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_git-clang-format)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_git-clang-format Wed Feb 7 18:03:24 2018 (r461160, copy of r461159, head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_git-clang-format)
@@ -0,0 +1,32 @@
+
+$FreeBSD$
+
+--- tools/clang/tools/clang-format/git-clang-format.orig
++++ tools/clang/tools/clang-format/git-clang-format
+@@ -90,7 +90,7 @@
+ usage=usage, formatter_class=argparse.RawDescriptionHelpFormatter,
+ description=desc)
+ p.add_argument('--binary',
+- default=config.get('clangformat.binary', 'clang-format'),
++ default=config.get('clangformat.binary', 'clang-format%%LLVM_SUFFIX%%'),
+ help='path to clang-format'),
+ p.add_argument('--commit',
+ default=config.get('clangformat.commit', 'HEAD'),
+@@ -344,7 +344,7 @@
+
+
+ def run_clang_format_and_save_to_tree(changed_lines, revision=None,
+- binary='clang-format', style=None):
++ binary='clang-format%%LLVM_SUFFIX%%', style=None):
+ """Run clang-format on each file and save the result to a git tree.
+
+ Returns the object ID (SHA-1) of the created tree."""
+@@ -397,7 +397,7 @@
+
+
+ def clang_format_to_blob(filename, line_ranges, revision=None,
+- binary='clang-format', style=None):
++ binary='clang-format%%LLVM_SUFFIX%%', style=None):
+ """Run clang-format on the given file and save the result to a git blob.
+
+ Runs on the file in `revision` if not None, or on the file in the working
Copied: head/devel/llvm-devel/files/openmp/patch-bug32279 (from r461159, head/devel/llvm-devel/files/openmp-patch-bug32279)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/llvm-devel/files/openmp/patch-bug32279 Wed Feb 7 18:03:24 2018 (r461160, copy of r461159, head/devel/llvm-devel/files/openmp-patch-bug32279)
@@ -0,0 +1,29 @@
+--- projects/openmp/runtime/cmake/LibompHandleFlags.cmake.orig 2017-03-16 15:50:48 UTC
++++ projects/openmp/runtime/cmake/LibompHandleFlags.cmake
+@@ -156,6 +156,11 @@ function(libomp_get_libflags libflags)
+ if(${IA32})
+ libomp_append(libflags_local -lirc_pic LIBOMP_HAVE_IRC_PIC_LIBRARY)
+ endif()
++ IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++ libomp_append(libflags_local "-Wl,--no-as-needed" LIBOMP_HAVE_AS_NEEDED_FLAG)
++ libomp_append(libflags_local "-lm")
++ libomp_append(libflags_local "-Wl,--as-needed" LIBOMP_HAVE_AS_NEEDED_FLAG)
++ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ IF(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+ libomp_append(libflags_local -lm)
+ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+ runtime/cmake/LibompHandleFlags.cmake | 5 +++++
+ runtime/cmake/LibompMicroTests.cmake | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+--- projects/openmp/runtime/cmake/LibompMicroTests.cmake.orig 2017-03-16 15:50:48 UTC
++++ projects/openmp/runtime/cmake/LibompMicroTests.cmake
+@@ -171,7 +171,7 @@ add_custom_command(
+ add_custom_target(libomp-test-deps DEPENDS test-deps/.success)
+ set(libomp_expected_library_deps)
+ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+- set(libomp_expected_library_deps libc.so.7 libthr.so.3)
++ set(libomp_expected_library_deps libc.so.7 libthr.so.3 libm.so.5)
+ libomp_append(libomp_expected_library_deps libhwloc.so.5 LIBOMP_USE_HWLOC)
+ elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
+ set(libomp_expected_library_deps libc.so.12 libpthread.so.1 libm.so.0)
More information about the svn-ports-head
mailing list