Date: Wed, 20 Apr 2016 22:41:20 +0000 (UTC) From: Wojciech Macek <wma@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298384 - head/sys/conf Message-ID: <201604202241.u3KMfKB9017514@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wma Date: Wed Apr 20 22:41:19 2016 New Revision: 298384 URL: https://svnweb.freebsd.org/changeset/base/298384 Log: Revert r298357 Revert workaround fixed by r298361 Modified: head/sys/conf/kern.post.mk Modified: head/sys/conf/kern.post.mk ============================================================================== --- head/sys/conf/kern.post.mk Wed Apr 20 22:38:00 2016 (r298383) +++ head/sys/conf/kern.post.mk Wed Apr 20 22:41:19 2016 (r298384) @@ -364,8 +364,6 @@ embedfs_${MFS_IMAGE:T:R}.o: ${MFS_IMAGE} --output-target ${EMBEDFS_FORMAT.${MACHINE_ARCH}} \ --binary-architecture ${EMBEDFS_ARCH.${MACHINE_ARCH}} \ ${MFS_IMAGE} ${.TARGET} - # Provide set of two distinct regexp to work around an elfcopy bug - # fixed in r298361 (last three). ${OBJCOPY} \ --rename-section .data=mfs,contents,alloc,load,readonly,data \ --redefine-sym \ @@ -374,12 +372,6 @@ embedfs_${MFS_IMAGE:T:R}.o: ${MFS_IMAGE} _binary_${MFS_IMAGE:C,[^[:alnum:]],_,g}_start=mfs_root \ --redefine-sym \ _binary_${MFS_IMAGE:C,[^[:alnum:]],_,g}_end=mfs_root_end \ - --redefine-sym \ - _binary_${MFS_IMAGE:C,[^-/[:alnum:]],_,g}_size=__mfs_root_size \ - --redefine-sym \ - _binary_${MFS_IMAGE:C,[^-/[:alnum:]],_,g}_start=mfs_root \ - --redefine-sym \ - _binary_${MFS_IMAGE:C,[^-/[:alnum:]],_,g}_end=mfs_root_end \ ${.TARGET} .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604202241.u3KMfKB9017514>