Skip to content

Commit 3625264

Browse files
committed
Address review comments.
1 parent fc5821a commit 3625264

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

clang/lib/Driver/ToolChain.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -854,8 +854,8 @@ void ToolChain::addFortranRuntimeLibraryPath(const llvm::opt::ArgList &Args,
854854

855855
void ToolChain::addFlangRTLibPath(const ArgList &Args,
856856
llvm::opt::ArgStringList &CmdArgs) const {
857-
// Link static flang_rt.runtime.a or shared flang_rt.runtime.so
858-
// On AIX, default to static flang-rt
857+
// Link static flang_rt.runtime.a or shared flang_rt.runtime.so.
858+
// On AIX, default to static flang-rt.
859859
if (Args.hasFlag(options::OPT_static_libflangrt,
860860
options::OPT_shared_libflangrt, getTriple().isOSAIX()))
861861
CmdArgs.push_back(

flang/test/Driver/flang-ld-powerpc.f90

+8-14
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
!! resource_dir_with_per_target_subdir as inputs.
99

1010
! Check powerpc64-ibm-aix 64-bit linking to static flang-rt by default
11-
! RUN: %flang %s -### 2>&1 \
11+
! RUN: %flang -Werror %s -### 2>&1 \
1212
! RUN: --target=powerpc64-ibm-aix \
1313
! RUN: -resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_per_target_subdir \
1414
! RUN: | FileCheck %s --check-prefix=AIX64-LD-PER-TARGET-DEFAULT
1515

16-
! AIX64-LD-PER-TARGET-DEFAULT-NOT: warning:
1716
! AIX64-LD-PER-TARGET-DEFAULT: "-fc1" "-triple" "powerpc64-ibm-aix"
1817
! AIX64-LD-PER-TARGET-DEFAULT-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
1918
! AIX64-LD-PER-TARGET-DEFAULT: "{{.*}}ld{{(.exe)?}}"
@@ -27,12 +26,11 @@
2726

2827

2928
! Check powerpc64-ibm-aix 64-bit linking to static flang-rt by option
30-
! RUN: %flang -static-libflangrt %s -### 2>&1 \
29+
! RUN: %flang -static-libflangrt -Werror %s -### 2>&1 \
3130
! RUN: --target=powerpc64-ibm-aix \
3231
! RUN: -resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_per_target_subdir \
3332
! RUN: | FileCheck %s --check-prefix=AIX64-LD-PER-TARGET-STATIC
3433

35-
! AIX64-LD-PER-TARGET-STATIC-NOT: warning:
3634
! AIX64-LD-PER-TARGET-STATIC: "-fc1" "-triple" "powerpc64-ibm-aix"
3735
! AIX64-LD-PER-TARGET-STATIC-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
3836
! AIX64-LD-PER-TARGET-STATIC: "{{.*}}ld{{(.exe)?}}"
@@ -46,12 +44,11 @@
4644

4745

4846
! Check powerpc64-ibm-aix 64-bit linking to shared flang-rt by option
49-
! RUN: %flang -shared-libflangrt %s -### 2>&1 \
47+
! RUN: %flang -shared-libflangrt -Werror %s -### 2>&1 \
5048
! RUN: --target=powerpc64-ibm-aix \
5149
! RUN: -resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_per_target_subdir \
5250
! RUN: | FileCheck %s --check-prefix=AIX64-LD-PER-TARGET-SHARED
5351

54-
! AIX64-LD-PER-TARGET-SHARED-NOT: warning:
5552
! AIX64-LD-PER-TARGET-SHARED: "-fc1" "-triple" "powerpc64-ibm-aix"
5653
! AIX64-LD-PER-TARGET-SHARED-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
5754
! AIX64-LD-PER-TARGET-SHARED: "{{.*}}ld{{(.exe)?}}"
@@ -65,12 +62,11 @@
6562

6663

6764
! Check powerpc64le-unknown-linux-gnu 64-bit linking to shared flang-rt by default
68-
! RUN: %flang %s -### 2>&1 \
65+
! RUN: %flang -Werror %s -### 2>&1 \
6966
! RUN: --target=powerpc64le-unknown-linux-gnu \
7067
! RUN: -resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_per_target_subdir \
7168
! RUN: | FileCheck %s --check-prefixes=LOP64-LD-PER-TARGET-DEFAULT
7269

73-
! LOP64-LD-PER-TARGET-DEFAULT-NOT: warning:
7470
! LOP64-LD-PER-TARGET-DEFAULT: "-fc1" "-triple" "powerpc64le-unknown-linux-gnu"
7571
! LOP64-LD-PER-TARGET-DEFAULT-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
7672
! LOP64-LD-PER-TARGET-DEFAULT: "{{.*}}ld{{(.exe)?}}"
@@ -80,13 +76,12 @@
8076
! LOP64-LD-PER-TARGET-DEFAULT-SAME: "-lc"
8177

8278

83-
! Check powerpc64le-unknown-linux-gnu 64-bit linking to static flang-rt
84-
! RUN: %flang -static-libflangrt %s -### 2>&1 \
79+
! Check powerpc64le-unknown-linux-gnu 64-bit linking to static flang-rt by option
80+
! RUN: %flang -static-libflangrt -Werror %s -### 2>&1 \
8581
! RUN: --target=powerpc64le-unknown-linux-gnu \
8682
! RUN: -resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_per_target_subdir \
8783
! RUN: | FileCheck %s --check-prefixes=LOP64-LD-PER-TARGET-STATIC
8884

89-
! LOP64-LD-PER-TARGET-STATIC-NOT: warning:
9085
! LOP64-LD-PER-TARGET-STATIC: "-fc1" "-triple" "powerpc64le-unknown-linux-gnu"
9186
! LOP64-LD-PER-TARGET-STATIC-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
9287
! LOP64-LD-PER-TARGET-STATIC: "{{.*}}ld{{(.exe)?}}"
@@ -96,13 +91,12 @@
9691
! LOP64-LD-PER-TARGET-STATIC-SAME: "-lc"
9792

9893

99-
! Check powerpc64le-unknown-linux-gnu 64-bit linking to shared flang-rt
100-
! RUN: %flang -shared-libflangrt %s -### 2>&1 \
94+
! Check powerpc64le-unknown-linux-gnu 64-bit linking to shared flang-rt by option
95+
! RUN: %flang -shared-libflangrt -Werror %s -### 2>&1 \
10196
! RUN: --target=powerpc64le-unknown-linux-gnu \
10297
! RUN: -resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_per_target_subdir \
10398
! RUN: | FileCheck %s --check-prefixes=LOP64-LD-PER-TARGET-SHARED
10499

105-
! LOP64-LD-PER-TARGET-SHARED-NOT: warning:
106100
! LOP64-LD-PER-TARGET-SHARED: "-fc1" "-triple" "powerpc64le-unknown-linux-gnu"
107101
! LOP64-LD-PER-TARGET-SHARED-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
108102
! LOP64-LD-PER-TARGET-SHARED: "{{.*}}ld{{(.exe)?}}"

0 commit comments

Comments
 (0)