Skip to content

Commit c16adc6

Browse files
committed
Make: stop reading a CPreProcessor macro name when "," is found
Signed-off-by: Masatake YAMATO <[email protected]>
1 parent fcb1b90 commit c16adc6

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

Units/parser-make.r/cpp-marcros.d/expected.tags

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,5 @@ ACPI_DEBUGGER2 input-1.mak /^CFLAGS2 := -DACPI_DEBUGGER2\\$/;" d language:CPrePr
5353
CFLAGS3 input-1.mak /^CFLAGS3 = -DACPI_DEBUGGER3\\$/;" m language:Make
5454
ACPI_DEBUGGER3 input-1.mak /^CFLAGS3 = -DACPI_DEBUGGER3\\$/;" d language:CPreProcessor
5555
FOO_$(VAL) input-2.mak /^X += -DFOO_$(VAL)$/;" d language:CPreProcessor
56+
ARM_ARCH_SELECTOR input-2.mak /^ARM_ARCH_SELECTOR := $(filter -D__LINUX_ARM_ARCH__%, $(KBUILD_CFLAGS))$/;" m language:Make
57+
__LINUX_ARM_ARCH__% input-2.mak /^ARM_ARCH_SELECTOR := $(filter -D__LINUX_ARM_ARCH__%, $(KBUILD_CFLAGS))$/;" d language:CPreProcessor
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
X += -DFOO_$(VAL)
2+
ARM_ARCH_SELECTOR := $(filter -D__LINUX_ARM_ARCH__%, $(KBUILD_CFLAGS))

parsers/make.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,12 @@ static void valueTrackerEval (struct valueTracker *vt)
343343
if (isspace(c) || c == '=')
344344
break;
345345

346+
/* "," can be a separator.
347+
* -------------------------------------------------
348+
* $(filter -D__LINUX_ARM_ARCH__%, $(KBUILD_CFLAGS)) */
349+
if (c == ',')
350+
break;
351+
346352
if (c == '('
347353
/* FOO_$(...) isn't a signature. */
348354
&& (i - i0 > 1) && (vStringChar (vt->value, i -1) != '$'))

0 commit comments

Comments
 (0)