diff options
| author |   Yuta Satoh <nigoro.dev@gmail.com> | 2016-04-04 20:55:25 +0900 |
|---|---|---|
| committer | Yuta Satoh <nigoro.dev@gmail.com> | 2016-04-04 20:55:25 +0900 |
| commit | 0eed712cb3a85182d9f34475fe7fd2bddf175578 (patch) | |
| tree | ceb71b0a5d7c342d093713d75ec89c81e387becc /sys-freebsd/boot0/files | |
| parent | net-libs/libinfinity: purge old per security bug 550126 (diff) | |
| download | gentoo-0eed712cb3a85182d9f34475fe7fd2bddf175578.tar.gz gentoo-0eed712cb3a85182d9f34475fe7fd2bddf175578.tar.bz2 gentoo-0eed712cb3a85182d9f34475fe7fd2bddf175578.zip | |
sys-freebsd: Bump to 10.3.
Diffstat (limited to 'sys-freebsd/boot0/files')
| -rw-r--r-- | sys-freebsd/boot0/files/boot0-10.3-clang.patch | 30 | ||||
| -rw-r--r-- | sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch | 28 | ||||
| -rw-r--r-- | sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch | 33 |
3 files changed, 91 insertions, 0 deletions
diff --git a/sys-freebsd/boot0/files/boot0-10.3-clang.patch b/sys-freebsd/boot0/files/boot0-10.3-clang.patch new file mode 100644 index 000000000000..4245e21a96e1 --- /dev/null +++ b/sys-freebsd/boot0/files/boot0-10.3-clang.patch @@ -0,0 +1,30 @@ +Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=542676 + +https://svnweb.freebsd.org/base/head/sys/boot/i386/boot2/Makefile?r1=272249&r2=276479 + +diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile +index 8a6e771..c030853 100644 +--- a/sys/boot/i386/boot2/Makefile ++++ b/sys/boot/i386/boot2/Makefile +@@ -22,8 +22,7 @@ BOOT2_UFS?= UFS1_AND_UFS2 + #BOOT2_UFS?= UFS2_ONLY + #BOOT2_UFS?= UFS1_ONLY + +-CFLAGS= -Os \ +- -fomit-frame-pointer \ ++CFLAGS= -fomit-frame-pointer \ + -mrtd \ + -mregparm=3 \ + -DUSE_XREAD \ +@@ -40,7 +39,10 @@ CFLAGS= -Os \ + -Winline \ + ${CLANG_OPT_SMALL} + +-CFLAGS.gcc+= -fno-guess-branch-probability \ ++CFLAGS.clang+= -Oz ++ ++CFLAGS.gcc+= -Os \ ++ -fno-guess-branch-probability \ + -fno-unit-at-a-time \ + --param max-inline-insns-single=100 + .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201 diff --git a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch b/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch new file mode 100644 index 000000000000..af1d3512e7da --- /dev/null +++ b/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch @@ -0,0 +1,28 @@ +diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile +index fc66e01..470453d 100644 +--- a/sys/boot/efi/libefi/Makefile ++++ b/sys/boot/efi/libefi/Makefile +@@ -17,9 +17,6 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand + # Pick up the bootstrap header for some interface items + CFLAGS+= -I${.CURDIR}/../../common + +- +-# Suppress warning from clang for FreeBSD %b and %D formats +-CFLAGS+= -fformat-extensions + CFLAGS+= -DTERM_EMU + + .include <bsd.lib.mk> +diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile +index 24cc4c1..e5d2bae 100644 +--- a/sys/boot/i386/libi386/Makefile ++++ b/sys/boot/i386/libi386/Makefile +@@ -55,9 +55,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../common \ + # the location of libstand + CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ + +-# Suppress warning from clang for FreeBSD %b and %D formats +-CFLAGS+= -fformat-extensions +- + .if ${MACHINE_CPUARCH} == "amd64" + CLEANFILES+= machine + machine: diff --git a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch b/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch new file mode 100644 index 000000000000..fdafe74252bc --- /dev/null +++ b/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch @@ -0,0 +1,33 @@ +diff --git a/efi/Makefile b/efi/Makefile +index 30024e3..a33efb2 100644 +--- a/efi/Makefile ++++ b/efi/Makefile +@@ -2,15 +2,10 @@ + + .include <bsd.own.mk> + +-# In-tree GCC does not support __attribute__((ms_abi)). +-.if ${COMPILER_TYPE} != "gcc" +- + .if ${MACHINE_CPUARCH} == "amd64" + SUBDIR+= libefi loader boot1 + .endif + +-.endif # ${COMPILER_TYPE} != "gcc" +- + .if ${MACHINE_CPUARCH} == "ia64" + SUBDIR+= libefi + .endif +diff --git a/efi/boot1/Makefile b/efi/boot1/Makefile +index 4ffdfda..8ec0e00 100644 +--- a/efi/boot1/Makefile ++++ b/efi/boot1/Makefile +@@ -64,7 +64,7 @@ LDFLAGS+= -Wl,-znocombreloc + # Add libstand for required string and memory functions for all platforms. + # + DPADD+= ${LIBSTAND} +-LDADD+= -lstand ++LDADD+= ${LIBSTAND} + + DPADD+= ${LDSCRIPT} + |