Add clang/ARM support for MINIX

README.md

@@ -0,0 +1,17 @@
+# Build MINIX/arm with clang
+
+It is now possible to build a full minix distribution for BeaglBone White/Black and BeagleBoardxM using clang instead of GCC.
+
+This also add support to run the Kuya tests on ARM, which was not possible when GCC was used, because of problems in the C++ exception handling.
+
+## Known Bugs
+
+The following tests still fails:
+ 1. 53: Division by zero does not trigger exceptions
+ 2. 75: ru.tv_secs can't be zero (and is zero)
+ 3. 85: hangs
+ 4. isofs: Fails because of an out of memory condition
+ 5. vnd: crash
+ 6. Running two times the kyua tests in a row, without rebooting in between will lead to a mostly failed second run because of copy-on-write errors.
+
+

distrib/sets/lists/minix-comp/md.evbarm

@@ -81,6 +81,9 @@
 ./usr/include/arm/vm.h                                  minix-comp
 ./usr/include/arm/vmparam.h                             minix-comp
 ./usr/include/arm/wchar_limits.h                        minix-comp
+./usr/include/clang-3.6/arm_acle.h                      minix-comp	llvm,llvmcmds
+./usr/include/clang-3.6/arm_neon.h                      minix-comp	llvm,llvmcmds
+./usr/include/clang-3.6/stdatomic.h                     minix-comp	llvm,llvmcmds
 ./usr/include/evbarm                                    minix-comp
 ./usr/include/evbarm/disklabel.h                        minix-comp
 ./usr/include/evbarm/intr.h                             minix-comp

external/bsd/llvm/dist/clang/lib/Basic/Targets.cpp

@@ -3816,6 +3816,7 @@ class ARMTargetInfo : public TargetInfo {
       SizeType = UnsignedInt;
 
     switch (T.getOS()) {
+    case llvm::Triple::Minix:
     case llvm::Triple::NetBSD:
       WCharType = SignedInt;
       break;

external/bsd/llvm/dist/clang/lib/Driver/ToolChain.cpp

@@ -275,7 +275,7 @@ std::string ToolChain::ComputeLLVMTriple(const ArgList &Args,
     // FIXME: Thumb should just be another -target-feaure, not in the triple.
 #if defined(__minix) || 1
     // Minix/ARM-specific force to ARMv7 and EABI.
-    StringRef Suffix = "v7";
+    StringRef Suffix = "v7a";
     Triple.setEnvironment(llvm::Triple::EABI);
 #else
     StringRef Suffix = Triple.isOSBinFormatMachO()

external/bsd/llvm/dist/clang/lib/Driver/Tools.cpp

@@ -665,6 +665,10 @@ StringRef tools::arm::getARMFloatABI(const Driver &D, const ArgList &Args,
       }
       break;
 
+    case llvm::Triple::Minix:
+      FloatABI = "softfp";
+      break;
+
     default:
       switch(Triple.getEnvironment()) {
       case llvm::Triple::GNUEABIHF:
@@ -796,6 +800,9 @@ void Clang::AddARMTargetArgs(const ArgList &Args,
       ABIName = "aapcs";
       break;
     default:
+      if (Triple.getOS() == llvm::Triple::Minix)
+        ABIName = "apcs-gnu";
+
       if (Triple.getOS() == llvm::Triple::NetBSD)
         ABIName = "apcs-gnu";
       else
@@ -7733,6 +7740,11 @@ void minix::Link::ConstructJob(Compilation &C, const JobAction &JA,
   // Many NetBSD architectures support more than one ABI.
   // Determine the correct emulation for ld.
   switch (getToolChain().getArch()) {
+  case llvm::Triple::arm:
+  case llvm::Triple::thumb:
+    CmdArgs.push_back("-m");
+    CmdArgs.push_back("armelf_minix");
+    break;
   case llvm::Triple::x86:
     CmdArgs.push_back("-m");
     CmdArgs.push_back("elf_i386_minix");

external/bsd/llvm/dist/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp

@@ -638,6 +638,8 @@ llvm::Optional<ProgramStateRef> MallocChecker::performKernelMalloc(
   if (!KernelZeroFlagVal.hasValue()) {
     if (OS == llvm::Triple::FreeBSD)
       KernelZeroFlagVal = 0x0100;
+    else if (OS == llvm::Triple::Minix)
+      KernelZeroFlagVal = 0x0002;
     else if (OS == llvm::Triple::NetBSD)
       KernelZeroFlagVal = 0x0002;
     else if (OS == llvm::Triple::OpenBSD)

external/bsd/llvm/dist/llvm/lib/Support/Triple.cpp

@@ -1074,6 +1074,8 @@ const char *Triple::getARMCPUForArch(StringRef MArch) const {
   // supported by LLVM.
   // FIXME: Should warn once that we're falling back.
   switch (getOS()) {
+  case llvm::Triple::Minix:
+      return "cortex-a8";
   case llvm::Triple::NetBSD:
     switch (getEnvironment()) {
     case llvm::Triple::GNUEABIHF:

external/bsd/llvm/dist/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp

@@ -59,6 +59,7 @@ ARMELFMCAsmInfo::ARMELFMCAsmInfo(StringRef TT) {
 
   // Exceptions handling
   switch (TheTriple.getOS()) {
+  case Triple::Minix:
   case Triple::NetBSD:
     ExceptionsType = ExceptionHandling::DwarfCFI;
     break;

minix/kernel/Makefile

@@ -5,11 +5,6 @@ PROG=		kernel
 BINDIR=		/usr/sbin
 MAN=
 
-.if ${MACHINE_ARCH} == "earm" && ${MKLLVM:Uno} == "yes"
-# BJG - problems with optimisation of the kernel by llvm 
-DBG=-O0
-.endif
-
 .include "arch/${MACHINE_ARCH}/Makefile.inc"
 
 SRCS+=	clock.c cpulocals.c interrupt.c main.c proc.c system.c \

minix/kernel/arch/earm/arch_system.c

@@ -11,6 +11,7 @@
 #include <machine/vm.h>
 #include <machine/signal.h>
 #include <arm/armreg.h>
+#include <arm/vfpreg.h>
 
 #include <minix/u64.h>
 
@@ -26,16 +27,36 @@
 
 void * k_stacks;
 
-
+#define VFP_COPROC 10
+#define VFP_COPROC2 11
 void fpu_init(void)
 {
+	const char *model = NULL;
+	uint32_t cpu_media_and_vfp_features[2];
+
+	const uint32_t cpacr_vfp = CPACR_CPn(VFP_COPROC);
+	const uint32_t cpacr_vfp2 = CPACR_CPn(VFP_COPROC2);
+
+	/*
+	 * We first need to enable access to the coprocessors.
+	 */
+	uint32_t cpacr = armreg_cpacr_read();
+	cpacr |= __SHIFTIN(CPACR_ALL, cpacr_vfp);
+	cpacr |= __SHIFTIN(CPACR_ALL, cpacr_vfp2);
+	armreg_cpacr_write(cpacr);
+
+	isb();
+
+	/* Enable vfp/neon unit */
+	armreg_fpexc_write(VFP_FPEXC_EN);
 }
 
 void save_local_fpu(struct proc *pr, int retain)
 {
 }
 
-void save_fpu(struct proc *pr)
+void
+save_fpu(struct proc *pr)
 {
 }
 

minix/servers/vm/Makefile

@@ -8,10 +8,6 @@ SRCS=	main.c alloc.c utility.c exit.c fork.c break.c \
 	mem_anon.c mem_directphys.c mem_anon_contig.c mem_shared.c	\
 	mem_cache.c cache.c vfs.c mem_file.c fdref.c acl.c
 
-.if ${MACHINE_ARCH} == "earm"
-LDFLAGS+= -T ${.CURDIR}/arch/${MACHINE_ARCH}/vm.lds
-.endif
-
 .if ${MKPAE:Uno} != "no"
 CPPFLAGS+= -DPAE=1
 .endif