Index: head/lib/csu/common/crtbrand.c
===================================================================
--- head/lib/csu/common/crtbrand.c	(revision 340700)
+++ head/lib/csu/common/crtbrand.c	(revision 340701)
@@ -1,69 +1,84 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright 2000 David E. O'Brien, John D. Polstra.
  * 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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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 <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/elf_common.h>
 #include "notes.h"
 
 /*
  * Special ".note" entry specifying the ABI version.  See
  * http://www.netbsd.org/Documentation/kernel/elf-notes.html
  * for more information.
  *
  * For all arches except sparc, gcc emits the section directive for the
  * following struct with a PROGBITS type.  However, newer versions of binutils
  * (after 2.16.90) require the section to be of NOTE type, to guarantee that the
  * .note.ABI-tag section correctly ends up in the first page of the final
  * executable.
  *
  * Unfortunately, there is no clean way to tell gcc to use another section type,
  * so this C file (or the C file that includes it) must be compiled in multiple
  * steps:
  *
  * - Compile the .c file to a .s file.
  * - Edit the .s file to change the 'progbits' type to 'note', for the section
  *   directive that defines the .note.ABI-tag section.
  * - Compile the .s file to an object file.
  *
  * These steps are done in the invididual Makefiles for each applicable arch.
  */
 static const struct {
 	int32_t	namesz;
 	int32_t	descsz;
 	int32_t	type;
 	char	name[sizeof(NOTE_FREEBSD_VENDOR)];
 	int32_t	desc;
 } abitag __attribute__ ((section (NOTE_SECTION), aligned(4))) __used = {
 	.namesz = sizeof(NOTE_FREEBSD_VENDOR),
 	.descsz = sizeof(int32_t),
 	.type = NT_FREEBSD_ABI_TAG,
 	.name = NOTE_FREEBSD_VENDOR,
 	.desc = __FreeBSD_version
 };
+
+static const struct {
+	int32_t	namesz;
+	int32_t	descsz;
+	int32_t	type;
+	char	name[sizeof(NOTE_FREEBSD_VENDOR)];
+	uint32_t	desc[1];
+} crt_feature_ctl __attribute__ ((section (NOTE_SECTION),
+    aligned(4))) __used = {
+	.namesz = sizeof(NOTE_FREEBSD_VENDOR),
+	.descsz = sizeof(uint32_t),
+	.type = NT_FREEBSD_FEATURE_CTL,
+	.name = NOTE_FREEBSD_VENDOR,
+	.desc = { 0 }
+};