diff --git a/Makefile b/Makefile index 1afd0a47a..e2b8eddf5 100644 --- a/Makefile +++ b/Makefile @@ -38,15 +38,9 @@ CFLAGS ?= -g \ -Werror=strict-prototypes \ -fsanitize=unreachable -MANDATORYCFLAGS = \ - -DUNREACHABLE_CODE='__builtin_unreachable()' \ - -DNORETURN=_Noreturn - LDFLAGS ?= -g \ -fsanitize=unreachable -MANDATORYLDFLAGS = - # Various commands. AR ?= ar @@ -82,6 +76,12 @@ INSDIR = $(abspath $(BUILDDIR)/staging) PLATIND = $(INSDIR)/share/ack PLATDEP = $(INSDIR)/lib/ack +MANDATORYCFLAGS = \ + -DUNREACHABLE_CODE='__builtin_unreachable()' \ + -DNORETURN=_Noreturn + +MANDATORYLDFLAGS = + .NOTPARALLEL: ifeq ($(BUILDSYSTEM),) diff --git a/lang/pc/comp/node.xh b/lang/pc/comp/node.xh index da1b25394..43372987f 100644 --- a/lang/pc/comp/node.xh +++ b/lang/pc/comp/node.xh @@ -8,7 +8,6 @@ struct node { #define nd_next nd_left struct node *nd_right; int nd_class; /* kind of node */ -#define Value 0 /* constant */ #define Name 1 /* an identifier */ #define Uoper 2 /* unary operator */ #define Boper 3 /* binary operator */ @@ -24,6 +23,7 @@ struct node { #define Cast 13 /* convert integer to real */ #define IntCoerc 14 /* coercion of integers to longs */ #define IntReduc 15 /* reduction of longs to integers */ +#define Value 0 /* constant */ /* do NOT change the order or the numbers!!! */ struct type *nd_type; /* type of this node */ struct token nd_token;