On 01/22/2017 12:50 PM, Nadav Har'El wrote:
Reviewed-by: Nadav Har'El <n...@scylladb.com <mailto:n...@scylladb.com>>
Just a typo in the commit message - that's __ASSEMBLY__, not __ASSEMBLER__.
Indeed :)
I should correct this.
--
regards,
Sergiy
--
Nadav Har'El
n...@scylladb.com <mailto:n...@scylladb.com>
On Fri, Jan 20, 2017 at 1:04 PM, 'Sergiy Kibrik' via OSv Development
<osv-dev@googlegroups.com <mailto:osv-dev@googlegroups.com>> wrote:
__ASSEMBLER__ definition is used extensively throughout bsd/ tree so
make ASFLAGS compatible with its usage.
Signed-off-by: Sergiy Kibrik <sergiy.kib...@globallogic.com
<mailto:sergiy.kib...@globallogic.com>>
---
Makefile | 2 +-
compiler/include/intrinsics.hh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 108868b..4f3d9b5 100644
--- 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
index 9d2cff4..2a67f7e 100644
--- 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
--
2.7.4
--
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
<mailto:osv-dev%2bunsubscr...@googlegroups.com>.
For more options, visit https://groups.google.com/d/optout
<https://groups.google.com/d/optout>.
--
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.
