Index: head/tests/sys/kern/coredump_phnum_test.sh
===================================================================
--- head/tests/sys/kern/coredump_phnum_test.sh	(revision 346541)
+++ head/tests/sys/kern/coredump_phnum_test.sh	(revision 346542)
@@ -1,86 +1,86 @@
 #
 #  Copyright (c) 2016 Dell EMC Isilon
 #  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,
 #     without modification.
 #  2. Redistributions in binary form must reproduce at minimum a disclaimer
 #     substantially similar to the "NO WARRANTY" disclaimer below
 #     ("Disclaimer") and any redistribution must be conditioned upon
 #     including a substantially similar Disclaimer requirement for further
 #     binary redistribution.
 #
 #  NO WARRANTY
 #  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 #  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 #  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
 #  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 #  HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
 #
 # $FreeBSD$
 
 atf_test_case coredump_phnum cleanup
 coredump_phnum_head()
 {
 	atf_set "descr" "More than 65534 segments"
 	atf_set "require.config" "allow_sysctl_side_effects"
 	atf_set "require.progs" "readelf procstat"
 	atf_set "require.user" "root"
 }
 coredump_phnum_body()
 {
 	# Set up core dumping
 	cat > coredump_phnum_restore_state.sh <<-EOF
 	#!/bin/sh
 	ulimit -c '$(ulimit -c)'
 	sysctl kern.coredump=$(sysctl -n kern.coredump)
 	sysctl kern.corefile='$(sysctl -n kern.corefile)'
 EOF
 
 	ulimit -c unlimited
 	sysctl kern.coredump=1
 	sysctl kern.corefile="$(pwd)/coredump_phnum_helper.core"
 
 	atf_check -s signal:sigabrt "$(atf_get_srcdir)/coredump_phnum_helper"
 
 	# Check that core looks good
 	if [ ! -f coredump_phnum_helper.core ]; then
 		atf_fail "Helper program did not dump core"
 	fi
 
 	# These magic numbers don't have any real significance.  They are just
 	# the result of running the helper program and dumping core.  The only
 	# important bit is that they're larger than 65535 (UINT16_MAX).
 	atf_check -o "match:65535 \(66[0-9]{3}\)" \
 	    -x 'readelf -h coredump_phnum_helper.core | grep "Number of program headers:"'
 	atf_check -o "match:There are 66[0-9]{3} program headers" \
 	    -x 'readelf -l coredump_phnum_helper.core | grep -1 "program headers"'
-	atf_check -o "match: 0000000000000001 .* 66[0-9]{3} " \
+	atf_check -o "match: 00000(0000000000)?1 .* 66[0-9]{3} " \
 	    -x 'readelf -S coredump_phnum_helper.core | grep -A1 "^  \[ 0\] "'
 
 	atf_check -o "match:66[0-9]{3}" \
 	    -x 'procstat -v coredump_phnum_helper.core | wc -l'
 }
 coredump_phnum_cleanup()
 {
 	rm -f coredump_phnum_helper.core
 	if [ -f coredump_phnum_restore_state.sh ]; then
 		. ./coredump_phnum_restore_state.sh
 	fi
 	rm -f coredump_phnum_restore_state.sh
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case coredump_phnum
 }