On Wed, 28 Nov 2012 00:02:25 +0200
Dmitri Gribenko <[email protected]> wrote:
> On Mon, Nov 26, 2012 at 11:15 AM, Andrew Turner
> <[email protected]> wrote:
> > On Sat, 24 Nov 2012 22:23:40 +0200
> > Dmitri Gribenko <[email protected]> wrote:
> >
> >> On Sat, Nov 24, 2012 at 10:47 AM, Andrew Turner
> >> <[email protected]> wrote:
> >> > Hello,
> >> >
> >> > The attached patch adds initial support to clang for FreeBSD on
> >> > ARM. I've tested this on FreeBSD's integrated clang 3.1 and
> >> > forward ported the changes to clang's trunk.
> >>
> >> Hi Andrew,
> >>
> >> I am not an expert on this part of Clang, but this definitely needs
> >> tests.
> >>
> > Are you able to point me in the direction of the sort of tests you
> > would expect for the patch? I'm not familiar with clang's testing
> > framework.
>
> Rafael has already given an advice. Here's more:
>
> + Builder.defineMacro("__FreeBSD_ARCH_armv6__");
>
> You might want to add a test to test/Preprocessor/init.c for this.
>
> + } else if (getToolChain().getArch() == llvm::Triple::arm ||
> + getToolChain().getArch() == llvm::Triple::thumb) {
> + CmdArgs.push_back("-mfpu=softvfp");
> + switch(getToolChain().getTriple().getEnvironment()) {
> + case llvm::Triple::GNUEABI:
> + case llvm::Triple::EABI:
> + break;
> +
> + default:
> + CmdArgs.push_back("-matpcs");
> + }
>
> As far as I understand, this could be tested with something like
> test/Driver/freebsd-mips-as.c.
>
> Dmitri
>
How does the attached patch look? It adds tests as requested.
Andrew
Index: lib/Basic/Targets.cpp
===================================================================
--- lib/Basic/Targets.cpp (revision 169366)
+++ lib/Basic/Targets.cpp (working copy)
@@ -3094,7 +3094,10 @@ public:
// name.
if (Name == "apcs-gnu") {
DoubleAlign = LongLongAlign = LongDoubleAlign = SuitableAlign = 32;
- SizeType = UnsignedLong;
+ // size_t is unsigned int on FreeBSD.
+ if (getTriple().getOS() != llvm::Triple::FreeBSD) {
+ SizeType = UnsignedLong;
+ }
// Revert to using SignedInt on apcs-gnu to comply with existing behaviour.
WCharType = SignedInt;
@@ -3301,6 +3304,12 @@ public:
// when Neon instructions are actually available.
if ((FPU & NeonFPU) && !SoftFloat && IsARMv7)
Builder.defineMacro("__ARM_NEON__");
+
+ // This is set when we are building for FreeBSD for ARMv6+.
+ // The maximum value may change with new versions of the Architecture
+ if (getTriple().getOS() == llvm::Triple::FreeBSD && CPUArch[0] >= '6' &&
+ CPUArch[0] <= '7')
+ Builder.defineMacro("__FreeBSD_ARCH_armv6__");
}
virtual void getTargetBuiltins(const Builtin::Info *&Records,
unsigned &NumRecords) const {
Index: lib/Driver/ToolChains.cpp
===================================================================
--- lib/Driver/ToolChains.cpp (revision 169366)
+++ lib/Driver/ToolChains.cpp (working copy)
@@ -1683,6 +1683,19 @@ Tool &FreeBSD::SelectTool(const Compilat
return *T;
}
+bool FreeBSD::UseSjLjExceptions() const {
+ // FreeBSD uses SjLj exceptions on ARM oabi.
+ switch (getTriple().getEnvironment()) {
+ case llvm::Triple::GNUEABI:
+ case llvm::Triple::EABI:
+ return false;
+
+ default:
+ return (getTriple().getArch() == llvm::Triple::arm ||
+ getTriple().getArch() == llvm::Triple::thumb);
+ }
+}
+
/// NetBSD - NetBSD tool chain which can call as(1) and ld(1) directly.
NetBSD::NetBSD(const Driver &D, const llvm::Triple& Triple, const ArgList &Args)
Index: lib/Driver/Tools.cpp
===================================================================
--- lib/Driver/Tools.cpp (revision 169366)
+++ lib/Driver/Tools.cpp (working copy)
@@ -662,6 +662,11 @@ static StringRef getARMFloatABI(const Dr
break;
}
+ case llvm::Triple::FreeBSD:
+ // FreeBSD currently only supports soft float
+ FloatABI = "soft";
+ break;
+
default:
switch(Triple.getEnvironment()) {
case llvm::Triple::GNUEABIHF:
@@ -4833,6 +4838,17 @@ void freebsd::Assemble::ConstructJob(Com
LastPICArg->getOption().matches(options::OPT_fpie))) {
CmdArgs.push_back("-KPIC");
}
+ } else if (getToolChain().getArch() == llvm::Triple::arm ||
+ getToolChain().getArch() == llvm::Triple::thumb) {
+ CmdArgs.push_back("-mfpu=softvfp");
+ switch(getToolChain().getTriple().getEnvironment()) {
+ case llvm::Triple::GNUEABI:
+ case llvm::Triple::EABI:
+ break;
+
+ default:
+ CmdArgs.push_back("-matpcs");
+ }
}
Args.AddAllArgValues(CmdArgs, options::OPT_Wa_COMMA,
Index: lib/Driver/ToolChains.h
===================================================================
--- lib/Driver/ToolChains.h (revision 169366)
+++ lib/Driver/ToolChains.h (working copy)
@@ -467,6 +467,7 @@ public:
virtual Tool &SelectTool(const Compilation &C, const JobAction &JA,
const ActionList &Inputs) const;
+ virtual bool UseSjLjExceptions() const;
};
class LLVM_LIBRARY_VISIBILITY NetBSD : public Generic_ELF {
Index: test/Misc/freebsd-arm-size_t.c
===================================================================
--- test/Misc/freebsd-arm-size_t.c (revision 0)
+++ test/Misc/freebsd-arm-size_t.c (working copy)
@@ -0,0 +1,9 @@
+// RUN: %clang %s -S -o %t.s -Werror 2>&1 \
+// RUN: -target arm-unknown-freebsd10.0
+
+/* Define a size_t as expected for FreeBSD ARM */
+typedef unsigned int size_t;
+
+/* Declare a builtin function that uses size_t */
+void *malloc(size_t);
+
Index: test/Preprocessor/freebsd-arm.c
===================================================================
--- test/Preprocessor/freebsd-arm.c (revision 0)
+++ test/Preprocessor/freebsd-arm.c (working copy)
@@ -0,0 +1,26 @@
+
+// RUN: %clang -E -dM %s 2>&1 \
+// RUN: -target arm-unknown-freebsd10 \
+// RUN: | FileCheck %s -check-prefix=CHECK-ARM
+// CHECK-ARM-NOT: #define __FreeBSD_ARCH_armv6__
+
+// RUN: %clang -E -dM %s 2>&1 \
+// RUN: -target armv4-unknown-freebsd10 \
+// RUN: | FileCheck %s -check-prefix=CHECK-ARMV4
+// CHECK-ARMV4-NOT: #define __FreeBSD_ARCH_armv6__
+
+// RUN: %clang -E -dM %s 2>&1 \
+// RUN: -target armv5-unknown-freebsd10 \
+// RUN: | FileCheck %s -check-prefix=CHECK-ARMV5
+// CHECK-ARMV5-NOT: #define __FreeBSD_ARCH_armv6__
+
+// RUN: %clang -E -dM %s 2>&1 \
+// RUN: -target armv6-unknown-freebsd10 \
+// RUN: | FileCheck %s -check-prefix=CHECK-ARMV6
+// CHECK-ARMV6: #define __FreeBSD_ARCH_armv6__
+
+// RUN: %clang -E -dM %s 2>&1 \
+// RUN: -target armv7-unknown-freebsd10 \
+// RUN: | FileCheck %s -check-prefix=CHECK-ARMV7
+// CHECK-ARMV7: #define __FreeBSD_ARCH_armv6__
+
Index: test/Driver/freebsd.c
===================================================================
--- test/Driver/freebsd.c (revision 169366)
+++ test/Driver/freebsd.c (working copy)
@@ -96,3 +96,16 @@
// RUN: | FileCheck --check-prefix=CHECK-NORMAL %s
// CHECK-NORMAL: crt1.o
// CHECK-NORMAL: crtbegin.o
+
+// RUN: %clang %s -### -o %t.o 2>&1 \
+// RUN: -target arm-unknown-freebsd10.0 \
+// RUN: | FileCheck --check-prefix=CHECK-ARM %s
+// CHECK-ARM: clang{{.*}}" "-cc1"{{.*}}" "-fsjlj-exceptions"
+// CHECK-ARM: as{{.*}}" "-matpcs"
+
+// RUN: %clang %s -### -o %t.o 2>&1 \
+// RUN: -target arm-gnueabi-freebsd10.0 \
+// RUN: | FileCheck --check-prefix=CHECK-ARM-EABI %s
+// CHECK-ARM-EABI-NOT: clang{{.*}}" "-cc1"{{.*}}" "-fsjlj-exceptions"
+// CHECK-ARM-EABI-NOT: as{{.*}}" "-matpcs"
+
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
