From 1d8cc65a9b8c1a49bbce8ad7eb705a6fe01286fe Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Mon, 19 Nov 2012 11:45:31 +0000 Subject: [PATCH] Enable -fuse-init-array for Android X86/MIPS. The dynamic linker of Android does not support .ctors/.dtors. We should emit .init_array and .fini_array regardless the gcc version. NOTE: This patch does not affect the ARM backend, because it is required to generate .init_array and .fini_array for program targeting ARM AAPCS and AEABI. llvm-svn: 168309 --- clang/lib/Driver/ToolChains.cpp | 3 ++- clang/test/Driver/constructors.c | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index b95b8fa..a56d37b 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/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/clang/test/Driver/constructors.c b/clang/test/Driver/constructors.c index ca2cac2..71f24cf 100644 --- a/clang/test/Driver/constructors.c +++ b/clang/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 -- 2.7.4