Skip to content

Commit 594c031

Browse files
committed
Update the LIT test.
1 parent acb669c commit 594c031

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
! AIX64-LD-PER-TARGET-SHARED-SAME: "-b64"
5757
! AIX64-LD-PER-TARGET-SHARED-SAME: "-bpT:0x100000000" "-bpD:0x110000000"
5858
! AIX64-LD-PER-TARGET-SHARED-SAME: "-lc"
59-
! AIX64-LD-PER-TARGET-SHARED-SAME: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64-ibm-aix{{/|\\\\}}libflang_rt.runtime.a"
59+
! AIX64-LD-PER-TARGET-SHARED-SAME: "-lflang_rt.runtime"
6060
! AIX64-LD-PER-TARGET-SHARED-SAME: "-lm"
6161
! AIX64-LD-PER-TARGET-SHARED-SAME: "-lpthread"
6262

@@ -71,7 +71,7 @@
7171
! LOP64-LD-PER-TARGET-DEFAULT-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
7272
! LOP64-LD-PER-TARGET-DEFAULT: "{{.*}}ld{{(.exe)?}}"
7373
! LOP64-LD-PER-TARGET-DEFAULT-NOT: "-bnso"
74-
! LOP64-LD-PER-TARGET-DEFAULT-SAME: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64le-unknown-linux-gnu{{/|\\\\}}libflang_rt.runtime.so"
74+
! LOP64-LD-PER-TARGET-DEFAULT-SAME: "-lflang_rt.runtime"
7575
! LOP64-LD-PER-TARGET-DEFAULT-SAME: "-lm"
7676
! LOP64-LD-PER-TARGET-DEFAULT-SAME: "-lc"
7777

@@ -100,7 +100,7 @@
100100
! LOP64-LD-PER-TARGET-SHARED: "-fc1" "-triple" "powerpc64le-unknown-linux-gnu"
101101
! LOP64-LD-PER-TARGET-SHARED-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
102102
! LOP64-LD-PER-TARGET-SHARED: "{{.*}}ld{{(.exe)?}}"
103-
! AIX64-LD-PER-TARGET-NOT: "-bnso"
104-
! LOP64-LD-PER-TARGET-SHARED-SAME: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64le-unknown-linux-gnu{{/|\\\\}}libflang_rt.runtime.so"
103+
! LOP64-LD-PER-TARGET-SHARED-NOT: "-bnso"
104+
! LOP64-LD-PER-TARGET-SHARED-SAME: "-lflang_rt.runtime"
105105
! LOP64-LD-PER-TARGET-SHARED-SAME: "-lm"
106106
! LOP64-LD-PER-TARGET-SHARED-SAME: "-lc"

flang/test/Driver/linker-flags.f90

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,38 +44,37 @@
4444
! SOLARIS-F128NONE-NOT: flang_rt.quadmath
4545
! UNIX-F128LIBQUADMATH-SAME: "-lflang_rt.quadmath" "--as-needed" "-lquadmath" "--no-as-needed"
4646
! SOLARIS-F128LIBQUADMATH-SAME: "-lflang_rt.quadmath" "-z" "ignore" "-lquadmath" "-z" "record"
47-
! UNIX-SAME: "{{.*}}{{\\|/}}libflang_rt.runtime.so"
48-
! UNIX-SAME: "-lm"
47+
! UNIX-SAME: "-lflang_rt.runtime" "-lm"
4948
! COMPILER-RT: "{{.*}}{{\\|/}}libclang_rt.builtins.a"
5049
! UNIX-STATIC-FLANGRT: "{{.*}}{{\\|/}}libflang_rt.runtime.a"
5150

5251
! BSD-LABEL: "{{.*}}ld{{(\.exe)?}}"
5352
! BSD-SAME: "[[object_file]]"
5453
! BSD-F128NONE-NOT: flang_rt.quadmath
5554
! BSD-F128LIBQUADMATH-SAME: "-lflang_rt.quadmath" "--as-needed" "-lquadmath" "--no-as-needed"
56-
! BSD-SAME: "{{.*}}{{\\|/}}libflang_rt.runtime.so"
55+
! BSD-SAME: -lflang_rt.runtime
5756
! BSD-SAME: "-lexecinfo"
5857
! BSD-STATIC-FLANGRT: "{{.*}}{{\\|/}}libflang_rt.runtime.a"
5958

6059
! DARWIN-LABEL: "{{.*}}ld{{(\.exe)?}}"
6160
! DARWIN-SAME: "[[object_file]]"
6261
! DARWIN-F128NONE-NOT: libflang_rt.quadmath
6362
! DARWIN-F128LIBQUADMATH-SAME: "-lflang_rt.quadmath" "--as-needed" "-lquadmath" "--no-as-needed"
64-
! DARWIN-SAME: "{{.*}}{{\\|/}}libclang_rt.runtime_osx_dynamic.dylib"
63+
! DARWIN-SAME: -lflang_rt.runtime
6564
! DARWIN-STATIC-FLANGRT: "{{.*}}{{\\|/}}libclang_rt.runtime_osx.a"
6665

6766
! HAIKU-LABEL: "{{.*}}ld{{(\.exe)?}}"
6867
! HAIKU-SAME: "[[object_file]]"
6968
! HAIKU-F128NONE-NOT: libflang_rt.quadmath
7069
! HAIKU-F128LIBQUADMATH-SAME: "-lflang_rt.quadmath" "--as-needed" "-lquadmath" "--no-as-needed"
71-
! HAIKU-SAME: "{{.*}}{{\\|/}}libflang_rt.runtime.so"
70+
! HAIKU-SAME: -lflang_rt.runtime
7271
! HAIKU-STATIC-FLANGRT: "{{.*}}{{\\|/}}libflang_rt.runtime.a"
7372

7473
! MINGW-LABEL: "{{.*}}ld{{(\.exe)?}}"
7574
! MINGW-SAME: "[[object_file]]"
7675
! MINGW-F128NONE-NOT: libflang_rt.quadmath
7776
! MINGW-F128LIBQUADMATH-SAME: "-lflang_rt.quadmath" "--as-needed" "-lquadmath" "--no-as-needed"
78-
! MINGW-SAME: "{{.*}}{{\\|/}}libflang_rt.runtime.dll.a"
77+
! MINGW-SAME: -lflang_rt.runtime
7978
! MINGW-STATIC-FLANGRT: "{{.*}}{{\\|/}}libflang_rt.runtime.a"
8079

8180
! NOTE: This also matches lld-link (when CLANG_DEFAULT_LINKER=lld) and

0 commit comments

Comments
 (0)