diff options
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 3 | ||||
| -rw-r--r-- | test/Driver/constructors.c | 18 |
2 files changed, 19 insertions, 2 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index b95b8fa99e..a56d37bde1 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -2230,7 +2230,8 @@ Tool &Linux::SelectTool(const Compilation &C, const JobAction &JA, void Linux::addClangTargetOptions(ArgStringList &CC1Args) const { const Generic_GCC::GCCVersion &V = GCCInstallation.getVersion(); - if (V >= Generic_GCC::GCCVersion::Parse("4.7.0")) + if (V >= Generic_GCC::GCCVersion::Parse("4.7.0") || + getTriple().getEnvironment() == llvm::Triple::Android) CC1Args.push_back("-fuse-init-array"); } diff --git a/test/Driver/constructors.c b/test/Driver/constructors.c index ca2cac2293..71f24cf8a5 100644 --- a/test/Driver/constructors.c +++ b/test/Driver/constructors.c @@ -10,5 +10,21 @@ // RUN: --sysroot=%S/Inputs/basic_linux_tree \ // RUN: | FileCheck --check-prefix=CHECK-GCC-4-6 %s - // CHECK-GCC-4-6-NOT: -fuse-init-array + +// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +// RUN: -target arm-unknown-linux-androideabi \ +// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +// RUN: | FileCheck --check-prefix=CHECK-ANDROID %s + +// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +// RUN: -target mipsel-unknown-linux-android \ +// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +// RUN: | FileCheck --check-prefix=CHECK-ANDROID %s + +// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +// RUN: -target i386-unknown-linux-android \ +// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +// RUN: | FileCheck --check-prefix=CHECK-ANDROID %s + +// CHECK-ANDROID: -fuse-init-array |