ARM: Compile whole tree with clang.
Note: GCC is still the default compiler, to use clang do the following: $ BUILDVARS="" ./releasetools/arm_sdimage.sh
This commit is contained in:
Lionel Sambuc
parent
ae34580f0c
commit
fddf1f133e
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -3816,6 +3816,7 @@ class ARMTargetInfo : public TargetInfo {
|
|||
SizeType = UnsignedInt;
|
||||
|
||||
switch (T.getOS()) {
|
||||
case llvm::Triple::Minix:
|
||||
case llvm::Triple::NetBSD:
|
||||
WCharType = SignedInt;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ ARMELFMCAsmInfo::ARMELFMCAsmInfo(StringRef TT) {
|
|||
|
||||
// Exceptions handling
|
||||
switch (TheTriple.getOS()) {
|
||||
case Triple::Minix:
|
||||
case Triple::NetBSD:
|
||||
ExceptionsType = ExceptionHandling::DwarfCFI;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -115,6 +115,10 @@ USETOOLS?= never
|
|||
# LSC FIXME: RELEASEMACHINEDIR is set to evbarm, instead of evbearm-el
|
||||
.if !empty(MACHINE:Mevbarm*)
|
||||
RELEASEMACHINEDIR:= evbearm-el
|
||||
# LSC: Clang uses floating point instruction to vectorize some operation, even
|
||||
# at -O0, make sure it uses soft-float as the minix uKernel doesn't yet
|
||||
# save / restore the hardware fpu context on ARM.
|
||||
CFLAGS+= -mno-implicit-float -fno-vectorize
|
||||
.endif
|
||||
|
||||
.if ${HAVE_GCC:Dyes} == "yes" || \
|
||||
|
|
|
|||
22
sys/lib/libkern/arch/arm/Makefile.inc
Normal file
22
sys/lib/libkern/arch/arm/Makefile.inc
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
# $NetBSD: Makefile.inc,v 1.21 2014/01/29 23:37:18 joerg Exp $
|
||||
|
||||
SRCS+= byte_swap_2.S byte_swap_4.S
|
||||
SRCS+= ffs.S
|
||||
SRCS+= memcmp.S memcpy.S memset.S memmove.S strcmp.S strncmp.S
|
||||
|
||||
.if !empty(MACHINE_ARCH:Mearm*)
|
||||
SRCS+= unwind_stub.c
|
||||
.endif
|
||||
.if empty(MACHINE_ARCH:Mearmv7*)
|
||||
CPUFLAGS.ffs.S+= -marm
|
||||
.endif
|
||||
CPUFLAGS.divide.S+= -marm
|
||||
CPUFLAGS.memcmp.S+= -marm
|
||||
CPUFLAGS.memcpy.S+= -marm
|
||||
CPUFLAGS.memmove.S+= -marm
|
||||
CPUFLAGS.memset.S+= -marm
|
||||
.if empty(CPPFLAGS:M-D_STANDALONE)
|
||||
CPUFLAGS.strcpy.S+= -marm
|
||||
CPUFLAGS.strlcpy.S+= -marm
|
||||
CPUFLAGS.strncpy.S+= -marm
|
||||
.endif
|
||||
48
sys/lib/libkern/arch/arm/unwind_stub.c
Normal file
48
sys/lib/libkern/arch/arm/unwind_stub.c
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
/*-
|
||||
* Copyright (c) 2013 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by Matt Thomas of 3am Software Foundry.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
||||
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(1, "$NetBSD: unwind_stub.c,v 1.2 2013/08/12 23:42:14 matt Exp $");
|
||||
|
||||
#if defined(__minix)
|
||||
#include <ehabi.h>
|
||||
#else
|
||||
#include <arm/ehabi.h>
|
||||
#endif /* defined(__minix) */
|
||||
|
||||
static _Unwind_Reason_Code __used
|
||||
__aeabi_unwind_cpp_stub(_Unwind_State state, _Unwind_Control_Block *ucbp,
|
||||
_Unwind_Context *context)
|
||||
{
|
||||
return _URC_FAILURE;
|
||||
}
|
||||
|
||||
__weak_alias(__aeabi_unwind_cpp_pr0, __aeabi_unwind_cpp_stub)
|
||||
__weak_alias(__aeabi_unwind_cpp_pr1, __aeabi_unwind_cpp_stub)
|
||||
__weak_alias(__aeabi_unwind_cpp_pr2, __aeabi_unwind_cpp_stub)
|
||||
|
|
@ -16,3 +16,9 @@ CPPFLAGS.libunwind.cxx+=-I${NETBSDSRCDIR}/sys/lib/libunwind
|
|||
.if ${LIBC_MACHINE_CPU} == "arm"
|
||||
AFLAGS.unwind_registers.S+= ${${ACTIVE_CC} == "clang":? -mfpu=vfp3 :}
|
||||
.endif
|
||||
|
||||
.if defined(__MINIX)
|
||||
.PATH: ${NETBSDSRCDIR}/sys/lib/libkern/arch/arm
|
||||
SRCS+= unwind_stub.c
|
||||
CPPFLAGS.unwind_stub.c+=-I${NETBSDSRCDIR}/sys/arch/arm/include
|
||||
.endif # defined(__MINIX)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user