Attachment 120830 Details for Bug 163710 – file.diff

[patch] file.diff

file.diff (text/plain), 1.11 KB, created by Russell Cattelan on 2011-12-30 03:20:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Russell Cattelan

Created: 2011-12-30 03:20:10 UTC

Size: 1.11 KB

patch

obsolete

>diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
>index 5cf54c8..75f4349 100644
>--- a/sys/boot/ficl/Makefile
>+++ b/sys/boot/ficl/Makefile
>@@ -8,7 +8,6 @@ SRCS=           ${BASE_SRCS} sysdep.c softcore.c
> CLEANFILES=    softcore.c testmain testmain.o
> CFLAGS+=       -ffreestanding -g3
> .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
>-CFLAGS+=   -mpreferred-stack-boundary=2
> CFLAGS+=       -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
> .endif
> .if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm"
>@@ -38,10 +37,6 @@ SOFTWORDS=   softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \
> # Optional OO extension softwords
> #SOFTWORDS+=   oo.fr classes.fr
> 
>-.if ${MACHINE_CPUARCH} == "amd64"
>-CFLAGS+=   -m32 -march=i386 -I.
>-.endif
>-
> .if ${MACHINE_ARCH} == "powerpc64"
> CFLAGS+=       -m32 -mcpu=powerpc -I.
> .endif
>@@ -59,7 +54,8 @@ ${SRCS:M*.c:R:S/$/.o/g}: machine
> beforedepend ${OBJS}: machine
> 
> machine:
>-   ln -sf ${.CURDIR}/../../i386/include machine
>+ rm -f machine
>+ ln -sf ${.CURDIR}/../../${MACHINE_CPUARCH}/include machine
> 
> CLEANFILES+=   machine
> .endif

Actions: View | Diff

Attachments on bug 163710: 120830 | 120831 | 120832 | 120833 | 120834 | 120835