Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Jan 2024 17:00:13 GMT
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 1b0471936f7e - stable/14 - libc: simplify MDASM/NOASM checks
Message-ID:  <202401021700.402H0D8Z041784@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=1b0471936f7e8c30c994ea514cf3396a0b3c6dac

commit 1b0471936f7e8c30c994ea514cf3396a0b3c6dac
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-12-06 20:48:46 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-01-02 16:59:04 +0000

    libc: simplify MDASM/NOASM checks
    
    Use boolean evaluation of :M matches and a single if statement.
    
    Reviewed by:    imp, kib
    Sponsored by:   DARPA
    Differential Revision:  https://reviews.freebsd.org/D42915
    
    (cherry picked from commit fc0288993cdad8a559fcd2c2166cf95f1fa43745)
---
 lib/libc/sys/Makefile.inc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 1acc66c5f726..13769e5bdf19 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -109,11 +109,9 @@ SRCS+=${MDASM}
 # not declared for no generation of default code (NOASM).  Add each
 # syscall that satisfies these conditions to the ASM list.
 .for _asm in ${MIASM}
-.if (${MDASM:R:M${_asm:R}} == "")
-.if (${NOASM:R:M${_asm:R}} == "")
+.if !${MDASM:R:M${_asm:R}} && !${NOASM:R:M${_asm:R}}
 ASM+=$(_asm)
 .endif
-.endif
 .endfor
 
 SASM=	${ASM:S/.o/.S/}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401021700.402H0D8Z041784>