Changeset 53ad43c in mainline for kernel/genarch

Timestamp:

2018-03-08T18:54:30Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5ef16903

Parents:

e0a4686

Message:

Replace ASM macro with the standard ASSEMBLER.

At least, GCC claims it to be a standard predefined macro. I was unable
to find the relevant standard, but it's defined in both gcc and clang.

Location:

kernel/genarch/include/genarch/multiboot

Files:

• multiboot.h (modified) (2 diffs)
• multiboot2.h (modified) (2 diffs)

kernel/genarch/include/genarch/multiboot/multiboot.h

@@ -52 +52 @@
 #define MULTIBOOT_INFO_FLAGS_MMAP       0x40
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <typedefs.h>
@@ -77 +77 @@
 extern void multiboot_info_parse(uint32_t, const multiboot_info_t *);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif

kernel/genarch/include/genarch/multiboot/multiboot2.h

@@ -61 +61 @@
 #define MULTIBOOT2_VISUAL_EGA      2
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <typedefs.h>
@@ -153 +153 @@
 extern void multiboot2_info_parse(uint32_t, const multiboot2_info_t *);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif