[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree
zrouter-src-freebsd at zrouter.org
zrouter-src-freebsd at zrouter.org
Fri Mar 2 15:39:24 UTC 2012
details: http://zrouter.org/hg/FreeBSD/head//rev/9de13f80a66c
changeset: 385:9de13f80a66c
user: ray at terran.dlink.ua
date: Fri Mar 02 17:11:25 2012 +0200
description:
Update to FreeBSD-HEAD @232391
diffstat:
head/sys/boot/ficl/fileaccess.c | 4 ++--
head/sys/boot/ficl/i386/sysdep.h | 6 +++---
head/sys/boot/forth/menu.4th.8 | 30 +++++++++++++++++++-----------
head/sys/boot/i386/boot0/Makefile | 13 ++++++-------
head/sys/boot/i386/boot2/Makefile | 18 +++++++-----------
head/sys/boot/i386/btx/btx/Makefile | 11 +++++------
head/sys/boot/i386/btx/btxldr/Makefile | 11 +++++------
head/sys/boot/i386/gptboot/Makefile | 11 +++++------
head/sys/boot/i386/gptzfsboot/Makefile | 11 +++++------
head/sys/boot/i386/libi386/Makefile | 11 +++++------
head/sys/boot/i386/libi386/vidconsole.c | 6 +++---
head/sys/boot/i386/pxeldr/Makefile | 11 +++++------
head/sys/boot/i386/zfsboot/Makefile | 11 +++++------
head/sys/boot/pc98/btx/btx/Makefile | 11 +++++------
head/sys/boot/pc98/btx/btxldr/Makefile | 11 +++++------
head/sys/boot/pc98/loader/Makefile | 28 +++++++++++++++-------------
head/sys/boot/powerpc/boot1.chrp/Makefile | 9 +++++----
head/sys/boot/powerpc/boot1.chrp/boot1.c | 5 ++++-
18 files changed, 109 insertions(+), 109 deletions(-)
diffs (625 lines):
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/ficl/fileaccess.c
--- a/head/sys/boot/ficl/fileaccess.c Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/ficl/fileaccess.c Fri Mar 02 17:11:25 2012 +0200
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: head/sys/boot/ficl/fileaccess.c 231042 2012-02-05 20:00:39Z rpaulo $ */
#include <errno.h>
#include <stdlib.h>
@@ -420,6 +420,6 @@
ficlSetEnv(pSys, "file-ext", FICL_TRUE);
#endif /* FICL_HAVE_FTRUNCATE */
#else
- &pSys;
+ (void)pSys;
#endif /* FICL_WANT_FILE */
}
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/ficl/i386/sysdep.h
--- a/head/sys/boot/ficl/i386/sysdep.h Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/ficl/i386/sysdep.h Fri Mar 02 17:11:25 2012 +0200
@@ -46,7 +46,7 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
+/* $FreeBSD: head/sys/boot/ficl/i386/sysdep.h 231042 2012-02-05 20:00:39Z rpaulo $ */
#if !defined (__SYSDEP_H__)
#define __SYSDEP_H__
@@ -58,7 +58,7 @@
#include <assert.h>
#if !defined IGNORE /* Macro to silence unused param warnings */
-#define IGNORE(x) &x
+#define IGNORE(x) (void)x
#endif
/*
@@ -405,7 +405,7 @@
#if FICL_MULTITHREAD
int ficlLockDictionary(short fLock);
#else
-#define ficlLockDictionary(x) 0 /* ignore */
+#define ficlLockDictionary(x) /* ignore */
#endif
/*
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/forth/menu.4th.8
--- a/head/sys/boot/forth/menu.4th.8 Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/forth/menu.4th.8 Fri Mar 02 17:11:25 2012 +0200
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/sys/boot/forth/menu.4th.8 228985 2011-12-30 06:24:59Z pluknet $
+.\" $FreeBSD: head/sys/boot/forth/menu.4th.8 232158 2012-02-25 15:21:43Z gjb $
.\"
-.Dd Dec 27, 2011
+.Dd February 25, 2012
.Dt MENU.4TH 8
.Os
.Sh NAME
@@ -86,11 +86,12 @@
.Dq Li YES
(case-insensitive) or
.Dq Li 1 ,
-causes the menu to be displayed in color wherever possible. This includes the
+causes the menu to be displayed in color wherever possible.
+This includes the
use of ANSI bold for numbers appearing to the left of menuitems and the use of
special
.Dq Li ansi
-variables describd below.
+variables described below.
.It Va autoboot_delay
Number of seconds
.Ic menu-display
@@ -117,14 +118,18 @@
.It Va menu_timeout_command
The command to be executed after
.Va autoboot_delay
-seconds if a key is not pressed. The default is
+seconds if a key is not pressed.
+The default is
.Ic boot .
.It Va loader_menu_timeout_x
-Sets the desired column position of the timeout countdown text. Default is 4.
+Sets the desired column position of the timeout countdown text.
+Default is 4.
.It Va loader_menu_timeout_y
-Sets the desired row position of the timeout countdown text. Default is 23.
+Sets the desired row position of the timeout countdown text.
+Default is 23.
.It Va loader_menu_title
-The text to display centered above the menu. Default is
+The text to display centered above the menu.
+Default is
.Dq Li "Welcome to FreeBSD" .
.It Va menu_caption[x]
The text to be displayed for the numbered menuitem
@@ -132,7 +137,8 @@
.It Va menu_command[x]
The command to be executed when the number associated with menuitem
.Dq Li x
-is pressed. See the list of included FICL words below for some ideas.
+is pressed.
+See the list of included FICL words below for some ideas.
.It Va menu_keycode[x]
An optional decimal ASCII keycode to be associated with menuitem
.Dq Li x .
@@ -201,7 +207,8 @@
.It Va hint.acpi.0.disabled
Effects the display of the
.Va menu_acpi
-menuitem. If set, the menuitem will display
+menuitem.
+If set, the menuitem will display
.Va toggled_text[x]
.Va ( toggled_ansi[x]
if
@@ -225,7 +232,8 @@
.It Va menu_reboot
If set, adds a built-in
.Dq Li Reboot
-menuitem to the end of the last configured menuitem. If
+menuitem to the end of the last configured menuitem.
+If
.Va menu_options
is configured, the
.Dq Li Reboot
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/i386/boot0/Makefile
--- a/head/sys/boot/i386/boot0/Makefile Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/i386/boot0/Makefile Fri Mar 02 17:11:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/boot/i386/boot0/Makefile 232263 2012-02-28 18:30:18Z dim $
PROG?= boot0
STRIP=
@@ -19,12 +19,6 @@
OPTS ?= -DVOLUME_SERIAL -DPXE
CFLAGS += ${OPTS}
-.if ${CC:T:Mclang} == "clang"
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+= ${.IMPSRC:T:Mboot0.S:C/^.+$/-no-integrated-as/}
-CFLAGS+= ${.IMPSRC:T:Mboot0ext.S:C/^.+$/-no-integrated-as/}
-.endif
-
# Flags used in the boot0.S code:
# 0x0f all valid partitions enabled.
# 0x80 'packet', use BIOS EDD (LBA) extensions instead of CHS
@@ -83,3 +77,8 @@
LDFLAGS=-e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.boot0.S= ${CLANG_NO_IAS}
+CFLAGS.boot0ext.S= ${CLANG_NO_IAS}
+CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/i386/boot2/Makefile
--- a/head/sys/boot/i386/boot2/Makefile Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/i386/boot2/Makefile Fri Mar 02 17:11:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/boot/i386/boot2/Makefile 224131 2011-07-17 13:50:21Z dim $
+# $FreeBSD: head/sys/boot/i386/boot2/Makefile 232263 2012-02-28 18:30:18Z dim $
.include <bsd.own.mk>
@@ -40,14 +40,8 @@
-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
- -Winline --param max-inline-insns-single=100
-
-.if ${CC:T:Mclang} == "clang"
-CFLAGS+= -mllvm -stack-alignment=8 -mllvm -inline-threshold=3 \
- -mllvm -enable-load-pre=false
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+= ${.IMPSRC:T:Mboot1.S:C/^.+$/-no-integrated-as/}
-.endif
+ -Winline --param max-inline-insns-single=100 \
+ ${CLANG_OPT_SMALL}
LDFLAGS=-static -N --gc-sections
@@ -89,9 +83,7 @@
${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
boot2.o: boot2.s
-.if ${CC:T:Mclang} == "clang"
${CC} ${ACFLAGS} -c boot2.s
-.endif
SRCS= boot2.c boot2.h
@@ -115,3 +107,7 @@
.endif
.include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.boot1.S= ${CLANG_NO_IAS}
+CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/i386/btx/btx/Makefile
--- a/head/sys/boot/i386/btx/btx/Makefile Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/i386/btx/btx/Makefile Fri Mar 02 17:11:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/boot/i386/btx/btx/Makefile 232263 2012-02-28 18:30:18Z dim $
PROG= btx
INTERNALPROG=
@@ -13,11 +13,6 @@
CFLAGS+=-DBTX_FLAGS=${BOOT_BTX_FLAGS}
-.if ${CC:T:Mclang} == "clang"
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+=${.IMPSRC:T:Mbtx.S:C/^.+$/-no-integrated-as/}
-.endif
-
.if defined(BTX_SERIAL)
BOOT_COMCONSOLE_PORT?= 0x3f8
BOOT_COMCONSOLE_SPEED?= 9600
@@ -32,3 +27,7 @@
LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.btx.S= ${CLANG_NO_IAS}
+CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/i386/btx/btxldr/Makefile
--- a/head/sys/boot/i386/btx/btxldr/Makefile Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/i386/btx/btxldr/Makefile Fri Mar 02 17:11:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/boot/i386/btx/btxldr/Makefile 232263 2012-02-28 18:30:18Z dim $
PROG= btxldr
INTERNALPROG=
@@ -11,11 +11,10 @@
CFLAGS+=-DBTXLDR_VERBOSE
.endif
-.if ${CC:T:Mclang} == "clang"
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+=${.IMPSRC:T:Mbtxldr.S:C/^.+$/-no-integrated-as/}
-.endif
-
LDFLAGS=-e start -Ttext ${LOADER_ADDRESS} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.btxldr.S= ${CLANG_NO_IAS}
+CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/i386/gptboot/Makefile
--- a/head/sys/boot/i386/gptboot/Makefile Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/i386/gptboot/Makefile Fri Mar 02 17:11:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/boot/i386/gptboot/Makefile 225530 2011-09-13 14:03:55Z avg $
+# $FreeBSD: head/sys/boot/i386/gptboot/Makefile 232263 2012-02-28 18:30:18Z dim $
.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common
@@ -36,11 +36,6 @@
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-Winline --param max-inline-insns-single=100
-.if ${CC:T:Mclang} == "clang"
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+= ${.IMPSRC:T:Mgptldr.S:C/^.+$/-no-integrated-as/}
-.endif
-
LDFLAGS=-static -N --gc-sections
# Pick up ../Makefile.inc early.
@@ -79,3 +74,7 @@
.endif
.include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.gptldr.S= ${CLANG_NO_IAS}
+CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/i386/gptzfsboot/Makefile
--- a/head/sys/boot/i386/gptzfsboot/Makefile Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/i386/gptzfsboot/Makefile Fri Mar 02 17:11:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/boot/i386/gptzfsboot/Makefile 225530 2011-09-13 14:03:55Z avg $
+# $FreeBSD: head/sys/boot/i386/gptzfsboot/Makefile 232263 2012-02-28 18:30:18Z dim $
.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../gptboot \
${.CURDIR}/../zfsboot ${.CURDIR}/../common \
@@ -34,11 +34,6 @@
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-Winline --param max-inline-insns-single=100
-.if ${CC:T:Mclang} == "clang"
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+= ${.IMPSRC:T:Mgptldr.S:C/^.+$/-no-integrated-as/}
-.endif
-
LDFLAGS=-static -N --gc-sections
# Pick up ../Makefile.inc early.
@@ -77,3 +72,7 @@
.endif
.include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.gptldr.S= ${CLANG_NO_IAS}
+CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/i386/libi386/Makefile
--- a/head/sys/boot/i386/libi386/Makefile Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/i386/libi386/Makefile Fri Mar 02 17:11:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/boot/i386/libi386/Makefile 226748 2011-10-25 19:54:06Z jhb $
+# $FreeBSD: head/sys/boot/i386/libi386/Makefile 232263 2012-02-28 18:30:18Z dim $
#
LIB= i386
INTERNALLIB=
@@ -54,11 +54,6 @@
# the location of libstand
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-.if ${CC:T:Mclang} == "clang"
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+= ${.IMPSRC:T:Mamd64_tramp.S:C/^.+$/-no-integrated-as/}
-.endif
-
.if ${MACHINE_CPUARCH} == "amd64"
CLEANFILES+= machine
machine:
@@ -67,6 +62,10 @@
.include <bsd.lib.mk>
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.amd64_tramp.S= ${CLANG_NO_IAS}
+CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
+
.if ${MACHINE_CPUARCH} == "amd64"
beforedepend ${OBJS}: machine
.endif
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/i386/libi386/vidconsole.c
--- a/head/sys/boot/i386/libi386/vidconsole.c Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/i386/libi386/vidconsole.c Fri Mar 02 17:11:25 2012 +0200
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/boot/i386/libi386/vidconsole.c 226746 2011-10-25 19:45:12Z jhb $");
+__FBSDID("$FreeBSD: head/sys/boot/i386/libi386/vidconsole.c 232309 2012-02-29 18:11:33Z jkim $");
#include <stand.h>
#include <bootstrap.h>
@@ -623,10 +623,10 @@
#endif
if (i == KBD_ECHO) {
/* got the right answer */
- return (0);
+ return (1);
}
}
- return (1);
+ return (0);
}
#endif /* KEYBOARD_PROBE */
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/i386/pxeldr/Makefile
--- a/head/sys/boot/i386/pxeldr/Makefile Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/i386/pxeldr/Makefile Fri Mar 02 17:11:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/boot/i386/pxeldr/Makefile 232263 2012-02-28 18:30:18Z dim $
# Pick up ../Makefile.inc early.
.include <bsd.init.mk>
@@ -23,11 +23,6 @@
CFLAGS+=-DALWAYS_SERIAL
.endif
-.if ${CC:T:Mclang} == "clang"
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+=${.IMPSRC:T:Mpxeldr.S:C/^.+$/-no-integrated-as/}
-.endif
-
LOADERBIN= ${.OBJDIR}/../loader/loader.bin
CLEANFILES+= ${BOOT}.tmp
@@ -46,3 +41,7 @@
-b ${BTXKERN} ${LOADERBIN}
.include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.pxeldr.S= ${CLANG_NO_IAS}
+CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/i386/zfsboot/Makefile
--- a/head/sys/boot/i386/zfsboot/Makefile Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/i386/zfsboot/Makefile Fri Mar 02 17:11:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/boot/i386/zfsboot/Makefile 225530 2011-09-13 14:03:55Z avg $
+# $FreeBSD: head/sys/boot/i386/zfsboot/Makefile 232263 2012-02-28 18:30:18Z dim $
.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common
@@ -31,11 +31,6 @@
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-Winline --param max-inline-insns-single=100
-.if ${CC:T:Mclang} == "clang"
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+= ${.IMPSRC:T:Mzfsldr.S:C/^.+$/-no-integrated-as/}
-.endif
-
LDFLAGS=-static -N --gc-sections
# Pick up ../Makefile.inc early.
@@ -90,3 +85,7 @@
.endif
.include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.zfsldr.S= ${CLANG_NO_IAS}
+CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/pc98/btx/btx/Makefile
--- a/head/sys/boot/pc98/btx/btx/Makefile Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/pc98/btx/btx/Makefile Fri Mar 02 17:11:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/boot/pc98/btx/btx/Makefile 232263 2012-02-28 18:30:18Z dim $
PROG= btx
INTERNALPROG=
@@ -13,11 +13,6 @@
CFLAGS+=-DBTX_FLAGS=${BOOT_BTX_FLAGS}
-.if ${CC:T:Mclang} == "clang"
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+=${.IMPSRC:T:Mbtx.S:C/^.+$/-no-integrated-as/}
-.endif
-
.if defined(BTX_SERIAL)
BOOT_COMCONSOLE_PORT?= 0x238
BOOT_COMCONSOLE_SPEED?= 9600
@@ -32,3 +27,7 @@
LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.btx.S= ${CLANG_NO_IAS}
+CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/pc98/btx/btxldr/Makefile
--- a/head/sys/boot/pc98/btx/btxldr/Makefile Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/pc98/btx/btxldr/Makefile Fri Mar 02 17:11:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/boot/pc98/btx/btxldr/Makefile 232263 2012-02-28 18:30:18Z dim $
PROG= btxldr
INTERNALPROG=
@@ -11,11 +11,10 @@
CFLAGS+=-DBTXLDR_VERBOSE
.endif
-.if ${CC:T:Mclang} == "clang"
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+=${.IMPSRC:T:Mbtxldr.S:C/^.+$/-no-integrated-as/}
-.endif
-
LDFLAGS=-e start -Ttext ${LOADER_ADDRESS} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.btxldr.S= ${CLANG_NO_IAS}
+CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/pc98/loader/Makefile
--- a/head/sys/boot/pc98/loader/Makefile Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/pc98/loader/Makefile Fri Mar 02 17:11:25 2012 +0200
@@ -1,9 +1,10 @@
-# $FreeBSD: head/sys/boot/pc98/loader/Makefile 222417 2011-05-28 08:50:38Z julian $
+# $FreeBSD: head/sys/boot/pc98/loader/Makefile 231387 2012-02-10 15:34:36Z nyan $
.include <bsd.own.mk>
MK_SSP= no
-PROG= loader.sym
+LOADER?= loader
+PROG= ${LOADER}.sym
INTERNALPROG=
NEWVERSWHAT= "bootstrap loader" pc98
@@ -39,14 +40,14 @@
CFLAGS+= -DLOADER_GZIP_SUPPORT
.endif
-# Always add MI sources
+# Always add MI sources
.PATH: ${.CURDIR}/../../common
.include "${.CURDIR}/../../common/Makefile.inc"
CFLAGS+= -I${.CURDIR}/../../common
CFLAGS+= -I${.CURDIR}/../../i386
CFLAGS+= -I.
-CLEANFILES= vers.c loader loader.bin loader.help
+CLEANFILES= vers.c ${LOADER} ${LOADER}.bin loader.help
CFLAGS+= -Wall
LDFLAGS= -static -Ttext 0x0
@@ -68,36 +69,37 @@
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/../../i386/loader/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/../../i386/loader/version ${NEWVERSWHAT}
-loader: loader.bin ${BTXLDR} ${BTXKERN}
+${LOADER}: ${LOADER}.bin ${BTXLDR} ${BTXKERN}
btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \
- -b ${BTXKERN} loader.bin
+ -b ${BTXKERN} ${LOADER}.bin
-loader.bin: loader.sym
+${LOADER}.bin: ${LOADER}.sym
cp ${.ALLSRC} ${.TARGET}
strip -R .comment -R .note ${.TARGET}
loader.help: help.common help.pc98
cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
-.PATH: ${.CURDIR}/../../forth
-FILES= loader loader.help loader.4th support.4th loader.conf
+FILES= ${LOADER}
+# XXX INSTALLFLAGS_loader= -b
+FILESMODE_${LOADER}= ${BINMODE} -b
+
+.PATH: ${.CURDIR}/../../forth
+FILES+= loader.help loader.4th support.4th loader.conf
FILES+= screen.4th frames.4th beastie.4th
FILES+= brand.4th check-password.4th color.4th delay.4th
FILES+= menu.4th menu-commands.4th shortcuts.4th version.4th
-# XXX INSTALLFLAGS_loader= -b
-FILESMODE_loader= ${BINMODE} -b
FILESDIR_loader.conf= /boot/defaults
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+= ${.CURDIR}/../../i386/loader/loader.rc
.endif
-
.if !exists(${DESTDIR}/boot/menu.rc)
FILES+= menu.rc
.endif
# XXX crt0.o needs to be first for pxeboot(8) to work
-OBJS= ${BTXCRT}
+OBJS= ${BTXCRT}
DPADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND}
LDADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND}
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/powerpc/boot1.chrp/Makefile
--- a/head/sys/boot/powerpc/boot1.chrp/Makefile Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/powerpc/boot1.chrp/Makefile Fri Mar 02 17:11:25 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/boot/powerpc/boot1.chrp/Makefile 230522 2012-01-25 03:37:39Z nwhitehorn $
+# $FreeBSD: head/sys/boot/powerpc/boot1.chrp/Makefile 231810 2012-02-16 03:27:38Z nwhitehorn $
WITHOUT_SSP=
@@ -8,16 +8,17 @@
INSTALLFLAGS= -b
FILES= boot1.hfs
-SRCS= boot1.c ashldi3.c
+SRCS= boot1.c ashldi3.c syncicache.c
NO_MAN=
CFLAGS= -ffreestanding -msoft-float -Os \
- -I${.CURDIR}/../../common -I${.CURDIR}/../../../
+ -I${.CURDIR}/../../common -I${.CURDIR}/../../../ \
+ -D_STANDALONE
LDFLAGS=-nostdlib -static -N
.include "${.CURDIR}/../Makefile.inc"
-.PATH: ${.CURDIR}/../../../libkern ${.CURDIR}
+.PATH: ${.CURDIR}/../../../libkern ${.CURDIR}/../../../../lib/libc/powerpc/gen ${.CURDIR}
# The following inserts out objects into a template HFS
# created by generate-hfs.sh
diff -r 37083b471c7e -r 9de13f80a66c head/sys/boot/powerpc/boot1.chrp/boot1.c
--- a/head/sys/boot/powerpc/boot1.chrp/boot1.c Fri Mar 02 17:10:47 2012 +0200
+++ b/head/sys/boot/powerpc/boot1.chrp/boot1.c Fri Mar 02 17:11:25 2012 +0200
@@ -16,7 +16,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/boot/powerpc/boot1.chrp/boot1.c 231810 2012-02-16 03:27:38Z nwhitehorn $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -77,6 +77,8 @@
static char *__uitoa(char *buf, u_int val, int base);
static char *__ultoa(char *buf, u_long val, int base);
+void __syncicache(void *, int);
+
/*
* Open Firmware interface functions
*/
@@ -523,6 +525,7 @@
}
if (ph.p_filesz != ph.p_memsz)
bzero(p + ph.p_filesz, ph.p_memsz - ph.p_filesz);
+ __syncicache(p, ph.p_memsz);
}
ofw_close(bootdev);
(*(void (*)(void *, int, ofwfp_t, char *, int))eh.e_entry)(NULL, 0,
More information about the Zrouter-src-freebsd
mailing list