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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to