Changeset 87117 in vbox for trunk

Timestamp:

Dec 23, 2020 8:38:51 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

142003

Message:

tools/env.sh,/Config.kmk,iprt/cdefs.h: A little fun. bugref:9898

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• include/iprt/cdefs.h (modified) (10 diffs)

trunk/Config.kmk

@@ -319 +319 @@
 # Select new Xcode based on host OS X version.
 ifeq ($(KBUILD_HOST),darwin)
-# if !defined(VBOX_WITH_EVEN_NEWER_XCODE) && !defined(VBOX_WITHOUT_EVEN_NEWER_XCODE) && !defined(VBOX_WITH_NEW_XCODE) && $(KBUILD_HOST_VERSION_MAJOR) >= 16 # (OS X 10.12 Sierra)
+ if "$(KBUILD_TARGET_ARCH)" == "arm64"
+VBOX_WITH_EVEN_NEWER_XCODE := 1
+# else if !defined(VBOX_WITH_EVEN_NEWER_XCODE) && !defined(VBOX_WITHOUT_EVEN_NEWER_XCODE) && !defined(VBOX_WITH_NEW_XCODE) && $(KBUILD_HOST_VERSION_MAJOR) >= 16 # (OS X 10.12 Sierra)
 #VBOX_WITH_EVEN_NEWER_XCODE := 1
-# else
- if !defined(VBOX_WITH_NEW_XCODE) && !defined(VBOX_WITHOUT_NEW_XCODE) && $(KBUILD_HOST_VERSION_MAJOR) >= 13 # (OS X 10.9 Mavericks)
+ else if !defined(VBOX_WITH_NEW_XCODE) && !defined(VBOX_WITHOUT_NEW_XCODE) && $(KBUILD_HOST_VERSION_MAJOR) >= 13 # (OS X 10.9 Mavericks)
 VBOX_WITH_NEW_XCODE := 1
  endif
@@ -1851 +1852 @@
 # ARCH_BITS_DEFS.
 #
-if1of ($(KBUILD_TARGET_ARCH),amd64 sparc64)
+if1of ($(KBUILD_TARGET_ARCH),amd64 sparc64 arm64)
  VBOX_HC_ARCH_BITS := 64
  ARCH_BITS_DEFS    := HC_ARCH_BITS=64
@@ -2316 +2317 @@
   else if1of ($(VBOX_GCC_TOOL), VBoxXcode62)
    VBOX_DEF_MACOSX_VERSION_MIN := 10.9#  Mavericks
+  else ifeq ($(KBUILD_TARGET_ARCH),arm64)
+   VBOX_DEF_MACOSX_VERSION_MIN := 11.0# The Jack Kerouac novel.
   else
    VBOX_DEF_MACOSX_VERSION_MIN := 10.13# High Sierra

trunk/include/iprt/cdefs.h

@@ -64 +64 @@
 # define RT_ARCH_SPARC
 # define RT_ARCH_SPARC64
+# define RT_ARCH_ARM32
+# define RT_ARCH_ARM64
 # define IN_RING0
 # define IN_RING3
@@ -105 +107 @@
  * Indicates that we're compiling for the SPARC V9 architecture (64-bit).
  */
+
+/** @def RT_ARCH_ARM32
+ * Indicates that we're compiling for the 32-bit ARM architecture.
+ */
+
+/** @def RT_ARCH_ARM64
+ * Indicates that we're compiling for the 64-bit ARM architecture.
+ */
+
 #if !defined(RT_ARCH_X86) \
  && !defined(RT_ARCH_AMD64) \
  && !defined(RT_ARCH_SPARC) \
  && !defined(RT_ARCH_SPARC64) \
- && !defined(RT_ARCH_ARM)
+ && !defined(RT_ARCH_ARM32) \
+ && !defined(RT_ARCH_ARM64)
 # if defined(__amd64__) || defined(__x86_64__) || defined(_M_X64) || defined(__AMD64__)
 #  define RT_ARCH_AMD64
@@ -118 +130 @@
 # elif defined(__sparc__)
 #  define RT_ARCH_SPARC
+# elif defined(__arm64__) || defined(__aarch64__)
+#  define RT_ARCH_ARM64
 # elif defined(__arm__) || defined(__arm32__)
-#  define RT_ARCH_ARM
+#  define RT_ARCH_ARM32
 # else /* PORTME: append test for new archs. */
 #  error "Check what predefined macros your compiler uses to indicate architecture."
@@ -136 +150 @@
 #elif defined(RT_ARCH_SPARC) && defined(RT_ARCH_SPARC64)
 # error "Both RT_ARCH_SPARC and RT_ARCH_SPARC64 cannot be defined at the same time!"
-#elif defined(RT_ARCH_ARM) && defined(RT_ARCH_AMD64)
-# error "Both RT_ARCH_ARM and RT_ARCH_AMD64 cannot be defined at the same time!"
-#elif defined(RT_ARCH_ARM) && defined(RT_ARCH_X86)
-# error "Both RT_ARCH_ARM and RT_ARCH_X86 cannot be defined at the same time!"
-#elif defined(RT_ARCH_ARM) && defined(RT_ARCH_SPARC64)
-# error "Both RT_ARCH_ARM and RT_ARCH_SPARC64 cannot be defined at the same time!"
-#elif defined(RT_ARCH_ARM) && defined(RT_ARCH_SPARC)
-# error "Both RT_ARCH_ARM and RT_ARCH_SPARC cannot be defined at the same time!"
+#elif defined(RT_ARCH_ARM32) && defined(RT_ARCH_AMD64)
+# error "Both RT_ARCH_ARM32 and RT_ARCH_AMD64 cannot be defined at the same time!"
+#elif defined(RT_ARCH_ARM32) && defined(RT_ARCH_X86)
+# error "Both RT_ARCH_ARM32 and RT_ARCH_X86 cannot be defined at the same time!"
+#elif defined(RT_ARCH_ARM32) && defined(RT_ARCH_SPARC64)
+# error "Both RT_ARCH_ARM32 and RT_ARCH_SPARC64 cannot be defined at the same time!"
+#elif defined(RT_ARCH_ARM32) && defined(RT_ARCH_SPARC)
+# error "Both RT_ARCH_ARM32 and RT_ARCH_SPARC cannot be defined at the same time!"
+#elif defined(RT_ARCH_ARM64) && defined(RT_ARCH_AMD64)
+# error "Both RT_ARCH_ARM64 and RT_ARCH_AMD64 cannot be defined at the same time!"
+#elif defined(RT_ARCH_ARM64) && defined(RT_ARCH_X86)
+# error "Both RT_ARCH_ARM64 and RT_ARCH_X86 cannot be defined at the same time!"
+#elif defined(RT_ARCH_ARM64) && defined(RT_ARCH_SPARC64)
+# error "Both RT_ARCH_ARM64 and RT_ARCH_SPARC64 cannot be defined at the same time!"
+#elif defined(RT_ARCH_ARM64) && defined(RT_ARCH_SPARC)
+# error "Both RT_ARCH_ARM64 and RT_ARCH_SPARC cannot be defined at the same time!"
+#elif defined(RT_ARCH_ARM64) && defined(RT_ARCH_ARM32)
+# error "Both RT_ARCH_ARM64 and RT_ARCH_ARM32 cannot be defined at the same time!"
+#endif
+#ifdef RT_ARCH_ARM
+# error "RT_ARCH_ARM is now RT_ARCH_ARM32!"
 #endif
 
@@ -151 +178 @@
      + (defined(RT_ARCH_SPARC) != 0) \
      + (defined(RT_ARCH_SPARC64) != 0) \
-     + (defined(RT_ARCH_ARM) != 0) \
+     + (defined(RT_ARCH_ARM32) != 0) \
+     + (defined(RT_ARCH_ARM64) != 0) \
   != 1
 # error "Exactly one RT_ARCH_XXX macro shall be defined"
@@ -295 +323 @@
 /** @def RT_LITTLE_ENDIAN
  * Defined if the architecture is little endian.  */
-#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) || defined(RT_ARCH_ARM)
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) || defined(RT_ARCH_ARM32) || defined(RT_ARCH_ARM64)
 # define RT_LITTLE_ENDIAN
 #elif defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
@@ -335 +363 @@
  */
 #if !defined(ARCH_BITS) || defined(DOXYGEN_RUNNING)
-# if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC64) || defined(DOXYGEN_RUNNING)
+# if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC64) || defined(RT_ARCH_ARM64) || defined(DOXYGEN_RUNNING)
 #  define ARCH_BITS 64
 # elif !defined(__I86__) || !defined(__WATCOMC__)
@@ -346 +374 @@
 /* ARCH_BITS validation (PORTME). */
 #if ARCH_BITS == 64
- #if defined(RT_ARCH_X86) || defined(RT_ARCH_SPARC) || defined(RT_ARCH_ARM)
+ #if defined(RT_ARCH_X86) || defined(RT_ARCH_SPARC) || defined(RT_ARCH_ARM32)
  # error "ARCH_BITS=64 but non-64-bit RT_ARCH_XXX defined."
  #endif
- #if !defined(RT_ARCH_AMD64) && !defined(RT_ARCH_SPARC64)
+ #if !defined(RT_ARCH_AMD64) && !defined(RT_ARCH_SPARC64) && !defined(RT_ARCH_ARM64)
  # error "ARCH_BITS=64 but no 64-bit RT_ARCH_XXX defined."
  #endif
 
 #elif ARCH_BITS == 32
- #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC64)
+ #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC64) || defined(RT_ARCH_ARM64)
  # error "ARCH_BITS=32 but non-32-bit RT_ARCH_XXX defined."
  #endif
- #if !defined(RT_ARCH_X86) && !defined(RT_ARCH_SPARC) && !defined(RT_ARCH_ARM)
+ #if !defined(RT_ARCH_X86) && !defined(RT_ARCH_SPARC) && !defined(RT_ARCH_ARM32)
  # error "ARCH_BITS=32 but no 32-bit RT_ARCH_XXX defined."
  #endif
 
 #elif ARCH_BITS == 16
- #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64) || defined(RT_ARCH_ARM)
+ #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64) || defined(RT_ARCH_ARM32) || defined(RT_ARCH_ARM64)
  # error "ARCH_BITS=16 but non-16-bit RT_ARCH_XX defined."
  #endif
@@ -3820 +3848 @@
 # elif defined(RT_ARCH_SPARC)
 #  define RT_BREAKPOINT()       __asm__ __volatile__("unimp 0\n\t")     /** @todo Sparc: this is just a wild guess (same as Sparc64, just different name). */
+# elif defined(RT_ARCH_ARM32) || defined(RT_ARCH_ARM64)
+#  define RT_BREAKPOINT()       __asm__ __volatile__("brk #0x1\n\t")
 # endif
 #endif
@@ -4301 +4331 @@
 # endif /* !IN_RING3 */
 
-#elif defined(RT_ARCH_ARM)
+#elif defined(RT_ARCH_ARM32) || defined(RT_ARCH_ARM64)
 /* ASSUMES that at least the last and first 4K are out of bounds. */
 # define RT_VALID_PTR(ptr)      ( (uintptr_t)(ptr) + 0x1000U >= 0x2000U )