Skip to content

Commit f1c88d7

Browse files
authored
[flang] Fix fveclib on Darwin (#77605)
Fixes fveclib.f90 and fveclib-codegen.f90 tests, that were failing on Darwin.
1 parent 9edcf7a commit f1c88d7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

clang/lib/Driver/ToolChains/Flang.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,12 +403,10 @@ void Flang::addTargetOptions(const ArgList &Args,
403403
if (A->getValue() == StringRef{"Accelerate"}) {
404404
CmdArgs.push_back("-framework");
405405
CmdArgs.push_back("Accelerate");
406-
A->render(Args, CmdArgs);
407406
}
408407
}
409-
} else {
410-
A->render(Args, CmdArgs);
411408
}
409+
A->render(Args, CmdArgs);
412410
}
413411

414412
if (Triple.isKnownWindowsMSVCEnvironment()) {

flang/test/Driver/fveclib.f90

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
! RUN: %flang -### -c -fveclib=Darwin_libsystem_m %s 2>&1 | FileCheck -check-prefix CHECK-DARWIN_LIBSYSTEM_M %s
66
! RUN: %flang -### -c --target=aarch64-none-none -fveclib=SLEEF %s 2>&1 | FileCheck -check-prefix CHECK-SLEEF %s
77
! RUN: %flang -### -c --target=aarch64-none-none -fveclib=ArmPL %s 2>&1 | FileCheck -check-prefix CHECK-ARMPL %s
8+
! RUN: %flang -### -c --target=aarch64-apple-darwin -fveclib=none %s 2>&1 | FileCheck -check-prefix CHECK-NOLIB-DARWIN %s
89
! RUN: not %flang -c -fveclib=something %s 2>&1 | FileCheck -check-prefix CHECK-INVALID %s
910

1011
! CHECK-NOLIB: "-fveclib=none"
@@ -14,6 +15,7 @@
1415
! CHECK-DARWIN_LIBSYSTEM_M: "-fveclib=Darwin_libsystem_m"
1516
! CHECK-SLEEF: "-fveclib=SLEEF"
1617
! CHECK-ARMPL: "-fveclib=ArmPL"
18+
! CHECK-NOLIB-DARWIN: "-fveclib=none"
1719

1820
! CHECK-INVALID: error: invalid value 'something' in '-fveclib=something'
1921

0 commit comments

Comments
 (0)