Skip to content

Commit 936dbbe

Browse files
authored
Merge pull request #134 from ThePortlandGroup/nv_stage
Pull 2017-07-12T08-34 Recent NVIDIA Changes
2 parents 723f139 + 5a5a8cd commit 936dbbe

File tree

4 files changed

+559
-41
lines changed

4 files changed

+559
-41
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Flang is a Fortran compiler targeting LLVM.
55

66
## Prerequisites
77

8-
Building LLVM requires fairly modern compiler toolchain and CMake, check [Getting started with LLVM](http://llvm.org/releases/3.9.0/docs/GettingStarted.html#host-c-toolchain-both-compiler-and-standard-library) and [Building LLVM with CMake][llvm-cmake] for the full list.
8+
Building LLVM requires fairly modern compiler toolchain and CMake, check [Getting started with LLVM](http://llvm.org/releases/4.0.0/docs/GettingStarted.html#host-c-toolchain-both-compiler-and-standard-library) and [Building LLVM with CMake][llvm-cmake] for the full list.
99

1010
## Dependencies
1111

@@ -29,7 +29,7 @@ Flang is developed outside of the llvm source tree.
2929

3030
#### Step-by-step instructions
3131

32-
1. Get LLVM 3.9, build and install it according to [instructions][llvm-cmake]
32+
1. Get LLVM 4.0, build and install it according to [instructions][llvm-cmake]
3333
```
3434
cd where/you/want/to/build
3535
git clone https://github.com/llvm-mirror/llvm.git
@@ -41,7 +41,7 @@ Flang is developed outside of the llvm source tree.
4141
sudo make install
4242
```
4343

44-
2. Get the modified clang for flang, build and install it (3.9)
44+
2. Get the modified clang for flang, build and install it (4.0)
4545
```
4646
cd where/you/want/to/build
4747
git clone https://github.com/flang-compiler/clang.git
@@ -53,7 +53,7 @@ Flang is developed outside of the llvm source tree.
5353
sudo make install
5454
```
5555

56-
3. Build and install openmp-llvm (3.9)
56+
3. Build and install openmp-llvm (4.0)
5757
```
5858
cd where/you/want/to/build
5959
git clone https://github.com/llvm-mirror/openmp.git
@@ -76,13 +76,13 @@ Flang is developed outside of the llvm source tree.
7676
sudo make install
7777
```
7878

79-
[llvm-cmake]: http://llvm.org/releases/3.9.0/docs/CMake.html
79+
[llvm-cmake]: http://llvm.org/releases/4.0.0/docs/CMake.html
8080

8181
## Using Flang
8282

8383
To test your installation, create a simple "hello world" program, like the following:
8484

85-
```
85+
``s`
8686
program hello
8787
print *, 'hello world'
8888
end
@@ -108,7 +108,7 @@ For a list of compiler options, enter
108108
% flang -help
109109
```
110110
111-
The Flang compiler supports accepts all clang 3.9 compiler options and supports many, as well as the following flang-specific compiler options:
111+
The Flang compiler supports accepts all clang 4.0 compiler options and supports many, as well as the following flang-specific compiler options:
112112
113113
```lang-none
114114
-noFlangLibs Do not link against Flang libraries

tools/flang2/flang2exe/expand.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,11 @@ LOGICAL exp_end_atomic(int, int);
337337
#ifdef PD_IS_ATOMIC
338338
bool exp_atomic_intrinsic(PD_KIND pd, ILM *ilmp, int curilm);
339339
#endif
340-
void exp_mp_atomic_read(ILM *);
341-
void exp_mp_atomic_write(ILM *);
342-
void exp_mp_atomic_update(ILM *);
343-
void exp_mp_atomic_capture(ILM *);
340+
extern void exp_mp_atomic_read(ILM *);
341+
extern void exp_mp_atomic_write(ILM *);
342+
extern void exp_mp_atomic_update(ILM *);
343+
extern void exp_mp_atomic_capture(ILM *);
344+
extern void ldst_msz(DTYPE, ILI_OP *, ILI_OP *, MSZ *);
344345
#endif /* EXPANDER_DECLARE_INTERNAL */
345346

346347
int gethost_dumlen(int arg, ISZ_T address);

0 commit comments

Comments
 (0)