Date: Thu, 12 May 2016 18:20:52 +0000 (UTC) From: Sean Bruno <sbruno@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r299550 - in projects/mips64-clang/sys/boot/mips: . beri/boot2 Message-ID: <201605121820.u4CIKqTo004768@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sbruno Date: Thu May 12 18:20:52 2016 New Revision: 299550 URL: https://svnweb.freebsd.org/changeset/base/299550 Log: Fixups for beri code to assemble with GAS. Exclude uboot code as clang just flatout can't build it. Modified: projects/mips64-clang/sys/boot/mips/Makefile projects/mips64-clang/sys/boot/mips/beri/boot2/Makefile Modified: projects/mips64-clang/sys/boot/mips/Makefile ============================================================================== --- projects/mips64-clang/sys/boot/mips/Makefile Thu May 12 18:20:36 2016 (r299549) +++ projects/mips64-clang/sys/boot/mips/Makefile Thu May 12 18:20:52 2016 (r299550) @@ -1,17 +1,19 @@ # $FreeBSD$ .include <src.opts.mk> -SUBDIR= uboot - # # The BERI boot loader port works only on 64-bit MIPS; not a hard port to # 32-bit if someone is interested. Build on all 64-bit MIPS platforms to # ensure it gets adequate build-test coverage. # .if ${MACHINE_ARCH} == "mips64" -.if ${COMPILER_TYPE} == "gcc" SUBDIR+= beri .endif + +# +# clang is unable to compile this uboot code at this time +.if ${COMPILER_TYPE} == "gcc" +SUBDIR+= uboot .endif .include <bsd.subdir.mk> Modified: projects/mips64-clang/sys/boot/mips/beri/boot2/Makefile ============================================================================== --- projects/mips64-clang/sys/boot/mips/beri/boot2/Makefile Thu May 12 18:20:36 2016 (r299549) +++ projects/mips64-clang/sys/boot/mips/beri/boot2/Makefile Thu May 12 18:20:52 2016 (r299550) @@ -46,13 +46,15 @@ MAN= AFLAGS= -G0 +CFLAGS.gcc+= -Xassembler -G0 + CFLAGS= -ffreestanding \ -I${.CURDIR} \ -I${.CURDIR}/../../../common \ -I${.CURDIR}/../../../.. \ -D_KERNEL \ -Wall \ - -G0 -Xassembler -G0 \ + -G0 \ -fno-pic -mno-abicalls \ -msoft-float \ -g @@ -86,4 +88,8 @@ jtagboot.md5: jtagboot CLEANFILES+= flashboot.elf -.include <bsd.prog.mk> +.include <bsd.lib.mk> + +# XXX: clang integrated-as doesn't grok the use of dla in these files +CFLAGS.relocate.S= ${CLANG_NO_IAS} +CFLAGS.start.S= ${CLANG_NO_IAS}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605121820.u4CIKqTo004768>