grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[MULTIBOOT2 SPEC PATCH v4 18/27] multiboot2: Use predefined #ifdef __ASS


From: Hans Ulrich Niedermann
Subject: [MULTIBOOT2 SPEC PATCH v4 18/27] multiboot2: Use predefined #ifdef __ASSEMBLER__
Date: Fri, 15 May 2020 05:43:41 +0200

GCC already predefines __ASSEMBLER__ for .S files (assembly with C
preprocessor), so we can just use that instead of defining our own
ASM_FILE macro.

Signed-off-by: Hans Ulrich Niedermann <address@hidden>

diff --git a/doc/boot_i386.S b/doc/boot_i386.S
index 14dc14660..2aa2a92b6 100644
--- a/doc/boot_i386.S
+++ b/doc/boot_i386.S
@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define ASM_FILE       1
 #include <multiboot2.h>
 
 /* C symbol format. HAVE_ASM_USCORE is defined by configure.  */
diff --git a/doc/boot_mips.S b/doc/boot_mips.S
index 3f99c81a0..b59e3fd6a 100644
--- a/doc/boot_mips.S
+++ b/doc/boot_mips.S
@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define ASM_FILE       1
 #include <multiboot2.h>
 
 /* C symbol format. HAVE_ASM_USCORE is defined by configure.  */
diff --git a/doc/multiboot2.h b/doc/multiboot2.h
index d3b03d7a1..f89cd5e77 100644
--- a/doc/multiboot2.h
+++ b/doc/multiboot2.h
@@ -92,7 +92,7 @@
 #define MULTIBOOT_CONSOLE_FLAGS_CONSOLE_REQUIRED 1
 #define MULTIBOOT_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED 2
 
-#ifndef ASM_FILE
+#ifndef __ASSEMBLER__
 
 typedef unsigned char          multiboot_uint8_t;
 typedef unsigned short         multiboot_uint16_t;
@@ -417,6 +417,6 @@ struct multiboot_tag_load_base_addr
   multiboot_uint32_t load_base_addr;
 };
 
-#endif /* ! ASM_FILE */
+#endif /* ! __ASSEMBLER__ */
 
 #endif /* ! MULTIBOOT_HEADER */
-- 
2.26.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]