Changeset 100276 in vbox for trunk

Timestamp:

Jun 23, 2023 11:03:48 PM (18 months ago)

Author:

vboxsync

Message:

iprt/asmdefs-arm.h,Config.kmk: Use ASM_FORMAT_ELF and ASM_FORMAT_MACHO to in asmdefs-arm.h to determin how to start sections. bugref:10457

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• include/iprt/asmdefs-arm.h (modified) (8 diffs)

trunk/Config.kmk

@@ -1836 +1836 @@
  endif
 else  # ifn1of ($(KBUILD_TARGET_ARCH), amd64 x86)
- VBOX_ASTOOL =# No tool, just use the compiler one.
- VBOX_LDR_FMT_2_FLAGS.elf  := -DASM_FORMAT_ELF
+ VBOX_ASTOOL      = $(VBOX_GCC_TOOL)
+ VBOX_LDR_FMT_2_FLAGS.elf   := -DASM_FORMAT_ELF
  VBOX_LDR_FMT_2_FLAGS.macho := -DASM_FORMAT_MACHO
- VBOX_LDR_FMT_2_FLAGS.pe   := -DASM_FORMAT_PE
- VBOX_ASFLAGS  := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT))
- VBOX_ASFLAGS32 := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT32))
- VBOX_ASFLAGS64 := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT64))
+ VBOX_LDR_FMT_2_FLAGS.pe    := -DASM_FORMAT_PE
+ VBOX_ASFLAGS    := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT))
+ VBOX_ASFLAGS32  := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT32))
+ VBOX_ASFLAGS64  := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT64))
  if1of ($(KBUILD_TARGET_ARCH), sparc32 sparc64)
-  VBOX_ASFLAGS += -m$(VBOX_HC_ARCH_BITS)
+  VBOX_ASFLAGS   += -m$(VBOX_HC_ARCH_BITS)
   VBOX_ASFLAGS32 += -m32
   VBOX_ASFLAGS64 += -m64

trunk/include/iprt/asmdefs-arm.h

@@ -49 +49 @@
  */
 
-/** @todo Should the selection be done by object format (ELF, MachO, ...) maybe?. */
-
 /** Marks the beginning of a code section. */
-#if defined(__clang__)
+#ifdef ASM_FORMAT_MACHO
 # define BEGINCODE .section __TEXT,__text,regular,pure_instructions
-#elif defined(__GNUC__)
+#elif defined(ASM_FORMAT_ELF)
 # define BEGINCODE .section .text
 #else
@@ -61 +59 @@
 
 /** Marks the end of a code section. */
-#if defined(__clang__)
+#if ASM_FORMAT_MACHO
 # define ENDCODE
-#elif defined(__GNUC__)
+#elif defined(ASM_FORMAT_ELF)
 # define ENDCODE
 #else
@@ -71 +69 @@
 
 /** Marks the beginning of a data section. */
-#if defined(__clang__)
+#if ASM_FORMAT_MACHO
 # define BEGINDATA .section __DATA,__data
-#elif defined(__GNUC__)
+#elif defined(ASM_FORMAT_ELF)
 # define BEGINDATA .section .data
 #else
@@ -80 +78 @@
 
 /** Marks the end of a data section. */
-#if defined(__clang__)
+#if ASM_FORMAT_MACHO
 # define ENDDATA
-#elif defined(__GNUC__)
+#elif defined(ASM_FORMAT_ELF)
 # define ENDDATA
 #else
@@ -90 +88 @@
 
 /** Marks the beginning of a readonly data section. */
-#if defined(__clang__)
+#if ASM_FORMAT_MACHO
 # define BEGINCONST .section __RODATA,__rodata
-#elif defined(__GNUC__)
+#elif defined(ASM_FORMAT_ELF)
 # define BEGINCONST .section .rodata
 #else
@@ -99 +97 @@
 
 /** Marks the end of a readonly data section. */
-#if defined(__clang__)
+#if ASM_FORMAT_MACHO
 # define ENDCONST
-#elif defined(__GNUC__)
+#elif defined(ASM_FORMAT_ELF)
 # define ENDCONST
 #else
@@ -109 +107 @@
 
 /** Marks the beginning of a readonly C strings section. */
-#if defined(__clang__)
+#if ASM_FORMAT_MACHO
 # define BEGINCONSTSTRINGS .section __TEXT,__cstring,cstring_literals
-#elif defined(__GNUC__)
+#elif defined(ASM_FORMAT_ELF)
 # define BEGINCONSTSTRINGS .section .rodata
 #else
@@ -118 +116 @@
 
 /** Marks the end of a readonly C strings section. */
-#if defined(__clang__)
+#if ASM_FORMAT_MACHO
 # define ENDCONSTSTRINGS
-#elif defined(__GNUC__)
+#elif defined(ASM_FORMAT_ELF)
 # define ENDCONSTSTRINGS
 #else