From d832776ccb59280eebb9a693e8117767e77e97aa Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin (Intel)" Date: Sun, 7 Jun 2026 20:50:33 -0700 Subject: [PATCH] Revert "parser: fix invalid segment override on EQU FAR pointers" This reverts commit 35ffac3ea09eff965ae785a51432ff3601b1fbcd. This commit caused a regression, causing segment overrides to get lost. Multiple travis tests failed as a result. Revert this until a proper solution exists. Signed-off-by: H. Peter Anvin (Intel) --- asm/parser.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/asm/parser.c b/asm/parser.c index 551e6e675..8f57e1946 100644 --- a/asm/parser.c +++ b/asm/parser.c @@ -1108,17 +1108,7 @@ restart_parse: */ } else if (mref || !far_jmp_ok) { /* segment override? */ - if (!mref && (!ok_reg || !IS_SREG(value->type))) { - i = stdscan(NULL, &tokval); - goto mref_more; - } else { - mref = true; - if (!ok_reg || !IS_SREG(value->type)) { - nasm_nonfatal("invalid segment override"); - } - i = stdscan(NULL, &tokval); - goto mref_more; - } + mref = true; /* * Process the segment override.