The branch main has been updated by emaste:

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

commit f302fd1aa6730facd53a3f761e0a57302731b03e
Author:     Ed Maste <[email protected]>
AuthorDate: 2021-01-22 21:23:12 +0000
Commit:     Ed Maste <[email protected]>
CommitDate: 2021-01-22 21:35:05 +0000

    elfctl: fix typo from last-minute refactoring
    
    Reported by:    jkim
    Fixes:          86f33b5fcf6087bf4439881011b920ff99e6e300
---
 usr.bin/elfctl/elfctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.bin/elfctl/elfctl.c b/usr.bin/elfctl/elfctl.c
index f641b63e32bd..300a66eb516e 100644
--- a/usr.bin/elfctl/elfctl.c
+++ b/usr.bin/elfctl/elfctl.c
@@ -261,7 +261,7 @@ convert_to_feature_val(char *feature_str, uint32_t 
*feature_val)
                                        warn("%s invalid", feature);
                                        return (false);
                                }
-                               input != val;
+                               input |= val;
                        } else {
                                warnx("%s is not a valid feature", feature);
                                if (!iflag)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "[email protected]"

Reply via email to