svn commit: r276356 - head/sys/boot/powerpc/boot1.chrp
Author: dim
Date: Mon Dec 29 09:24:21 2014
New Revision: 276356
URL: https://svnweb.freebsd.org/changeset/base/276356
Log:
Use -Wl, to pass options to the linker for PowerPC's boot1.chrp.
MFC after:3 days
Modified:
head/sys/boot/powerpc/boot1.chrp/Makefile
Modified: head/sys/boot/powerpc/boot1.chrp/Makefile
==
--- head/sys/boot/powerpc/boot1.chrp/Makefile Mon Dec 29 02:13:06 2014
(r276355)
+++ head/sys/boot/powerpc/boot1.chrp/Makefile Mon Dec 29 09:24:21 2014
(r276356)
@@ -15,7 +15,7 @@ MAN=
CFLAGS= -ffreestanding -msoft-float -Os \
-I${.CURDIR}/../../common -I${.CURDIR}/../../../ \
-D_STANDALONE
-LDFLAGS=-nostdlib -static -N
+LDFLAGS=-nostdlib -static -Wl,-N
.include "${.CURDIR}/../Makefile.inc"
.PATH: ${.CURDIR}/../../../libkern
${.CURDIR}/../../../../lib/libc/powerpc/gen ${.CURDIR}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276358 - head/sys/dev/virtio/mmio
Author: andrew
Date: Mon Dec 29 11:02:18 2014
New Revision: 276358
URL: https://svnweb.freebsd.org/changeset/base/276358
Log:
Allow virtio_mmio to attach to ofwbus. Qemu places these here on at least
the AArch64 virtual platform with the Linaro UEFI.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/virtio/mmio/virtio_mmio.c
Modified: head/sys/dev/virtio/mmio/virtio_mmio.c
==
--- head/sys/dev/virtio/mmio/virtio_mmio.c Mon Dec 29 09:27:42 2014
(r276357)
+++ head/sys/dev/virtio/mmio/virtio_mmio.c Mon Dec 29 11:02:18 2014
(r276358)
@@ -202,6 +202,7 @@ static driver_t vtmmio_driver = {
devclass_t vtmmio_devclass;
DRIVER_MODULE(virtio_mmio, simplebus, vtmmio_driver, vtmmio_devclass, 0, 0);
+DRIVER_MODULE(virtio_mmio, ofwbus, vtmmio_driver, vtmmio_devclass, 0, 0);
MODULE_VERSION(virtio_mmio, 1);
MODULE_DEPEND(virtio_mmio, simplebus, 1, 1, 1);
MODULE_DEPEND(virtio_mmio, virtio, 1, 1, 1);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276359 - head/bin/ln
Author: jilles Date: Mon Dec 29 13:02:03 2014 New Revision: 276359 URL: https://svnweb.freebsd.org/changeset/base/276359 Log: symlink(7): Note that stat(1) does not follow symlinks by default. MFC after:1 week Modified: head/bin/ln/symlink.7 Modified: head/bin/ln/symlink.7 == --- head/bin/ln/symlink.7 Mon Dec 29 11:02:18 2014(r276358) +++ head/bin/ln/symlink.7 Mon Dec 29 13:02:03 2014(r276359) @@ -29,7 +29,7 @@ .\"@(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" $FreeBSD$ .\" -.Dd April 25, 2010 +.Dd December 29, 2014 .Dt SYMLINK 7 .Os .Sh NAME @@ -219,7 +219,7 @@ would change the ownership of .Dq Li slink itself. .Pp -There are four exceptions to this rule. +There are five exceptions to this rule. The .Xr mv 1 and @@ -262,13 +262,12 @@ a file tree.) .Pp The .Xr file 1 -command is also an exception to this rule. -The -.Xr file 1 -command does not follow symbolic links named as argument by default. -The -.Xr file 1 -command does follow symbolic links named as argument if +and +.Xr stat 1 +commands are also exceptions to this rule. +These +commands do not follow symbolic links named as argument by default, +but do follow symbolic links named as argument if the .Fl L option is specified. .Pp ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276360 - in head: cddl/contrib/opensolaris/cmd/zpool lib/libc/regex lib/msun/man sbin/bsdlabel sbin/camcontrol sbin/geom/class/label sbin/ipfw sbin/iscontrol sbin/mount_nfs sbin/routed...
Author: joel (doc committer) Date: Mon Dec 29 13:50:59 2014 New Revision: 276360 URL: https://svnweb.freebsd.org/changeset/base/276360 Log: mdoc: remove EOL whitespace. Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 head/lib/libc/regex/re_format.7 head/lib/msun/man/lgamma.3 head/sbin/bsdlabel/bsdlabel.8 head/sbin/camcontrol/camcontrol.8 head/sbin/geom/class/label/glabel.8 head/sbin/ipfw/ipfw.8 head/sbin/iscontrol/iscontrol.8 head/sbin/mount_nfs/mount_nfs.8 head/sbin/routed/routed.8 head/share/man/man4/ada.4 head/share/man/man7/crypto.7 head/share/man/man7/hier.7 head/sys/boot/common/loader.8 head/usr.bin/soeliminate/soeliminate.1 head/usr.sbin/bsdinstall/bsdinstall.8 head/usr.sbin/kbdcontrol/kbdcontrol.1 Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 == --- head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7Mon Dec 29 13:02:03 2014(r276359) +++ head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7Mon Dec 29 13:50:59 2014(r276360) @@ -443,7 +443,7 @@ This feature becomes .Sy active once a .Sy recordsize -property has been set larger than 128KB, and will return to being +property has been set larger than 128KB, and will return to being .Sy enabled once all filesystems that have ever had their recordsize larger than 128KB are destroyed. Modified: head/lib/libc/regex/re_format.7 == --- head/lib/libc/regex/re_format.7 Mon Dec 29 13:02:03 2014 (r276359) +++ head/lib/libc/regex/re_format.7 Mon Dec 29 13:50:59 2014 (r276360) @@ -314,10 +314,10 @@ compatible with but not specified by .St -p1003.2 , and should be used with caution in software intended to be portable to other systems. -The additional word delimiters +The additional word delimiters .Ql \e< and -.Ql \e> +.Ql \e> are provided to ease compatibility with traditional .Xr svr4 4 systems but are not portable and should be avoided. Modified: head/lib/msun/man/lgamma.3 == --- head/lib/msun/man/lgamma.3 Mon Dec 29 13:02:03 2014(r276359) +++ head/lib/msun/man/lgamma.3 Mon Dec 29 13:50:59 2014(r276360) @@ -99,7 +99,7 @@ returns the sign of \(*G(x). and .Fn lgammal_r x signgamp provide the same functionality as -.Fn lgamma x , +.Fn lgamma x , .Fn lgammaf x , and .Fn lgammal x , Modified: head/sbin/bsdlabel/bsdlabel.8 == --- head/sbin/bsdlabel/bsdlabel.8 Mon Dec 29 13:02:03 2014 (r276359) +++ head/sbin/bsdlabel/bsdlabel.8 Mon Dec 29 13:50:59 2014 (r276360) @@ -109,7 +109,7 @@ argument forces .Nm to use a layout suitable for a different architecture. Current valid values are -.Cm i386 , amd64 , +.Cm i386 , amd64 , and .Cm pc98 . If this option is omitted, Modified: head/sbin/camcontrol/camcontrol.8 == --- head/sbin/camcontrol/camcontrol.8 Mon Dec 29 13:02:03 2014 (r276359) +++ head/sbin/camcontrol/camcontrol.8 Mon Dec 29 13:50:59 2014 (r276360) @@ -1613,7 +1613,7 @@ For example: .It FC A Fibre Channel Transport ID consists of .Dq fcp, -followed by a 64-bit Fibre Channel World Wide Name. +followed by a 64-bit Fibre Channel World Wide Name. For example: .Pp .Dl fcp,0x1234567812345678 @@ -1735,11 +1735,11 @@ May also be specified as .Dq exclusive_access . .It wr_ex_ro Write Exclusive Registrants Only mode. -May also be specified as +May also be specified as .Dq write_exclusive_reg_only . .It ex_ac_ro Exclusive Access Registrants Only mode. -May also be specified as +May also be specified as .Dq exclusive_access_reg_only . .It wr_ex_ar Write Exclusive All Registrants mode. @@ -1747,7 +1747,7 @@ May also be specified as .Dq write_exclusive_all_regs . .It ex_ac_ar Exclusive Access All Registrants mode. -May also be specified as +May also be specified as .Dq exclusive_access_all_regs . .El .It Fl U @@ -1931,7 +1931,7 @@ camcontrol persist da0 -v -i read_keys .Pp This will read any persistent reservation keys registered with da0, and display any errors encountered when sending the PERSISTENT RESERVE IN -.Tn SCSI +.Tn SCSI command. .Bd -literal -offset indent camcontrol persist da0 -v -o register -a -K 0x12345678 @@ -1976,9 +1976,9 @@ camcontrol persist da0 -v -o register_mo .Ed .Pp This will move the registration from the current initiator, whose -Registration Key is 0x87654321, to the Fibre Channel initiator with the +Registration Key is 0x87654321, to the Fibre Channel initiator with the Fiber Channel World Wide Node Name 0x1234567812345678. -A new registration key, 0x12345678, will be registered for the initiator +A new regist
Re: svn commit: r276195 - in head: . lib/libxo
> On 25 Dec 2014, at 03:15 , Alfred Perlstein wrote:
>
> Author: alfred
> Date: Thu Dec 25 03:15:56 2014
> New Revision: 276195
> URL: https://svnweb.freebsd.org/changeset/base/276195
>
> Log:
> Move libxo to /lib
>
> Update ObsoleteFiles to reflect libxo move.
What this commit message doesn’t say is “WHY?” Everything else you described
is kind of obvious from the commit diff ;-)
> Reviewed by: ngie
> Differential Revision: https://reviews.freebsd.org/D1370
>
> Modified:
> head/ObsoleteFiles.inc
> head/lib/libxo/Makefile
>
> Modified: head/ObsoleteFiles.inc
> ==
> --- head/ObsoleteFiles.incThu Dec 25 02:17:17 2014(r276194)
> +++ head/ObsoleteFiles.incThu Dec 25 03:15:56 2014(r276195)
> @@ -38,6 +38,9 @@
> # xargs -n1 | sort | uniq -d;
> # done
>
> +# 20141224: libxo moved to /lib
> +OLD_FILES+=usr/lib/libxo.a
> +OLD_FILES+=usr/lib/libxo_p.a
> # 20141223: remove in6_gif.h, in_gif.h and if_stf.h
> OLD_FILES+=usr/include/net/if_stf.h
> OLD_FILES+=usr/include/netinet/in_gif.h
>
> Modified: head/lib/libxo/Makefile
> ==
> --- head/lib/libxo/Makefile Thu Dec 25 02:17:17 2014(r276194)
> +++ head/lib/libxo/Makefile Thu Dec 25 03:15:56 2014(r276195)
> @@ -7,6 +7,8 @@ LIBXO=${.CURDIR:H:H}/contrib/libxo
> LIB= xo
> SHLIB_MAJOR=0
>
> +SHLIBDIR?= /lib
> +
> SRCS= libxo.c
>
> CFLAGS+=-I${LIBXO}/libxo
>
—
Bjoern A. Zeeb Charles Haddon Spurgeon:
"Friendship is one of the sweetest joys of life. Many might have failed
beneath the bitterness of their trial had they not found a friend."
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276195 - in head: . lib/libxo
You are correct.
Reason for move was due to programs inside of /bin and /sbin depending
on libxo.
-Alfred
On 12/29/14 8:49 AM, Bjoern A. Zeeb wrote:
On 25 Dec 2014, at 03:15 , Alfred Perlstein wrote:
Author: alfred
Date: Thu Dec 25 03:15:56 2014
New Revision: 276195
URL: https://svnweb.freebsd.org/changeset/base/276195
Log:
Move libxo to /lib
Update ObsoleteFiles to reflect libxo move.
What this commit message doesn’t say is “WHY?” Everything else you described
is kind of obvious from the commit diff ;-)
Reviewed by: ngie
Differential Revision: https://reviews.freebsd.org/D1370
Modified:
head/ObsoleteFiles.inc
head/lib/libxo/Makefile
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Thu Dec 25 02:17:17 2014(r276194)
+++ head/ObsoleteFiles.inc Thu Dec 25 03:15:56 2014(r276195)
@@ -38,6 +38,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20141224: libxo moved to /lib
+OLD_FILES+=usr/lib/libxo.a
+OLD_FILES+=usr/lib/libxo_p.a
# 20141223: remove in6_gif.h, in_gif.h and if_stf.h
OLD_FILES+=usr/include/net/if_stf.h
OLD_FILES+=usr/include/netinet/in_gif.h
Modified: head/lib/libxo/Makefile
==
--- head/lib/libxo/Makefile Thu Dec 25 02:17:17 2014(r276194)
+++ head/lib/libxo/Makefile Thu Dec 25 03:15:56 2014(r276195)
@@ -7,6 +7,8 @@ LIBXO= ${.CURDIR:H:H}/contrib/libxo
LIB=xo
SHLIB_MAJOR=0
+SHLIBDIR?= /lib
+
SRCS= libxo.c
CFLAGS+=-I${LIBXO}/libxo
—
Bjoern A. Zeeb Charles Haddon Spurgeon:
"Friendship is one of the sweetest joys of life. Many might have failed
beneath the bitterness of their trial had they not found a friend."
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276367 - head/sys/dev/virtio/network
Author: andrew
Date: Mon Dec 29 17:17:01 2014
New Revision: 276367
URL: https://svnweb.freebsd.org/changeset/base/276367
Log:
Attach vtnet to virtio_mmio. Qemu provides this as an option with AArch64.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/virtio/network/if_vtnet.c
Modified: head/sys/dev/virtio/network/if_vtnet.c
==
--- head/sys/dev/virtio/network/if_vtnet.c Mon Dec 29 16:32:24 2014
(r276366)
+++ head/sys/dev/virtio/network/if_vtnet.c Mon Dec 29 17:17:01 2014
(r276367)
@@ -298,6 +298,8 @@ static driver_t vtnet_driver = {
};
static devclass_t vtnet_devclass;
+DRIVER_MODULE(vtnet, virtio_mmio, vtnet_driver, vtnet_devclass,
+vtnet_modevent, 0);
DRIVER_MODULE(vtnet, virtio_pci, vtnet_driver, vtnet_devclass,
vtnet_modevent, 0);
MODULE_VERSION(vtnet, 1);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276195 - in head: . lib/libxo
> On Dec 29, 2014, at 08:52, Alfred Perlstein wrote: > > You are correct. > > Reason for move was due to programs inside of /bin and /sbin depending on > libxo. ... And the fact that / and /usr can be on separate filesystems, etc. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276369 - head
Author: emaste Date: Mon Dec 29 19:02:00 2014 New Revision: 276369 URL: https://svnweb.freebsd.org/changeset/base/276369 Log: Merge elftoolchain directory shuffling from elftoolchain update branch Modified: Directory Properties: head/ (props changed) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276369 - head
On Dec 29, 2014, at 11:02, Ed Maste wrote: > Author: emaste > Date: Mon Dec 29 19:02:00 2014 > New Revision: 276369 > URL: https://svnweb.freebsd.org/changeset/base/276369 > > Log: > Merge elftoolchain directory shuffling from elftoolchain update branch > > Modified: > Directory Properties: > head/ (props changed) Hi Ed, Was merging just the mergeinfo intentional? signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r276371 - in head: contrib/elftoolchain/common contrib/elftoolchain/elfcopy contrib/elftoolchain/libdwarf contrib/elftoolchain/libelf contrib/elftoolchain/libelftc contrib/elftoolchain/...
Author: emaste Date: Mon Dec 29 19:16:40 2014 New Revision: 276371 URL: https://svnweb.freebsd.org/changeset/base/276371 Log: Update elftoolchain to upstream rev 3130 This includes a number of libdwarf improvements (particularly DWARF4 related) and updates to elftoolchain tools such as strip(1). It also includes a large number of miscellaneous fixes (memory leaks, sign and cast warnings, integer overflow and underflow, etc.). This is a merge of r276167,276170-276172 from the projects/elftoolchain-update-r3130 branch. Sponsored by: The FreeBSD Foundation Added: head/contrib/elftoolchain/libdwarf/dwarf_attroffset.3 - copied unchanged from r276167, projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_attroffset.3 head/contrib/elftoolchain/libdwarf/dwarf_get_die_infotypes_flag.3 - copied unchanged from r276167, projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_get_die_infotypes_flag.3 head/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 - copied unchanged from r276167, projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 head/contrib/elftoolchain/libdwarf/dwarf_next_types_section.3 - copied unchanged from r276167, projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_next_types_section.3 head/contrib/elftoolchain/libdwarf/dwarf_sections.c - copied unchanged from r276167, projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_sections.c Modified: head/contrib/elftoolchain/common/Makefile head/contrib/elftoolchain/common/elfdefinitions.h head/contrib/elftoolchain/elfcopy/archive.c head/contrib/elftoolchain/elfcopy/main.c head/contrib/elftoolchain/elfcopy/sections.c head/contrib/elftoolchain/elfcopy/segments.c head/contrib/elftoolchain/elfcopy/symbols.c head/contrib/elftoolchain/libdwarf/Makefile head/contrib/elftoolchain/libdwarf/Version.map head/contrib/elftoolchain/libdwarf/_libdwarf.h head/contrib/elftoolchain/libdwarf/dwarf.3 head/contrib/elftoolchain/libdwarf/dwarf.h head/contrib/elftoolchain/libdwarf/dwarf_attr.3 head/contrib/elftoolchain/libdwarf/dwarf_attr.c head/contrib/elftoolchain/libdwarf/dwarf_attrval.c head/contrib/elftoolchain/libdwarf/dwarf_attrval_signed.3 head/contrib/elftoolchain/libdwarf/dwarf_child.3 head/contrib/elftoolchain/libdwarf/dwarf_cu.c head/contrib/elftoolchain/libdwarf/dwarf_die.c head/contrib/elftoolchain/libdwarf/dwarf_dieoffset.3 head/contrib/elftoolchain/libdwarf/dwarf_dump.c head/contrib/elftoolchain/libdwarf/dwarf_errmsg.c head/contrib/elftoolchain/libdwarf/dwarf_frame.c head/contrib/elftoolchain/libdwarf/dwarf_highpc.3 head/contrib/elftoolchain/libdwarf/dwarf_lineno.c head/contrib/elftoolchain/libdwarf/dwarf_loclist.c head/contrib/elftoolchain/libdwarf/dwarf_loclist_from_expr.3 head/contrib/elftoolchain/libdwarf/dwarf_next_cu_header.3 head/contrib/elftoolchain/libdwarf/dwarf_ranges.c head/contrib/elftoolchain/libdwarf/libdwarf.h head/contrib/elftoolchain/libdwarf/libdwarf_arange.c head/contrib/elftoolchain/libdwarf/libdwarf_attr.c head/contrib/elftoolchain/libdwarf/libdwarf_die.c head/contrib/elftoolchain/libdwarf/libdwarf_frame.c head/contrib/elftoolchain/libdwarf/libdwarf_info.c head/contrib/elftoolchain/libdwarf/libdwarf_init.c head/contrib/elftoolchain/libdwarf/libdwarf_lineno.c head/contrib/elftoolchain/libdwarf/libdwarf_loc.c head/contrib/elftoolchain/libdwarf/libdwarf_loclist.c head/contrib/elftoolchain/libdwarf/libdwarf_nametbl.c head/contrib/elftoolchain/libdwarf/libdwarf_sections.c head/contrib/elftoolchain/libelf/_libelf.h head/contrib/elftoolchain/libelf/_libelf_ar.h head/contrib/elftoolchain/libelf/elf.3 head/contrib/elftoolchain/libelf/elf_data.c head/contrib/elftoolchain/libelf/elf_errmsg.c head/contrib/elftoolchain/libelf/elf_flag.c head/contrib/elftoolchain/libelf/elf_memory.c head/contrib/elftoolchain/libelf/elf_next.c head/contrib/elftoolchain/libelf/elf_open.c head/contrib/elftoolchain/libelf/elf_rand.c head/contrib/elftoolchain/libelf/elf_rawfile.c head/contrib/elftoolchain/libelf/elf_scn.c head/contrib/elftoolchain/libelf/elf_strptr.c head/contrib/elftoolchain/libelf/elf_update.c head/contrib/elftoolchain/libelf/gelf_cap.c head/contrib/elftoolchain/libelf/gelf_dyn.c head/contrib/elftoolchain/libelf/gelf_ehdr.c head/contrib/elftoolchain/libelf/gelf_move.c head/contrib/elftoolchain/libelf/gelf_phdr.c head/contrib/elftoolchain/libelf/gelf_rel.c head/contrib/elftoolchain/libelf/gelf_rela.c head/contrib/elftoolchain/libelf/gelf_shdr.c head/contrib/elftoolchain/libelf/gelf_sym.c head/contrib/elftoolchain/libelf/gelf_syminfo.c head/contrib/elftoolchain/libelf/gelf_symshndx.c head/contrib/elftoolchain/libelf/libelf.h head/contrib/elftoolchain/libelf/libelf_align.c head/contrib/elftoolchain/libelf/libelf_ar.c head/contrib/elftoolc
Re: svn commit: r276369 - head
On 29 December 2014 at 14:07, Garrett Cooper wrote: > On Dec 29, 2014, at 11:02, Ed Maste wrote: > >> Author: emaste >> Date: Mon Dec 29 19:02:00 2014 >> New Revision: 276369 >> URL: https://svnweb.freebsd.org/changeset/base/276369 >> >> Log: >> Merge elftoolchain directory shuffling from elftoolchain update branch >> >> Modified: >> Directory Properties: >> head/ (props changed) > > Hi Ed, > Was merging just the mergeinfo intentional? I was not expecting any file content changes, so I suppose so. I might have expected Subversion to list the directory content replacements as with the corresponding change on the branch (r276164). ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276372 - head/contrib/elftoolchain/libelf
Author: emaste Date: Mon Dec 29 19:27:10 2014 New Revision: 276372 URL: https://svnweb.freebsd.org/changeset/base/276372 Log: Restore r276252 mdoc fix It was accidentally reverted in the elftoolchain update (r276371). Sponsored by: The FreeBSD Foundation Modified: head/contrib/elftoolchain/libelf/elf.3 Modified: head/contrib/elftoolchain/libelf/elf.3 == --- head/contrib/elftoolchain/libelf/elf.3 Mon Dec 29 19:16:40 2014 (r276371) +++ head/contrib/elftoolchain/libelf/elf.3 Mon Dec 29 19:27:10 2014 (r276372) @@ -413,7 +413,6 @@ Section types in the range .Dv SHT_HIUSER ] are otherwise considered to be of type .Dv ELF_T_BYTE . -.TE .Ss Functional Grouping This section contains a brief overview of the available functionality in the ELF library. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276373 - head/contrib/elftoolchain/readelf
Author: emaste Date: Mon Dec 29 19:38:12 2014 New Revision: 276373 URL: https://svnweb.freebsd.org/changeset/base/276373 Log: Rename DT_FEATURE_1 to DT_FEATURE Track r270303: This provides a minor cleanup in elfdump; there are otherwise no consumers in the tree. Old SUN documentation can be found for either variant, but GNU binutils switched to DT_FEATURE around 2000. Sponsored by: The FreeBSD Foundation Modified: head/contrib/elftoolchain/readelf/readelf.c Modified: head/contrib/elftoolchain/readelf/readelf.c == --- head/contrib/elftoolchain/readelf/readelf.c Mon Dec 29 19:27:10 2014 (r276372) +++ head/contrib/elftoolchain/readelf/readelf.c Mon Dec 29 19:38:12 2014 (r276373) @@ -903,7 +903,7 @@ dt_type(unsigned int mach, unsigned int case DT_PLTPADSZ: return "PLTPADSZ"; case DT_MOVEENT: return "MOVEENT"; case DT_MOVESZ: return "MOVESZ"; - case DT_FEATURE_1: return "FEATURE_1"; + case DT_FEATURE: return "FEATURE"; case DT_POSFLAG_1: return "POSFLAG_1"; case DT_SYMINSZ: return "SYMINSZ"; case DT_SYMINENT: return "SYMINENT"; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276374 - head/contrib/elftoolchain/libelf
Author: emaste
Date: Mon Dec 29 20:23:42 2014
New Revision: 276374
URL: https://svnweb.freebsd.org/changeset/base/276374
Log:
libelf: Do not read past end of buffer
Previously a corrupt ELF file could read beyond the end of e_rawfile.
Upstream elftoolchain ticket 462. Found via the security/afl fuzzer.
Sponsored by: The FreeBSD Foundation
Modified:
head/contrib/elftoolchain/libelf/elf_scn.c
Modified: head/contrib/elftoolchain/libelf/elf_scn.c
==
--- head/contrib/elftoolchain/libelf/elf_scn.c Mon Dec 29 19:38:12 2014
(r276373)
+++ head/contrib/elftoolchain/libelf/elf_scn.c Mon Dec 29 20:23:42 2014
(r276374)
@@ -50,6 +50,7 @@ _libelf_load_section_headers(Elf *e, voi
Elf64_Ehdr *eh64;
int ec, swapbytes;
unsigned char *src;
+ unsigned char *rawend;
size_t fsz, i, shnum;
int (*xlator)(unsigned char *_d, size_t _dsz, unsigned char *_s,
size_t _c, int _swap);
@@ -86,6 +87,7 @@ _libelf_load_section_headers(Elf *e, voi
swapbytes = e->e_byteorder != LIBELF_PRIVATE(byteorder);
src = e->e_rawfile + shoff;
+ rawend = e->e_rawfile + e->e_rawsize;
/*
* If the file is using extended numbering then section #0
@@ -102,6 +104,8 @@ _libelf_load_section_headers(Elf *e, voi
}
for (; i < shnum; i++, src += fsz) {
+ if (src + sizeof(scn->s_shdr) > rawend)
+ return (0);
if ((scn = _libelf_allocate_scn(e, i)) == NULL)
return (0);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276377 - head/sys/i386/conf
Author: marius Date: Mon Dec 29 20:33:34 2014 New Revision: 276377 URL: https://svnweb.freebsd.org/changeset/base/276377 Log: - No longer exclude malo(4) and mwl(4), they have been fixed in r275870 and r275871 respectively to build with PAE enabled. - For the PAE kernel configuration file, no longer exclude devices that are known to be 64-bit DMA clean from amd64. MFC after:3 days Modified: head/sys/i386/conf/PAE head/sys/i386/conf/XEN Modified: head/sys/i386/conf/PAE == --- head/sys/i386/conf/PAE Mon Dec 29 20:31:26 2014(r276376) +++ head/sys/i386/conf/PAE Mon Dec 29 20:33:34 2014(r276377) @@ -10,73 +10,14 @@ ident PAE-GENERIC # To make a PAE kernel, the next option is needed optionsPAE # Physical Address Extensions Kernel -# The following modules don't build with PAE enabled. -makeoptionsWITHOUT_MODULES="ctl dpt hptmv ida malo mwl" - -# What follows is a list of drivers that are normally in GENERIC, but either -# don't work or are untested with PAE. Be very careful before enabling any -# of these drivers. Drivers which use DMA and don't handle 64 bit physical -# address properly may cause data corruption when used in a machine with more -# than 4 gigabytes of memory. - -nodevice ahb -nodevice sym -nodevice trm - -nodevice adv -nodevice adw -nodevice aha -nodevice aic -nodevice bt - -nodevice ncv -nodevice nsp -nodevice stg - -nodevice asr +# The following drivers don't build with PAE enabled. +makeoptionsWITHOUT_MODULES="ctl dpt hptmv ida" nodevice dpt -nodevice mly nodevice hptmv -nodevice hptnr -nodevice hptrr - nodevice ida -nodevice mlx -nodevice pst - -nodevice agp - -nodevice txp -nodevice vx - -nodevice pcn -nodevice sf -nodevice sis -nodevice ste -nodevice tl -nodevice tx -nodevice vr -nodevice wb -nodevice cs -nodevice ed -nodevice ex -nodevice ep -nodevice fe -nodevice ie -nodevice sn -nodevice xe - -nodevice an -nodevice ath # Atheros pci/cardbus NICs -nodevice ath_pci -nodevice ath_hal -nodevice ath_rate_sample # SampleRate tx rate control for ath -nodevice ipw -nodevice iwi -nodevice iwn -nodevice malo -nodevice mwl -nodevice ral -nodevice wi -nodevice wpi +# The following drivers don't work with PAE enabled. +makeoptionsWITHOUT_MODULES+="asr ncr pst" +nodevice asr +nodevice ncr +nodevice pst Modified: head/sys/i386/conf/XEN == --- head/sys/i386/conf/XEN Mon Dec 29 20:31:26 2014(r276376) +++ head/sys/i386/conf/XEN Mon Dec 29 20:33:34 2014(r276377) @@ -9,7 +9,7 @@ ident XEN makeoptionsDEBUG=-g# Build kernel with gdb(1) debug symbols # The following modules don't build with PAE and XEN enabled. -makeoptionsWITHOUT_MODULES="ctl dpt drm drm2 hptmv ida malo mwl" +makeoptionsWITHOUT_MODULES="ctl dpt drm drm2 hptmv ida" optionsSCHED_ULE # ULE scheduler optionsPREEMPTION # Enable kernel thread preemption ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276381 - head/lib/libgssapi
Author: joel (doc committer) Date: Mon Dec 29 21:52:32 2014 New Revision: 276381 URL: https://svnweb.freebsd.org/changeset/base/276381 Log: mdoc: sort SEE ALSO. Modified: head/lib/libgssapi/gss_acquire_cred.3 head/lib/libgssapi/gss_add_cred.3 head/lib/libgssapi/gss_add_oid_set_member.3 head/lib/libgssapi/gss_create_empty_oid_set.3 head/lib/libgssapi/gss_delete_sec_context.3 head/lib/libgssapi/gss_get_mic.3 head/lib/libgssapi/gss_import_sec_context.3 head/lib/libgssapi/gss_inquire_context.3 head/lib/libgssapi/gss_process_context_token.3 head/lib/libgssapi/gss_test_oid_set_member.3 head/lib/libgssapi/gss_unwrap.3 head/lib/libgssapi/gss_wrap.3 Modified: head/lib/libgssapi/gss_acquire_cred.3 == --- head/lib/libgssapi/gss_acquire_cred.3 Mon Dec 29 21:43:02 2014 (r276380) +++ head/lib/libgssapi/gss_acquire_cred.3 Mon Dec 29 21:52:32 2014 (r276381) @@ -189,10 +189,10 @@ The credentials could not be acquired be No credentials were found for the specified name. .El .Sh SEE ALSO -.Xr gss_init_sec_context 3 , .Xr gss_accept_sec_context 3 , -.Xr gss_inquire_cred 3 , +.Xr gss_init_sec_context 3 , .Xr gss_inquire_context 3 , +.Xr gss_inquire_cred 3 , .Xr gss_release_cred 3 , .Xr gss_release_oid_set 3 .Sh STANDARDS Modified: head/lib/libgssapi/gss_add_cred.3 == --- head/lib/libgssapi/gss_add_cred.3 Mon Dec 29 21:43:02 2014 (r276380) +++ head/lib/libgssapi/gss_add_cred.3 Mon Dec 29 21:52:32 2014 (r276381) @@ -288,11 +288,11 @@ The required credentials could not be ad No credentials were found for the specified name. .El .Sh SEE ALSO -.Xr gss_init_sec_context 3 , .Xr gss_accept_sec_context 3 , .Xr gss_acquire_cred 3 , -.Xr gss_inquire_cred 3 , +.Xr gss_init_sec_context 3 , .Xr gss_inquire_context 3 , +.Xr gss_inquire_cred 3 , .Xr gss_release_cred 3 , .Xr gss_release_oid_set 3 .Sh STANDARDS Modified: head/lib/libgssapi/gss_add_oid_set_member.3 == --- head/lib/libgssapi/gss_add_oid_set_member.3 Mon Dec 29 21:43:02 2014 (r276380) +++ head/lib/libgssapi/gss_add_oid_set_member.3 Mon Dec 29 21:52:32 2014 (r276381) @@ -85,8 +85,8 @@ The set in which the object identifier s Successful completion .El .Sh SEE ALSO -.Xr gss_create_empty_oid_set 3 , -.Xr gss_acquire_cred 3 +.Xr gss_acquire_cred 3 , +.Xr gss_create_empty_oid_set 3 .Sh STANDARDS .Bl -tag -width ".It RFC 2743" .It RFC 2743 Modified: head/lib/libgssapi/gss_create_empty_oid_set.3 == --- head/lib/libgssapi/gss_create_empty_oid_set.3 Mon Dec 29 21:43:02 2014(r276380) +++ head/lib/libgssapi/gss_create_empty_oid_set.3 Mon Dec 29 21:52:32 2014(r276381) @@ -66,8 +66,8 @@ which the application must free after us Successful completion .El .Sh SEE ALSO -.Xr gss_add_oid_set_member 3 , -.Xr gss_acquire_cred 3 +.Xr gss_acquire_cred 3 , +.Xr gss_add_oid_set_member 3 .Sh STANDARDS .Bl -tag -width ".It RFC 2743" .It RFC 2743 Modified: head/lib/libgssapi/gss_delete_sec_context.3 == --- head/lib/libgssapi/gss_delete_sec_context.3 Mon Dec 29 21:43:02 2014 (r276380) +++ head/lib/libgssapi/gss_delete_sec_context.3 Mon Dec 29 21:52:32 2014 (r276381) @@ -117,9 +117,9 @@ Successful completion No valid context was supplied .El .Sh SEE ALSO -.Xr gss_process_context_token 3 , +.Xr gss_accept_sec_context 3 , .Xr gss_init_sec_context 3 , -.Xr gss_accept_sec_context 3 +.Xr gss_process_context_token 3 .Sh STANDARDS .Bl -tag -width ".It RFC 2743" .It RFC 2743 Modified: head/lib/libgssapi/gss_get_mic.3 == --- head/lib/libgssapi/gss_get_mic.3Mon Dec 29 21:43:02 2014 (r276380) +++ head/lib/libgssapi/gss_get_mic.3Mon Dec 29 21:52:32 2014 (r276381) @@ -120,8 +120,8 @@ The context_handle parameter did not ide The specified QOP is not supported by the mechanism .El .Sh SEE ALSO -.Xr gss_wrap 3 , -.Xr gss_release_buffer 3 +.Xr gss_release_buffer 3 , +.Xr gss_wrap 3 .Sh STANDARDS .Bl -tag -width ".It RFC 2743" .It RFC 2743 Modified: head/lib/libgssapi/gss_import_sec_context.3 == --- head/lib/libgssapi/gss_import_sec_context.3 Mon Dec 29 21:43:02 2014 (r276380) +++ head/lib/libgssapi/gss_import_sec_context.3 Mon Dec 29 21:52:32 2014 (r276381) @@ -75,8 +75,8 @@ The operation is unavailable Local policy prevents the import of this context by the current process .El .Sh SEE ALSO -.Xr gss_export_sec_context 3 , -.Xr gss_delete_sec_context 3 +.Xr gss_delete_sec_context 3
svn commit: r276382 - head/lib/librpcsec_gss
Author: joel (doc committer) Date: Mon Dec 29 21:59:44 2014 New Revision: 276382 URL: https://svnweb.freebsd.org/changeset/base/276382 Log: mdoc: sort SEE ALSO. Modified: head/lib/librpcsec_gss/rpc_gss_get_error.3 head/lib/librpcsec_gss/rpc_gss_get_mech_info.3 head/lib/librpcsec_gss/rpc_gss_get_mechanisms.3 head/lib/librpcsec_gss/rpc_gss_get_principal_name.3 head/lib/librpcsec_gss/rpc_gss_get_versions.3 head/lib/librpcsec_gss/rpc_gss_getcred.3 head/lib/librpcsec_gss/rpc_gss_is_installed.3 head/lib/librpcsec_gss/rpc_gss_max_data_length.3 head/lib/librpcsec_gss/rpc_gss_mech_to_oid.3 head/lib/librpcsec_gss/rpc_gss_oid_to_mech.3 head/lib/librpcsec_gss/rpc_gss_qop_to_num.3 head/lib/librpcsec_gss/rpc_gss_seccreate.3 head/lib/librpcsec_gss/rpc_gss_set_callback.3 head/lib/librpcsec_gss/rpc_gss_set_defaults.3 head/lib/librpcsec_gss/rpc_gss_set_svc_name.3 head/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3 head/lib/librpcsec_gss/rpcsec_gss.3 Modified: head/lib/librpcsec_gss/rpc_gss_get_error.3 == --- head/lib/librpcsec_gss/rpc_gss_get_error.3 Mon Dec 29 21:52:32 2014 (r276381) +++ head/lib/librpcsec_gss/rpc_gss_get_error.3 Mon Dec 29 21:59:44 2014 (r276382) @@ -44,8 +44,8 @@ Get details of the last RPCSEC_GSS error A pointer to a structure where the error details will be returned .El .Sh SEE ALSO -.Xr rpc 3 , .Xr gssapi 3 , +.Xr rpc 3 , .Xr rpcset_gss 3 .Sh HISTORY The Modified: head/lib/librpcsec_gss/rpc_gss_get_mech_info.3 == --- head/lib/librpcsec_gss/rpc_gss_get_mech_info.3 Mon Dec 29 21:52:32 2014(r276381) +++ head/lib/librpcsec_gss/rpc_gss_get_mech_info.3 Mon Dec 29 21:59:44 2014(r276382) @@ -54,8 +54,8 @@ a list of the supported qualities of pro otherwise .Dv NULL . .Sh SEE ALSO -.Xr rpc 3 , .Xr gssapi 3 , +.Xr rpc 3 , .Xr rpcset_gss 3 .Sh HISTORY The Modified: head/lib/librpcsec_gss/rpc_gss_get_mechanisms.3 == --- head/lib/librpcsec_gss/rpc_gss_get_mechanisms.3 Mon Dec 29 21:52:32 2014(r276381) +++ head/lib/librpcsec_gss/rpc_gss_get_mechanisms.3 Mon Dec 29 21:59:44 2014(r276382) @@ -41,8 +41,8 @@ Return a .Dv NULL terminated list of installed security mechanisms. .Sh SEE ALSO -.Xr rpc 3 , .Xr gssapi 3 , +.Xr rpc 3 , .Xr rpcset_gss 3 .Sh HISTORY The Modified: head/lib/librpcsec_gss/rpc_gss_get_principal_name.3 == --- head/lib/librpcsec_gss/rpc_gss_get_principal_name.3 Mon Dec 29 21:52:32 2014(r276381) +++ head/lib/librpcsec_gss/rpc_gss_get_principal_name.3 Mon Dec 29 21:59:44 2014(r276382) @@ -67,9 +67,9 @@ if the principal was created or .Dv FALSE otherwise .Sh SEE ALSO -.Xr rpc 3 , -.Xr gssapi 3 , .Xr gss_export_name 3 , +.Xr gssapi 3 , +.Xr rpc 3 , .Xr rpcset_gss 3 .Sh HISTORY The Modified: head/lib/librpcsec_gss/rpc_gss_get_versions.3 == --- head/lib/librpcsec_gss/rpc_gss_get_versions.3 Mon Dec 29 21:52:32 2014(r276381) +++ head/lib/librpcsec_gss/rpc_gss_get_versions.3 Mon Dec 29 21:59:44 2014(r276382) @@ -50,8 +50,8 @@ The value of is set to the lowest supported protocol version .El .Sh SEE ALSO -.Xr rpc 3 , .Xr gssapi 3 , +.Xr rpc 3 , .Xr rpcset_gss 3 .Sh HISTORY The Modified: head/lib/librpcsec_gss/rpc_gss_getcred.3 == --- head/lib/librpcsec_gss/rpc_gss_getcred.3Mon Dec 29 21:52:32 2014 (r276381) +++ head/lib/librpcsec_gss/rpc_gss_getcred.3Mon Dec 29 21:59:44 2014 (r276382) @@ -70,8 +70,8 @@ if successful, .Dv FALSE otherwise. .Sh SEE ALSO -.Xr rpc 3 , .Xr gssapi 3 , +.Xr rpc 3 , .Xr rpc_gss_set_callback 3 , .Xr rpcset_gss 3 .Sh HISTORY Modified: head/lib/librpcsec_gss/rpc_gss_is_installed.3 == --- head/lib/librpcsec_gss/rpc_gss_is_installed.3 Mon Dec 29 21:52:32 2014(r276381) +++ head/lib/librpcsec_gss/rpc_gss_is_installed.3 Mon Dec 29 21:59:44 2014(r276382) @@ -51,8 +51,8 @@ if the mechanism is installed, .Dv FALSE otherwise. .Sh SEE ALSO -.Xr rpc 3 , .Xr gssapi 3 , +.Xr rpc 3 , .Xr rpcset_gss 3 .Sh HISTORY The Modified: head/lib/librpcsec_gss/rpc_gss_max_data_length.3 == --- head/lib/librpcsec_gss/rpc_gss_max_data_length.3Mon Dec 29 21:52:32 2014(r276381) +++ head/lib/librpcsec_gss/rpc_gss_max_data_length.3Mon Dec 29 21:59:44 2014(r276382) @@ -50,8 +50,8 @@ Maximum packet size of the underlying tr .Sh RETURN VAL
svn commit: r276383 - head/release
Author: gjb
Date: Mon Dec 29 22:32:39 2014
New Revision: 276383
URL: https://svnweb.freebsd.org/changeset/base/276383
Log:
Delay dropping to the mountroot prompt for 10 seconds
in case the root device is not yet ready.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile
Modified: head/release/Makefile
==
--- head/release/Makefile Mon Dec 29 21:59:44 2014(r276382)
+++ head/release/Makefile Mon Dec 29 22:32:39 2014(r276383)
@@ -201,6 +201,7 @@ system: packagesystem
echo sendmail_enable=\"NONE\" > release/etc/rc.conf
echo hostid_enable=\"NO\" >> release/etc/rc.conf
echo debug.witness.trace=0 >> release/etc/sysctl.conf
+ echo kern.cam.boot_delay=\"1\" >> release/boot/loader.conf
cp ${.CURDIR}/rc.local release/etc
touch ${.TARGET}
@@ -226,6 +227,7 @@ bootonly: packagesystem
echo sendmail_enable=\"NONE\" > bootonly/etc/rc.conf
echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf
echo debug.witness.trace=0 >> bootonly/etc/sysctl.conf
+ echo kern.cam.boot_delay=\"1\" >> bootonly/boot/loader.conf
cp ${.CURDIR}/rc.local bootonly/etc
dvd:
@@ -248,6 +250,7 @@ dvd:
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
+ echo kern.cam.boot_delay=\"1\" >> ${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
touch ${.TARGET}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276383 - head/release
On Mon, 2014-12-29 at 22:32 +, Glen Barber wrote:
> Author: gjb
> Date: Mon Dec 29 22:32:39 2014
> New Revision: 276383
> URL: https://svnweb.freebsd.org/changeset/base/276383
>
> Log:
> Delay dropping to the mountroot prompt for 10 seconds
> in case the root device is not yet ready.
>
> Sponsored by: The FreeBSD Foundation
>
> Modified:
> head/release/Makefile
>
> Modified: head/release/Makefile
> ==
> --- head/release/Makefile Mon Dec 29 21:59:44 2014(r276382)
> +++ head/release/Makefile Mon Dec 29 22:32:39 2014(r276383)
> @@ -201,6 +201,7 @@ system: packagesystem
> echo sendmail_enable=\"NONE\" > release/etc/rc.conf
> echo hostid_enable=\"NO\" >> release/etc/rc.conf
> echo debug.witness.trace=0 >> release/etc/sysctl.conf
> + echo kern.cam.boot_delay=\"1\" >> release/boot/loader.conf
> cp ${.CURDIR}/rc.local release/etc
> touch ${.TARGET}
>
> @@ -226,6 +227,7 @@ bootonly: packagesystem
> echo sendmail_enable=\"NONE\" > bootonly/etc/rc.conf
> echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf
> echo debug.witness.trace=0 >> bootonly/etc/sysctl.conf
> + echo kern.cam.boot_delay=\"1\" >> bootonly/boot/loader.conf
> cp ${.CURDIR}/rc.local bootonly/etc
>
> dvd:
> @@ -248,6 +250,7 @@ dvd:
> echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
> echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
> echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
> + echo kern.cam.boot_delay=\"1\" >> ${.TARGET}/boot/loader.conf
> cp ${.CURDIR}/rc.local ${.TARGET}/etc
> touch ${.TARGET}
>
>
This will hard-wait for 10 seconds even if all devices are ready to roll
much earlier than that. An alternative is to set kern.mountroot.timeout
which will keep trying the available root devices until the timeout
expires and then drop you to the prompt, with the benefit of only
waiting 4 seconds if that's how long it really took the device to become
ready. (The default for kern.mountroot.timeout is 3 seconds.)
-- Ian
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276383 - head/release
On Mon, Dec 29, 2014 at 03:57:21PM -0700, Ian Lepore wrote:
> On Mon, 2014-12-29 at 22:32 +, Glen Barber wrote:
> > Author: gjb
> > Date: Mon Dec 29 22:32:39 2014
> > New Revision: 276383
> > URL: https://svnweb.freebsd.org/changeset/base/276383
> >
> > Log:
> > Delay dropping to the mountroot prompt for 10 seconds
> > in case the root device is not yet ready.
> >
> > Sponsored by: The FreeBSD Foundation
> >
> > Modified:
> > head/release/Makefile
> >
> > Modified: head/release/Makefile
> > ==
> > --- head/release/Makefile Mon Dec 29 21:59:44 2014(r276382)
> > +++ head/release/Makefile Mon Dec 29 22:32:39 2014(r276383)
> > @@ -201,6 +201,7 @@ system: packagesystem
> > echo sendmail_enable=\"NONE\" > release/etc/rc.conf
> > echo hostid_enable=\"NO\" >> release/etc/rc.conf
> > echo debug.witness.trace=0 >> release/etc/sysctl.conf
> > + echo kern.cam.boot_delay=\"1\" >> release/boot/loader.conf
> > cp ${.CURDIR}/rc.local release/etc
> > touch ${.TARGET}
> >
> > @@ -226,6 +227,7 @@ bootonly: packagesystem
> > echo sendmail_enable=\"NONE\" > bootonly/etc/rc.conf
> > echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf
> > echo debug.witness.trace=0 >> bootonly/etc/sysctl.conf
> > + echo kern.cam.boot_delay=\"1\" >> bootonly/boot/loader.conf
> > cp ${.CURDIR}/rc.local bootonly/etc
> >
> > dvd:
> > @@ -248,6 +250,7 @@ dvd:
> > echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
> > echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
> > echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
> > + echo kern.cam.boot_delay=\"1\" >> ${.TARGET}/boot/loader.conf
> > cp ${.CURDIR}/rc.local ${.TARGET}/etc
> > touch ${.TARGET}
> >
> >
>
> This will hard-wait for 10 seconds even if all devices are ready to roll
> much earlier than that. An alternative is to set kern.mountroot.timeout
> which will keep trying the available root devices until the timeout
> expires and then drop you to the prompt, with the benefit of only
> waiting 4 seconds if that's how long it really took the device to become
> ready. (The default for kern.mountroot.timeout is 3 seconds.)
>
Bah, you're right. I'll fix it once I get a few (unrelated, but
conflicting) changes committed.
Glen
pgpul354xc3u6.pgp
Description: PGP signature
svn commit: r276390 - head/sys/conf
Author: imp Date: Tue Dec 30 02:39:44 2014 New Revision: 276390 URL: https://svnweb.freebsd.org/changeset/base/276390 Log: The sn driver doesn't actually include microcode at the current time, although it may in the future. Or not since the ositech cards that might need it have become perhaps too rare to support. Modified: head/sys/conf/WITHOUT_SOURCELESS_UCODE Modified: head/sys/conf/WITHOUT_SOURCELESS_UCODE == --- head/sys/conf/WITHOUT_SOURCELESS_UCODE Tue Dec 30 02:32:48 2014 (r276389) +++ head/sys/conf/WITHOUT_SOURCELESS_UCODE Tue Dec 30 02:39:44 2014 (r276390) @@ -13,7 +13,6 @@ nodevice mwlfw nodevice ralfw nodevice runfw nodevice sf -nodevice sn nodevice ti nodevice txp nodevice ce ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276391 - head/sys/kern
Author: imp
Date: Tue Dec 30 02:39:47 2014
New Revision: 276391
URL: https://svnweb.freebsd.org/changeset/base/276391
Log:
Turns out, this isn't only called from i386...
Modified:
head/sys/kern/subr_module.c
Modified: head/sys/kern/subr_module.c
==
--- head/sys/kern/subr_module.c Tue Dec 30 02:39:44 2014(r276390)
+++ head/sys/kern/subr_module.c Tue Dec 30 02:39:47 2014(r276391)
@@ -253,7 +253,7 @@ preload_fetch_size(caddr_t mod)
return (*mdp);
}
-/* Called from locore on i386. Convert physical pointers to kvm. Sigh. */
+/* Called from locore. Convert physical pointers to kvm. Sigh. */
void
preload_bootstrap_relocate(vm_offset_t offset)
{
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276392 - head/sys/amd64/vmm/amd
Author: neel
Date: Tue Dec 30 02:44:33 2014
New Revision: 276392
URL: https://svnweb.freebsd.org/changeset/base/276392
Log:
Inject #UD into the guest when it executes either 'MONITOR' or 'MWAIT' on
an AMD/SVM host.
MFC after:1 week
Modified:
head/sys/amd64/vmm/amd/svm.c
head/sys/amd64/vmm/amd/vmcb.h
Modified: head/sys/amd64/vmm/amd/svm.c
==
--- head/sys/amd64/vmm/amd/svm.cTue Dec 30 02:39:47 2014
(r276391)
+++ head/sys/amd64/vmm/amd/svm.cTue Dec 30 02:44:33 2014
(r276392)
@@ -461,6 +461,9 @@ vmcb_init(struct svm_softc *sc, int vcpu
svm_enable_intercept(sc, vcpu, VMCB_CTRL1_INTCPT,
VMCB_INTCPT_FERR_FREEZE);
+ svm_enable_intercept(sc, vcpu, VMCB_CTRL2_INTCPT, VMCB_INTCPT_MONITOR);
+ svm_enable_intercept(sc, vcpu, VMCB_CTRL2_INTCPT, VMCB_INTCPT_MWAIT);
+
/*
* From section "Canonicalization and Consistency Checks" in APMv2
* the VMRUN intercept bit must be set to pass the consistency check.
@@ -1140,6 +1143,10 @@ exit_reason_to_str(uint64_t reason)
return ("msr");
case VMCB_EXIT_IRET:
return ("iret");
+ case VMCB_EXIT_MONITOR:
+ return ("monitor");
+ case VMCB_EXIT_MWAIT:
+ return ("mwait");
default:
snprintf(reasonbuf, sizeof(reasonbuf), "%#lx", reason);
return (reasonbuf);
@@ -1406,6 +1413,12 @@ svm_vmexit(struct svm_softc *svm_sc, int
info2, info1, state->rip);
}
break;
+ case VMCB_EXIT_MONITOR:
+ vmexit->exitcode = VM_EXITCODE_MONITOR;
+ break;
+ case VMCB_EXIT_MWAIT:
+ vmexit->exitcode = VM_EXITCODE_MWAIT;
+ break;
default:
vmm_stat_incr(svm_sc->vm, vcpu, VMEXIT_UNKNOWN, 1);
break;
Modified: head/sys/amd64/vmm/amd/vmcb.h
==
--- head/sys/amd64/vmm/amd/vmcb.h Tue Dec 30 02:39:47 2014
(r276391)
+++ head/sys/amd64/vmm/amd/vmcb.h Tue Dec 30 02:44:33 2014
(r276392)
@@ -140,6 +140,8 @@ struct svm_softc;
#defineVMCB_EXIT_MSR 0x7C
#defineVMCB_EXIT_SHUTDOWN 0x7F
#defineVMCB_EXIT_VMSAVE0x83
+#defineVMCB_EXIT_MONITOR 0x8A
+#defineVMCB_EXIT_MWAIT 0x8B
#defineVMCB_EXIT_NPF 0x400
#defineVMCB_EXIT_INVALID -1
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276393 - head/sys/conf
Author: ian Date: Tue Dec 30 02:51:04 2014 New Revision: 276393 URL: https://svnweb.freebsd.org/changeset/base/276393 Log: Add arm option ARM_NEW_PMAP, to allow us to begin adding the new pmap code alongside the existing implementation and quickly toggle between the two implementations when testing. Once the new code is past its teething stage we can remove this option. Modified: head/sys/conf/options.arm Modified: head/sys/conf/options.arm == --- head/sys/conf/options.arm Tue Dec 30 02:44:33 2014(r276392) +++ head/sys/conf/options.arm Tue Dec 30 02:51:04 2014(r276393) @@ -5,6 +5,7 @@ ARM_CACHE_LOCK_ENABLE opt_global.h ARM_KERN_DIRECTMAP opt_vm.h ARM_L2_PIPTopt_global.h ARM_MANY_BOARD opt_global.h +ARM_NEW_PMAP opt_global.h ARM_WANT_TP_ADDRESSopt_global.h COUNTS_PER_SEC opt_timer.h CPU_ARM9 opt_global.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276394 - head/sys/arm/arm
Author: ian Date: Tue Dec 30 02:56:31 2014 New Revision: 276394 URL: https://svnweb.freebsd.org/changeset/base/276394 Log: Add armv6 implementations of these cache operations to avoid duplicating the #ifdef stuff at multiple points the functions are called from. Also rework the armv7 implementations so that the invalidate operations work from outermost to innermost cache level, and the writeback works from inner to outer levels. Modified: head/sys/arm/arm/cpu_asm-v6.S Modified: head/sys/arm/arm/cpu_asm-v6.S == --- head/sys/arm/arm/cpu_asm-v6.S Tue Dec 30 02:51:04 2014 (r276393) +++ head/sys/arm/arm/cpu_asm-v6.S Tue Dec 30 02:56:31 2014 (r276394) @@ -33,8 +33,6 @@ #include #include -#if __ARM_ARCH >= 7 - /* * Define cache functions used by startup code, which counts on the fact that * only r0-r3,r12 (ip) are modified and no stack space is used. These functions @@ -47,12 +45,18 @@ /* Invalidate D cache to PoC. (aka all cache levels)*/ ASENTRY_NP(dcache_inv_poc_all) +#if __ARM_ARCH == 6 + mcr CP15_DCIALL + DSB + bx lr +#else mrc CP15_CLIDR(r0) andsr0, r0, #0x0700 - mov r0, r0, lsr #23 /* Get LoC (naturally aligned) */ - beq 4f + mov r0, r0, lsr #23 /* Get LoC 'naturally' aligned for */ + beq 4f /* use in the CSSELR register below */ -1: mcr CP15_CSSELR(r0) /* set cache level */ +1: sub r0, #2 + mcr CP15_CSSELR(r0) /* set cache level */ isb mrc CP15_CCSIDR(r0) /* read CCSIDR */ @@ -83,28 +87,31 @@ ASENTRY_NP(dcache_inv_poc_all) 3: mrc CP15_CSSELR(r0) /* get cache level */ - add r0, r0, #2 /* next level */ - mrc CP15_CLIDR(r1) - andsr1, r1, #0x0700 - mov r1, r1, lsr #23 /* Get LoC (naturally aligned) */ - cmp r1, r0 - bgt 1b + teq r0, #0 + bne 1b 4: dsb /* wait for stores to finish */ mov r0, #0 mcr CP15_CSSELR(r0) isb bx lr +#endif /* __ARM_ARCH == 6 */ END(dcache_inv_poc_all) /* Invalidate D cache to PoU. (aka L1 cache only)*/ ASENTRY_NP(dcache_inv_pou_all) +#if __ARM_ARCH == 6 + mcr CP15_DCIALL + DSB + bx lr +#else mrc CP15_CLIDR(r0) andsr0, r0, #0x0700 mov r0, r0, lsr #26 /* Get LoUU (naturally aligned) */ beq 4f -1: mcr CP15_CSSELR(r0) /* set cache level */ +1: sub r0, #2 + mcr CP15_CSSELR(r0) /* set cache level */ isb mrc CP15_CCSIDR(r0) /* read CCSIDR */ @@ -125,7 +132,7 @@ ASENTRY_NP(dcache_inv_pou_all) mov r2, ip /* r2 now contains set way decr */ /* r3 = ways/sets, r2 = way decr, r1 = set decr, r0 and ip are free */ -2: mcr CP15_DCISW(r3) /* clean & invalidate line */ +2: mcr CP15_DCISW(r3) /* invalidate line */ movsr0, r3 /* get current way/set */ beq 3f /* at 0 means we are done */ movsr0, r0, lsl #10 /* clear way bits leaving only set bits*/ @@ -135,25 +142,27 @@ ASENTRY_NP(dcache_inv_pou_all) 3: mrc CP15_CSSELR(r0) /* get cache level */ - add r0, r0, #2 /* next level */ - mrc CP15_CLIDR(r1) - andsr1, r1, #0x0700 - mov r1, r1, lsr #26 /* Get LoUU (naturally aligned) */ - cmp r1, r0 - bgt 1b + teq r0, #0 + bne 1b 4: dsb /* wait for stores to finish */ mov r0, #0 mcr CP15_CSSELR(r0) bx lr +#endif END(dcache_inv_pou_all) /* Write back and Invalidate D cache to PoC. */ ASENTRY_NP(dcache_wbinv_poc_all) +#if __ARM_ARCH == 6 + mcr CP15_DCCIALL + DSB + bx lr +#else mrc CP15_CLIDR(r0) andsr0, r0, #0x0700 - mov r0, r0, lsr #23 /* Get LoC (naturally aligned) */ beq 4f + mov r0, #0 /* Clean from inner to outer levels */ 1: mcr CP15_CSSELR(r0) /* set cache level */ isb @@ -176,7 +185,7 @@ ASENTRY_NP(dcache_wbinv_poc_all) mov r2, ip /* r2 now contains set way decr */ /* r3 = ways/sets, r2 = way decr, r1 = set decr, r0 and ip are free */ -2: mcr CP15_DCCISW(r3) /* clean & invalidate line */ +2: mcr CP15_DCCISW(r3) /* clean and invalidate line */ movsr0, r3 /* get current way/set */ beq 3f
svn commit: r276395 - head/sys/arm/arm
Author: ian Date: Tue Dec 30 02:58:34 2014 New Revision: 276395 URL: https://svnweb.freebsd.org/changeset/base/276395 Log: Export MAXCPU to the assembler code, needing by upcoming changes to locore.S. Modified: head/sys/arm/arm/genassym.c Modified: head/sys/arm/arm/genassym.c == --- head/sys/arm/arm/genassym.c Tue Dec 30 02:56:31 2014(r276394) +++ head/sys/arm/arm/genassym.c Tue Dec 30 02:58:34 2014(r276395) @@ -143,5 +143,6 @@ ASSYM(P_PROFIL, P_PROFIL); ASSYM(TRAPFRAMESIZE, sizeof(struct trapframe)); ASSYM(MAXCOMLEN, MAXCOMLEN); +ASSYM(MAXCPU, MAXCPU); ASSYM(NIRQ, NIRQ); ASSYM(PCPU_SIZE, sizeof(struct pcpu)); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276396 - head/sys/arm/arm
Author: ian
Date: Tue Dec 30 03:17:53 2014
New Revision: 276396
URL: https://svnweb.freebsd.org/changeset/base/276396
Log:
Rename locore.S to locore-v4.S and add a new locore-v6.S for starting up
armv6/7 systems. We need to use some new armv6/7 features at startup
and splitting the implemenations to separate files will be more maintainable
than adding even more #ifdef sections to locore.S.
Because of the standardized interfaces to cache and MMU operations in armv7,
we can tolerate the kernel being entered with caches enabled. This allows
running u-boot and loader(8) with caches enabled, and the performance
improvement can be dramatic (boot times can be cut from over a minute
to under 30 seconds). The new implementation also has more robust cache
and mmu sequences for launching AP cores, and it paves the way for
upcoming changes to the pmap code which will use the TEX remap feature.
Changes in mp_machdep.c work with the new behavior in locore-v6 mp_entry,
and also reuse the original boot-time page tables to get transitioned
from physical to virtual addressing before installing the normal tables.
Submitted by Svatopluk Kraus and Michal Meloun with some changes by me.
Added:
head/sys/arm/arm/locore-v4.S
- copied unchanged from r276388, head/sys/arm/arm/locore.S
head/sys/arm/arm/locore-v6.S (contents, props changed)
Deleted:
head/sys/arm/arm/locore.S
Modified:
head/sys/arm/arm/mp_machdep.c
Copied: head/sys/arm/arm/locore-v4.S (from r276388, head/sys/arm/arm/locore.S)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm/arm/locore-v4.STue Dec 30 03:17:53 2014
(r276396, copy of r276388, head/sys/arm/arm/locore.S)
@@ -0,0 +1,596 @@
+/* $NetBSD: locore.S,v 1.14 2003/04/20 16:21:40 thorpej Exp $ */
+
+/*-
+ * Copyright 2011 Semihalf
+ * Copyright (C) 1994-1997 Mark Brinicombe
+ * Copyright (C) 1994 Brini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ * This product includes software developed by Brini.
+ * 4. The name of Brini may not be used to endorse or promote products
+ *derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BRINI ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL BRINI BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "assym.s"
+#include
+#include
+#include
+#include
+#include
+
+__FBSDID("$FreeBSD$");
+
+/*
+ * Sanity check the configuration.
+ * FLASHADDR and LOADERRAMADDR depend on PHYSADDR in some cases.
+ * ARMv4 and ARMv5 make assumptions on where they are loaded.
+ *
+ * TODO: Fix the ARMv4/v5 case.
+ */
+#if (defined(FLASHADDR) || defined(LOADERRAMADDR) || !defined(_ARM_ARCH_6)) &&
\
+!defined(PHYSADDR)
+#error PHYSADDR must be defined for this configuration
+#endif
+
+/* What size should this really be ? It is only used by initarm() */
+#define INIT_ARM_STACK_SIZE(2048 * 4)
+
+#defineCPWAIT_BRANCH
\
+ sub pc, pc, #4
+
+#defineCPWAIT(tmp)
\
+ mrc p15, 0, tmp, c2, c0, 0 /* arbitrary read of CP15 */;\
+ mov tmp, tmp/* wait for it to complete */ ;\
+ CPWAIT_BRANCH /* branch to next insn */
+
+/*
+ * This is for libkvm, and should be the address of the beginning
+ * of the kernel text segment (not necessarily the same as kernbase).
+ *
+ * These are being phased out. Newer copies of libkvm don't need these
+ * values as the information is added to the core file by inspecting
+ * the running kernel.
+ */
+ .
svn commit: r276397 - head/sys/arm/arm
Author: ian Date: Tue Dec 30 03:19:46 2014 New Revision: 276397 URL: https://svnweb.freebsd.org/changeset/base/276397 Log: Add a new locore.S that #includes the right (v4 or v6) implementation. The kernel build machinery really wants the entry point to be in a file named locore.S so doing this avoids a bunch of changes to the build system for relatively little benefit. Added: head/sys/arm/arm/locore.S (contents, props changed) Added: head/sys/arm/arm/locore.S == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/arm/locore.S Tue Dec 30 03:19:46 2014(r276397) @@ -0,0 +1,41 @@ +/*- + * Copyright (c) 2014 Ian Lepore + * All rights excluded. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* + * The kernel build machinery wants the file containing the entry point to be + * named locore.S, but we want separate files for v4 and v6 builds, so just + * include the arch-appropriate file from this properly-named file. + */ + +#include + +#if __ARM_ARCH >= 6 +#include "locore-v6.S" +#else +#include "locore-v4.S" +#endif ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276398 - in head/contrib/elftoolchain: elfcopy libdwarf
Author: emaste
Date: Tue Dec 30 03:25:42 2014
New Revision: 276398
URL: https://svnweb.freebsd.org/changeset/base/276398
Log:
Update elftoolchain to upstream rev 3136
This fixes two strip(1) issues found during ports exp-run and adds a
string hash implementation which significantly speeds up certain
operations on objects with large numbers of symbols.
This also improves libdwarf handling for stripped objects with
.eh_frame or .debug_frame (but not other debug) sections.
PR: 196107
Sponsored by: The FreeBSD Foundation
Modified:
head/contrib/elftoolchain/elfcopy/elfcopy.h
head/contrib/elftoolchain/elfcopy/sections.c
head/contrib/elftoolchain/elfcopy/segments.c
head/contrib/elftoolchain/elfcopy/symbols.c
head/contrib/elftoolchain/libdwarf/libdwarf_abbrev.c
head/contrib/elftoolchain/libdwarf/libdwarf_info.c
head/contrib/elftoolchain/libdwarf/libdwarf_init.c
Directory Properties:
head/contrib/elftoolchain/ (props changed)
Modified: head/contrib/elftoolchain/elfcopy/elfcopy.h
==
--- head/contrib/elftoolchain/elfcopy/elfcopy.h Tue Dec 30 03:19:46 2014
(r276397)
+++ head/contrib/elftoolchain/elfcopy/elfcopy.h Tue Dec 30 03:25:42 2014
(r276398)
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: elfcopy.h 2970 2013-12-01 15:22:12Z kaiwang27 $
+ * $Id: elfcopy.h 3134 2014-12-23 10:43:59Z kaiwang27 $
*/
#include
@@ -115,6 +115,7 @@ struct segment;
/* Internal data structure for sections. */
struct section {
struct segment *seg; /* containing segment */
+ struct segment *seg_tls; /* tls segment */
const char *name; /* section name */
char*newname; /* new section name */
Elf_Scn *is;/* input scn */
Modified: head/contrib/elftoolchain/elfcopy/sections.c
==
--- head/contrib/elftoolchain/elfcopy/sections.cTue Dec 30 03:19:46
2014(r276397)
+++ head/contrib/elftoolchain/elfcopy/sections.cTue Dec 30 03:25:42
2014(r276398)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2007-2011 Kai Wang
+ * Copyright (c) 2007-2011,2014 Kai Wang
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
#include "elfcopy.h"
-ELFTC_VCSID("$Id: sections.c 3126 2014-12-21 08:03:31Z kaiwang27 $");
+ELFTC_VCSID("$Id: sections.c 3134 2014-12-23 10:43:59Z kaiwang27 $");
static voidadd_gnu_debuglink(struct elfcopy *ecp);
static uint32_t calc_crc32(const char *p, size_t len, uint32_t crc);
@@ -485,7 +485,10 @@ insert_shtab(struct elfcopy *ecp, int ta
if ((shtab = calloc(1, sizeof(*shtab))) == NULL)
errx(EXIT_FAILURE, "calloc failed");
if (!tail) {
- /* shoff of input object is used as a hint. */
+ /*
+* "shoff" of input object is used as a hint for section
+* resync later.
+*/
if (gelf_getehdr(ecp->ein, &ieh) == NULL)
errx(EXIT_FAILURE, "gelf_getehdr() failed: %s",
elf_errmsg(-1));
@@ -764,6 +767,15 @@ resync_sections(struct elfcopy *ecp)
first = 0;
}
+ /*
+* Ignore TLS sections with load address 0 and without
+* content. We don't need to adjust their file offset or
+* VMA, only the size matters.
+*/
+ if (s->seg_tls != NULL && s->type == SHT_NOBITS &&
+ s->off == 0)
+ continue;
+
/* Align section offset. */
if (off <= s->off) {
if (!s->loadable)
@@ -1050,6 +1062,17 @@ copy_data(struct section *s)
od->d_size = id->d_size;
od->d_version = id->d_version;
}
+
+ /*
+* Alignment Fixup. libelf does not allow the alignment for
+* Elf_Data descriptor to be set to 0. In this case we workaround
+* it by setting the alignment to 1.
+*
+* According to the ELF ABI, alignment 0 and 1 has the same
+* meaning: the section has no alignment constraints.
+*/
+ if (od->d_align == 0)
+ od->d_align = 1;
}
struct section *
Modified: head/contrib/elftoolchain/elfcopy/segments.c
==
--- head/contrib/elftoolchain/elfcopy/segments.cTue Dec 30 03:19:46
2014(r276397)
+++ head/contrib/elftoolchain/elfcopy/segments.cTue Dec 30 03:25:42
2014(r276398)
@@ -35,7 +35,7 @@
#include "elfcopy.h"
-ELFTC_VCSID("$Id: segments.c 3113 2014-12-20 08:33:29Z kaiwang27 $");
+ELFTC_VCSID("$Id:
svn commit: r276400 - head/release
Author: gjb
Date: Tue Dec 30 03:35:26 2014
New Revision: 276400
URL: https://svnweb.freebsd.org/changeset/base/276400
Log:
Use the correct loader.conf(5) entry for deferring the
mountroot prompt.
Prodded by: ian
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile
Modified: head/release/Makefile
==
--- head/release/Makefile Tue Dec 30 03:31:42 2014(r276399)
+++ head/release/Makefile Tue Dec 30 03:35:26 2014(r276400)
@@ -201,7 +201,7 @@ system: packagesystem
echo sendmail_enable=\"NONE\" > release/etc/rc.conf
echo hostid_enable=\"NO\" >> release/etc/rc.conf
echo debug.witness.trace=0 >> release/etc/sysctl.conf
- echo kern.cam.boot_delay=\"1\" >> release/boot/loader.conf
+ echo vfs.mountroot.timeout=\"10\" >> release/boot/loader.conf
cp ${.CURDIR}/rc.local release/etc
touch ${.TARGET}
@@ -227,7 +227,7 @@ bootonly: packagesystem
echo sendmail_enable=\"NONE\" > bootonly/etc/rc.conf
echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf
echo debug.witness.trace=0 >> bootonly/etc/sysctl.conf
- echo kern.cam.boot_delay=\"1\" >> bootonly/boot/loader.conf
+ echo vfs.mountroot.timeout=\"10\" >> bootonly/boot/loader.conf
cp ${.CURDIR}/rc.local bootonly/etc
dvd:
@@ -250,7 +250,7 @@ dvd:
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
- echo kern.cam.boot_delay=\"1\" >> ${.TARGET}/boot/loader.conf
+ echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
touch ${.TARGET}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276402 - head/sys/amd64/vmm/amd
Author: neel Date: Tue Dec 30 07:08:30 2014 New Revision: 276402 URL: https://svnweb.freebsd.org/changeset/base/276402 Log: Remove "svn:mergeinfo" property that was dragged along when these files were svn copied in r273375. Suggested by: ngie, gjb Modified: Directory Properties: head/sys/amd64/vmm/amd/npt.c (props changed) head/sys/amd64/vmm/amd/npt.h (props changed) head/sys/amd64/vmm/amd/svm.c (props changed) head/sys/amd64/vmm/amd/svm.h (props changed) head/sys/amd64/vmm/amd/svm_genassym.c (props changed) head/sys/amd64/vmm/amd/svm_msr.c (props changed) head/sys/amd64/vmm/amd/svm_msr.h (props changed) head/sys/amd64/vmm/amd/svm_softc.h (props changed) head/sys/amd64/vmm/amd/svm_support.S (props changed) head/sys/amd64/vmm/amd/vmcb.c (props changed) head/sys/amd64/vmm/amd/vmcb.h (props changed) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
