Date: Wed, 22 Mar 2017 22:28:13 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r315754 - in head/sys: amd64/cloudabi32 amd64/cloudabi64 arm/cloudabi32 arm64/cloudabi64 i386/cloudabi32 kern sys Message-ID: <201703222228.v2MMSDeZ048594@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Wed Mar 22 22:28:13 2017 New Revision: 315754 URL: https://svnweb.freebsd.org/changeset/base/315754 Log: Update r315753 with the proper flag name. Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/amd64/cloudabi32/cloudabi32_sysvec.c head/sys/amd64/cloudabi64/cloudabi64_sysvec.c head/sys/arm/cloudabi32/cloudabi32_sysvec.c head/sys/arm64/cloudabi64/cloudabi64_sysvec.c head/sys/i386/cloudabi32/cloudabi32_sysvec.c head/sys/kern/imgact_elf.c head/sys/sys/imgact_elf.h Modified: head/sys/amd64/cloudabi32/cloudabi32_sysvec.c ============================================================================== --- head/sys/amd64/cloudabi32/cloudabi32_sysvec.c Wed Mar 22 22:23:01 2017 (r315753) +++ head/sys/amd64/cloudabi32/cloudabi32_sysvec.c Wed Mar 22 22:28:13 2017 (r315754) @@ -228,5 +228,5 @@ Elf32_Brandinfo cloudabi32_brand = { .machine = EM_386, .sysvec = &cloudabi32_elf_sysvec, .compat_3_brand = "CloudABI", - .flags = BI_BRAND_NOTE_ONLY_STATIC, + .flags = BI_BRAND_ONLY_STATIC, }; Modified: head/sys/amd64/cloudabi64/cloudabi64_sysvec.c ============================================================================== --- head/sys/amd64/cloudabi64/cloudabi64_sysvec.c Wed Mar 22 22:23:01 2017 (r315753) +++ head/sys/amd64/cloudabi64/cloudabi64_sysvec.c Wed Mar 22 22:28:13 2017 (r315754) @@ -212,6 +212,6 @@ Elf64_Brandinfo cloudabi64_brand = { .brand = ELFOSABI_CLOUDABI, .machine = EM_X86_64, .sysvec = &cloudabi64_elf_sysvec, - .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE_ONLY_STATIC, + .flags = BI_CAN_EXEC_DYN | BI_BRAND_ONLY_STATIC, .compat_3_brand = "CloudABI", }; Modified: head/sys/arm/cloudabi32/cloudabi32_sysvec.c ============================================================================== --- head/sys/arm/cloudabi32/cloudabi32_sysvec.c Wed Mar 22 22:23:01 2017 (r315753) +++ head/sys/arm/cloudabi32/cloudabi32_sysvec.c Wed Mar 22 22:28:13 2017 (r315754) @@ -190,5 +190,5 @@ Elf32_Brandinfo cloudabi32_brand = { .machine = EM_ARM, .sysvec = &cloudabi32_elf_sysvec, .compat_3_brand = "CloudABI", - .flags = BI_BRAND_NOTE_ONLY_STATIC, + .flags = BI_BRAND_ONLY_STATIC, }; Modified: head/sys/arm64/cloudabi64/cloudabi64_sysvec.c ============================================================================== --- head/sys/arm64/cloudabi64/cloudabi64_sysvec.c Wed Mar 22 22:23:01 2017 (r315753) +++ head/sys/arm64/cloudabi64/cloudabi64_sysvec.c Wed Mar 22 22:28:13 2017 (r315754) @@ -181,6 +181,6 @@ Elf64_Brandinfo cloudabi64_brand = { .brand = ELFOSABI_CLOUDABI, .machine = EM_AARCH64, .sysvec = &cloudabi64_elf_sysvec, - .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE_ONLY_STATIC, + .flags = BI_CAN_EXEC_DYN | BI_BRAND_ONLY_STATIC, .compat_3_brand = "CloudABI", }; Modified: head/sys/i386/cloudabi32/cloudabi32_sysvec.c ============================================================================== --- head/sys/i386/cloudabi32/cloudabi32_sysvec.c Wed Mar 22 22:23:01 2017 (r315753) +++ head/sys/i386/cloudabi32/cloudabi32_sysvec.c Wed Mar 22 22:28:13 2017 (r315754) @@ -201,5 +201,5 @@ Elf32_Brandinfo cloudabi32_brand = { .machine = EM_386, .sysvec = &cloudabi32_elf_sysvec, .compat_3_brand = "CloudABI", - .flags = BI_BRAND_NOTE_ONLY_STATIC, + .flags = BI_BRAND_ONLY_STATIC, }; Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Wed Mar 22 22:23:01 2017 (r315753) +++ head/sys/kern/imgact_elf.c Wed Mar 22 22:28:13 2017 (r315754) @@ -273,8 +273,7 @@ __elfN(get_brandinfo)(struct image_param bi = elf_brand_list[i]; if (bi == NULL) continue; - if (interp != NULL && - (bi->flags & BI_BRAND_NOTE_ONLY_STATIC) != 0) + if (interp != NULL && (bi->flags & BI_BRAND_ONLY_STATIC) != 0) continue; if (hdr->e_machine == bi->machine && (bi->flags & (BI_BRAND_NOTE|BI_BRAND_NOTE_MANDATORY)) != 0) { @@ -309,8 +308,7 @@ __elfN(get_brandinfo)(struct image_param for (i = 0; i < MAX_BRANDS; i++) { bi = elf_brand_list[i]; if (bi == NULL || (bi->flags & BI_BRAND_NOTE_MANDATORY) != 0 || - (interp != NULL && (bi->flags & - BI_BRAND_NOTE_ONLY_STATIC) != 0)) + (interp != NULL && (bi->flags & BI_BRAND_ONLY_STATIC) != 0)) continue; if (hdr->e_machine == bi->machine && (hdr->e_ident[EI_OSABI] == bi->brand || @@ -356,8 +354,9 @@ __elfN(get_brandinfo)(struct image_param if (interp != NULL) { for (i = 0; i < MAX_BRANDS; i++) { bi = elf_brand_list[i]; - if (bi == NULL || (bi->flags & (BI_BRAND_NOTE_MANDATORY | - BI_BRAND_NOTE_ONLY_STATIC)) != 0) + if (bi == NULL || (bi->flags & + (BI_BRAND_NOTE_MANDATORY | BI_BRAND_ONLY_STATIC)) + != 0) continue; if (hdr->e_machine == bi->machine && /* ELF image p_filesz includes terminating zero */ @@ -372,8 +371,7 @@ __elfN(get_brandinfo)(struct image_param for (i = 0; i < MAX_BRANDS; i++) { bi = elf_brand_list[i]; if (bi == NULL || (bi->flags & BI_BRAND_NOTE_MANDATORY) != 0 || - (interp != NULL && (bi->flags & - BI_BRAND_NOTE_ONLY_STATIC) != 0)) + (interp != NULL && (bi->flags & BI_BRAND_ONLY_STATIC) != 0)) continue; if (hdr->e_machine == bi->machine && __elfN(fallback_brand) == bi->brand) Modified: head/sys/sys/imgact_elf.h ============================================================================== --- head/sys/sys/imgact_elf.h Wed Mar 22 22:23:01 2017 (r315753) +++ head/sys/sys/imgact_elf.h Wed Mar 22 22:28:13 2017 (r315754) @@ -81,7 +81,7 @@ typedef struct { #define BI_CAN_EXEC_DYN 0x0001 #define BI_BRAND_NOTE 0x0002 /* May have note.ABI-tag section. */ #define BI_BRAND_NOTE_MANDATORY 0x0004 /* Must have note.ABI-tag section. */ -#define BI_BRAND_NOTE_ONLY_STATIC 0x0008 +#define BI_BRAND_ONLY_STATIC 0x0008 /* Match only interp-less binaries. */ } __ElfN(Brandinfo); __ElfType(Auxargs);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703222228.v2MMSDeZ048594>