From: Sergiy Kibrik <sergiy.kib...@globallogic.com>
Committer: Sergiy Kibrik <sergiy.kib...@globallogic.com>
Branch: master
osv: use __ASSEMBLY__ instead of ASSEMBLY
__ASSEMBLY__ definition is used extensively throughout bsd/ tree so
make ASFLAGS compatible with its usage.
Signed-off-by: Sergiy Kibrik <sergiy.kib...@globallogic.com>
Reviewed-by: Nadav Har'El <n...@scylladb.com>
---
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -338,7 +338,7 @@ CFLAGS = -std=gnu99 $(COMMON)
CFLAGS += -I libc/stdio -I libc/internal -I libc/arch/$(arch) \
-Wno-missing-braces -Wno-parentheses -Wno-unused-but-set-variable
-ASFLAGS = -g $(autodepend) -DASSEMBLY
+ASFLAGS = -g $(autodepend) -D__ASSEMBLY__
$(out)/fs/vfs/main.o: CXXFLAGS += -Wno-sign-compare -Wno-write-strings
diff --git a/compiler/include/intrinsics.hh b/compiler/include/intrinsics.hh
--- a/compiler/include/intrinsics.hh
+++ b/compiler/include/intrinsics.hh
@@ -2,7 +2,7 @@
#ifndef COMPILER_INTRINSICS_HH
#define COMPILER_INTRINSICS_HH
-#ifndef ASSEMBLY
+#ifndef __ASSEMBLY__
#if __GNUC__ == 4 && __GNUC_MINOR__ < 8
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
