Attachment 169266 Details for Bug 207599 – Patch set to build ppc64 world+kernel with clang

[patch] Patch set to build ppc64 world+kernel with clang

ppc64-clang-fbsd-11current-r297632-kpsalerno.patch (text/plain), 2.45 KB, created by Kenneth Salerno on 2016-04-12 22:25:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kenneth Salerno

Created: 2016-04-12 22:25:37 UTC

Size: 2.45 KB

patch

obsolete

>Index: contrib/binutils/bfd/elf64-ppc.c
>===================================================================
>--- contrib/binutils/bfd/elf64-ppc.c	(revision 297632)
>+++ contrib/binutils/bfd/elf64-ppc.c	(working copy)
>@@ -11025,8 +11025,10 @@
> 		  }
> 	      }
> 
>+/*
> 	    if (off >= (bfd_vma) -2)
> 	      abort ();
>+*/
> 
> 	    relocation = got->output_offset + off;
> 
>Index: share/mk/bsd.stand.mk
>===================================================================
>--- share/mk/bsd.stand.mk	(revision 297632)
>+++ share/mk/bsd.stand.mk	(working copy)
>@@ -5,7 +5,8 @@
> #
> 
> CFLAGS+= -ffreestanding -Wformat
>-CFLAGS+= ${CFLAGS_NO_SIMD} -msoft-float -D_STANDALONE
>+CFLAGS.gcc+= ${CFLAGS_NO_SIMD} -msoft-float -D_STANDALONE
>+CFLAGS.clang+= ${CFLAGS_NO_SIMD} -D_STANDALONE
> 
> .if ${MACHINE_CPUARCH} == "i386"
> CFLAGS.gcc+=	-mpreferred-stack-boundary=2
>Index: sys/boot/powerpc/kboot/Makefile
>===================================================================
>--- sys/boot/powerpc/kboot/Makefile	(revision 297632)
>+++ sys/boot/powerpc/kboot/Makefile	(working copy)
>@@ -89,7 +89,7 @@
> LDFLAGS=	-nostdlib -static -T ${.CURDIR}/ldscript.powerpc
> 
> # 64-bit bridge extensions
>-CFLAGS+= -Wa,-mppc64bridge
>+CFLAGS.gcc+= -Wa,-mppc64bridge
> 
> # Pull in common loader code
> #.PATH:		${.CURDIR}/../../ofw/common
>Index: sys/conf/Makefile.powerpc
>===================================================================
>--- sys/conf/Makefile.powerpc	(revision 297632)
>+++ sys/conf/Makefile.powerpc	(working copy)
>@@ -35,7 +35,7 @@
> 
> INCLUDES+= -I$S/contrib/libfdt
> 
>-CFLAGS+= -msoft-float -Wa,-many
>+CFLAGS.gcc+= -msoft-float -Wa,-many
> 
> # Build position-independent kernel
> CFLAGS+= -fPIC
>Index: sys/conf/kern.mk
>===================================================================
>--- sys/conf/kern.mk	(revision 297632)
>+++ sys/conf/kern.mk	(working copy)
>@@ -148,7 +148,6 @@
> #
> .if ${MACHINE_CPUARCH} == "powerpc"
> CFLAGS+=	-mno-altivec
>-CFLAGS.clang+=	-mllvm -disable-ppc-float-in-variadic=true
> CFLAGS.gcc+=	-msoft-float
> INLINE_LIMIT?=	15000
> .endif
>Index: sys/conf/kmod.mk
>===================================================================
>--- sys/conf/kmod.mk	(revision 297632)
>+++ sys/conf/kmod.mk	(working copy)
>@@ -76,6 +76,12 @@
> .include <bsd.compiler.mk>
> .include "config.mk"
> 
>+.if ${MACHINE_CPUARCH} == powerpc
>+.if ${COMPILER_TYPE} != "gcc"
>+CC:=		gcc
>+COMPILER_TYPE:=	gcc
>+.endif
>+.endif
> .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S .m
> 
> # amd64 and mips use direct linking for kmod, all others use shared binaries

Actions: View | Diff

Attachments on bug 207599: 167575 | 169265 | 169266