diff options
| -rw-r--r-- | lib/Driver/Tools.cpp | 14 | ||||
| -rw-r--r-- | test/Driver/linux-ld.c | 3 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index e37959be4e..5f483bd123 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -5857,12 +5857,12 @@ void linuxtools::Assemble::ConstructJob(Compilation &C, const JobAction &JA, static void AddLibgcc(llvm::Triple Triple, const Driver &D, ArgStringList &CmdArgs, const ArgList &Args) { bool isAndroid = Triple.getEnvironment() == llvm::Triple::Android; - bool StaticLibgcc = isAndroid || Args.hasArg(options::OPT_static) || - Args.hasArg(options::OPT_static_libgcc); + bool StaticLibgcc = Args.hasArg(options::OPT_static) || + Args.hasArg(options::OPT_static_libgcc); if (!D.CCCIsCXX) CmdArgs.push_back("-lgcc"); - if (StaticLibgcc) { + if (StaticLibgcc || isAndroid) { if (D.CCCIsCXX) CmdArgs.push_back("-lgcc"); } else { @@ -5877,6 +5877,14 @@ static void AddLibgcc(llvm::Triple Triple, const Driver &D, CmdArgs.push_back("-lgcc_eh"); else if (!Args.hasArg(options::OPT_shared) && D.CCCIsCXX) CmdArgs.push_back("-lgcc"); + + // According to Android ABI, we have to link with libdl if we are + // linking with non-static libgcc. + // + // NOTE: This fixes a link error on Android MIPS as well. The non-static + // libgcc for MIPS relies on _Unwind_Find_FDE and dl_iterate_phdr from libdl. + if (isAndroid && !StaticLibgcc) + CmdArgs.push_back("-ldl"); } static bool hasMipsN32ABIArg(const ArgList &Args) { diff --git a/test/Driver/linux-ld.c b/test/Driver/linux-ld.c index 72370297f4..06be358860 100644 --- a/test/Driver/linux-ld.c +++ b/test/Driver/linux-ld.c @@ -420,6 +420,7 @@ // CHECK-ANDROID: "-L[[SYSROOT]]/usr/lib" // CHECK-ANDROID-NOT: "gcc_s" // CHECK-ANDROID: "-lgcc" +// CHECK-ANDROID: "-ldl" // CHECK-ANDROID-NOT: "gcc_s" // CHECK-ANDROID: "{{.*}}/crtend_android.o" // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ @@ -448,6 +449,7 @@ // CHECK-ANDROID-SO: "-L[[SYSROOT]]/usr/lib" // CHECK-ANDROID-SO-NOT: "gcc_s" // CHECK-ANDROID-SO: "-lgcc" +// CHECK-ANDROID-SO: "-ldl" // CHECK-ANDROID-SO-NOT: "gcc_s" // CHECK-ANDROID-SO: "{{.*}}/crtend_so.o" // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ @@ -475,6 +477,7 @@ // CHECK-ANDROID-STATIC: "-L[[SYSROOT]]/usr/lib" // CHECK-ANDROID-STATIC-NOT: "gcc_s" // CHECK-ANDROID-STATIC: "-lgcc" +// CHECK-ANDROID-STATIC-NOT: "-ldl" // CHECK-ANDROID-STATIC-NOT: "gcc_s" // CHECK-ANDROID-STATIC: "{{.*}}/crtend_android.o" // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ |