From e7bf4299dbae77f7a8bce17b9f2482ac2744ada1 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Tue, 21 Oct 2014 20:02:00 +0000 Subject: [PATCH] Assume cxxabi.h exists on FreeBSD HAVE_CXXABI_H is not defined on FreeBSD but the system actually has the header. CMake test fails because the header depends on size_t. llvm-svn: 220315 --- lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp | 4 +++- lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp | 4 +++- lld/test/elf/X86_64/demangle.test | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp b/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp index 9dba86a9b8e6..f542ac9f783a 100644 --- a/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp +++ b/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp @@ -22,7 +22,9 @@ #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" -#if HAVE_CXXABI_H +// FreeBSD 10.0 has cxxabi.h but fails to define HAVE_CXXABI_H due to +// header dependency issues. +#if defined(HAVE_CXXABI_H) || defined (__FreeBSD__) #include #endif diff --git a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp index 9c0736dfae4c..f762aa5e397f 100644 --- a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp +++ b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp @@ -27,7 +27,9 @@ #include "llvm/Support/Path.h" #include -#if HAVE_CXXABI_H +// FreeBSD 10.0 has cxxabi.h but fails to define HAVE_CXXABI_H due to +// header dependency issues. +#if defined(HAVE_CXXABI_H) || defined (__FreeBSD__) #include #endif diff --git a/lld/test/elf/X86_64/demangle.test b/lld/test/elf/X86_64/demangle.test index 9f2c825ad441..820e6be9e03a 100644 --- a/lld/test/elf/X86_64/demangle.test +++ b/lld/test/elf/X86_64/demangle.test @@ -6,6 +6,5 @@ RUN: lld -flavor gnu -target x86_64 %p/Inputs/undefcpp.o --noinhibit-exec 2>&1 | RUN: lld -flavor gnu -target x86_64 %p/Inputs/undefcpp.o --noinhibit-exec --no-demangle 2>&1 | FileCheck -check-prefix=NODEMANGLE %s RUN: lld -flavor gnu -target x86_64 %p/Inputs/undefcpp.o --noinhibit-exec --demangle 2>&1 | FileCheck -check-prefix=DEMANGLE %s -XFAIL: freebsd #DEMANGLE: undefcpp.o: foo(char const*) #NODEMANGLE: undefcpp.o: _Z3fooPKc -- 2.34.1