nasm: Cherry-pick -Wbitwise-instead-of-logical fix

This cherry-picks https://github.com/netwide-assembler/nasm/pull/17

Bug: chromium:1255745
Change-Id: I230b9ab9fd0a8baa1cdc8dd6e62cdc069cb14070
diff --git a/asm/preproc.c b/asm/preproc.c
index 8415d57..10b2fc4 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -2700,7 +2700,7 @@
         t = tline = expand_smacro(tline);
 
         while (tok_white(t) ||
-               (needtype == TOK_NUMBER && (tok_is(t, '-') | tok_is(t, '+'))))
+               (needtype == TOK_NUMBER && (tok_is(t, '-') || tok_is(t, '+'))))
             t = t->next;
 
         j = tok_type(t, needtype);