Mercurial > mxe-octave
annotate src/msvc-llvm-1.patch @ 4114:02c9f7e9792e
merge away extra head on default
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 23 Mar 2016 08:50:22 -0400 |
parents | 772d03100c0a |
children |
rev | line source |
---|---|
3140
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1 diff -ur llvm-3.1.src-orig/cmake/modules/LLVM-Config.cmake llvm-3.1.src/cmake/modules/LLVM-Config.cmake |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
2 --- llvm-3.1.src-orig/cmake/modules/LLVM-Config.cmake 2011-11-29 01:31:52 +0000 |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
3 +++ llvm-3.1.src/cmake/modules/LLVM-Config.cmake 2012-08-02 09:05:16 +0100 |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
4 @@ -11,6 +11,8 @@ |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
5 set(system_libs ${system_libs} pthread) |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
6 endif() |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
7 endif( MINGW ) |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
8 + else() |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
9 + set(system_libs ${system_libs} ffi shell32) |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
10 endif( NOT MSVC ) |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
11 set(${return_var} ${system_libs} PARENT_SCOPE) |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
12 endfunction(get_system_libs) |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
13 diff -ur llvm-3.1.src-orig/include/llvm/Support/DataTypes.h.cmake llvm-3.1.src/include/llvm/Support/DataTypes.h.cmake |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
14 --- llvm-3.1.src-orig/include/llvm/Support/DataTypes.h.cmake 2012-03-11 01:20:23 +0000 |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
15 +++ llvm-3.1.src/include/llvm/Support/DataTypes.h.cmake 2012-08-02 09:05:41 +0100 |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
16 @@ -113,7 +113,9 @@ |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
17 typedef unsigned short uint16_t; |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
18 typedef signed char int8_t; |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
19 typedef unsigned char uint8_t; |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
20 +#ifndef ssize_t |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
21 typedef signed int ssize_t; |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
22 +#endif |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
23 #ifndef INT8_MAX |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
24 # define INT8_MAX 127 |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
25 #endif |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
26 diff -ur llvm-3.1.src-orig/include/llvm/Support/DataTypes.h.in llvm-3.1.src/include/llvm/Support/DataTypes.h.in |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
27 --- llvm-3.1.src-orig/include/llvm/Support/DataTypes.h.in 2011-11-05 09:45:17 +0000 |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
28 +++ llvm-3.1.src/include/llvm/Support/DataTypes.h.in 2012-08-02 09:05:16 +0100 |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
29 @@ -110,7 +110,9 @@ |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
30 typedef unsigned short uint16_t; |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
31 typedef signed char int8_t; |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
32 typedef unsigned char uint8_t; |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
33 +#ifndef ssize_t |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
34 typedef signed int ssize_t; |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
35 +#endif |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
36 #ifndef INT8_MAX |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
37 # define INT8_MAX 127 |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
38 #endif |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
39 diff -ur llvm-3.1.src-orig/tools/CMakeLists.txt llvm-3.1.src/tools/CMakeLists.txt |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
40 --- llvm-3.1.src-orig/tools/CMakeLists.txt 2012-03-01 01:36:50 +0000 |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
41 +++ llvm-3.1.src/tools/CMakeLists.txt 2012-08-02 09:05:16 +0100 |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
42 @@ -15,6 +15,7 @@ |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
43 # on pure Win32. |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
44 add_subdirectory(llvm-config) |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
45 endif() |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
46 +add_subdirectory(llvm-config) |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
47 |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
48 add_subdirectory(opt) |
772d03100c0a
[MSVC] enable LLVM compilation (and upgrade to LLVM-3.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
49 add_subdirectory(llvm-as) |