Mercurial > mxe-octave

annotate src/mingw-llvm-1-config.patch @ 5544:e2582a427c2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/proj.mk: update to v7.1.1
author John Donoghue <john.donoghue@ieee.org>
date Tue, 22 Sep 2020 09:04:50 -0400
parents 0e70b5b31362
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5489
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 diff --git "a/tools/llvm-config/llvm-config.cpp" "b/tools/llvm-config/llvm-config.cpp"
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 index 08b096a..a35422e 100644
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 --- "a/tools/llvm-config/llvm-config.cpp"
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 +++ "b/tools/llvm-config/llvm-config.cpp"
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 @@ -352,14 +352,16 @@ int main(int argc, char **argv) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 StringRef SharedExt, SharedVersionedExt, SharedDir, SharedPrefix, StaticExt,
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 StaticPrefix, StaticDir = "lib", DirSep = "/";
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 const Triple HostTriple(Triple::normalize(LLVM_HOST_TRIPLE));
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 - if (HostTriple.isOSWindows()) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 + const Triple TargetTriple(Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE));
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 + if (TargetTriple.isOSWindows()) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 SharedExt = "dll";
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 SharedVersionedExt = LLVM_DYLIB_VERSION ".dll";
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 - if (HostTriple.isOSCygMing()) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 + if (TargetTriple.isOSCygMing()) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 StaticExt = "a";
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 StaticPrefix = "lib";
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 } else {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 StaticExt = "lib";
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 + if (HostTriple.isOSWindows()) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 DirSep = "\\";
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 std::replace(ActiveObjRoot.begin(), ActiveObjRoot.end(), '/', '\\');
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 std::replace(ActivePrefix.begin(), ActivePrefix.end(), '/', '\\');
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 @@ -368,10 +370,11 @@ int main(int argc, char **argv) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 std::replace(ActiveCMakeDir.begin(), ActiveCMakeDir.end(), '/', '\\');
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 std::replace(ActiveIncludeOption.begin(), ActiveIncludeOption.end(), '/',
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 '\\');
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 + }
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 }
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 SharedDir = ActiveBinDir;
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 StaticDir = ActiveLibDir;
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 - } else if (HostTriple.isOSDarwin()) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33 + } else if (TargetTriple.isOSDarwin()) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 SharedExt = "dylib";
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 SharedVersionedExt = LLVM_DYLIB_VERSION ".dylib";
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 StaticExt = "a";
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 @@ -386,7 +389,7 @@ int main(int argc, char **argv) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 StaticPrefix = SharedPrefix = "lib";
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 }
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 - const bool BuiltDyLib = !!LLVM_ENABLE_DYLIB;
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42 + const bool BuiltDyLib = true;
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
43
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
44 /// CMake style shared libs, ie each component is in a shared library.
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
45 const bool BuiltSharedLibs = !!LLVM_ENABLE_SHARED;
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
46 @@ -398,7 +401,7 @@ int main(int argc, char **argv) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
47 // If LLVM_LINK_DYLIB is ON, the single shared library will be returned
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
48 // for "--libs", etc, if they exist. This behaviour can be overridden with
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
49 // --link-static or --link-shared.
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
50 - bool LinkDyLib = !!LLVM_LINK_DYLIB;
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
51 + bool LinkDyLib = true;
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
52
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
53 if (BuiltDyLib) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
54 std::string path((SharedDir + DirSep + DyLibName).str());
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
55 @@ -670,7 +673,7 @@ int main(int argc, char **argv) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
56 } else if (PrintLibs) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
57 // On Windows, output full path to library without parameters.
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
58 // Elsewhere, if this is a typical library name, include it using -l.
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
59 - if (HostTriple.isWindowsMSVCEnvironment()) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
60 + if (TargetTriple.isWindowsMSVCEnvironment()) {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
61 OS << GetComponentLibraryPath(Lib, Shared);
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
62 } else {
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
63 StringRef LibName;
0e70b5b31362 Update LLVM to v7.0.0 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
64