stuff2

include/common/compiler.h

@@ -1,7 +1,12 @@
 #pragma once
 
-// These hints may improve code generation, but are optional and can be stubbed.
-#if defined(__GNUC__) || defined(__clang__)
+// Attributes that affect data layout.
+#define __section(x) gnu::section(x)
+#define __aligned(x) gnu::aligned(x)
+#define __packed     gnu::packed
+#define __naked      gnu::naked
+
+// These hints may improve code generation.
 #define __cold              gnu::cold
 #define __hot               gnu::hot
 #define __used              gnu::used
@@ -9,17 +14,6 @@
 #define __format(like, ...) gnu::format(like, __VA_ARGS__)
 #define __likely(x)         __builtin_expect(!!(x), 1)
 #define __unlikely(x)       __builtin_expect(!!(x), 0)
-#define __always_inline     gnu::always_inline
-#else
-#define __cold
-#define __hot
-#define __used
-#define __unused
-#define __format(like, ...)
-#define __likely(x)   x
-#define __unlikely(x) x
-#define __always_inline
-#endif
 
 // Only clang has these hints, GCC will throw a warning here.
 // They also don't support the C23 attribute format.
@@ -30,18 +24,3 @@
 #define __user
 #define __phys
 #endif
-
-// Attributes that affect data layout. Not optional.
-#if defined(__GNUC__) || defined(__clang__)
-#define __weak       gnu::weak
-#define __section(x) gnu::section(x)
-#define __aligned(x) gnu::aligned(x)
-#define __packed     gnu::packed
-#define __naked      gnu::naked
-#define __alias(x)   gnu::alias(x)
-#else
-#error "Unsupported compiler!"
-#endif
-
-// Intrinsics
-#define __unreachable() __builtin_unreachable()

include/common/elf.h

@@ -2,37 +2,6 @@
 
 #include <stdint.h>
 
-#ifdef __x86_64__
-#define ELF_ARCH_CLASS   ELFCLASS64
-#define ELF_ARCH_DATA    ELFDATA2LSB
-#define ELF_ARCH_MACHINE EM_X86_64
-
-#define ELF_R_SYM   ELF64_R_SYM
-#define ELF_R_TYPE  ELF64_R_TYPE
-#define ELF_ST_BIND ELF64_ST_BIND
-#define ELF_ST_TYPE ELF64_ST_TYPE
-
-#define elf_ehdr elf64_ehdr
-#define elf_phdr elf64_phdr
-#define elf_dyn  elf64_dyn
-#define elf_addr elf64_addr
-#define elf_off  elf64_off
-#define elf_nhdr elf64_nhdr
-#define elf_auxv elf64_auxv
-#define elf_sym  elf64_sym
-#define elf_rela elf64_rela
-#define elf_rel  elf64_rel
-
-enum {
-    R_NONE = 0,
-    R_COPY = 5,
-    R_GLOB_DAT = 6,
-    R_JUMP_SLOT = 7,
-    R_RELATIVE = 8,
-    R_IRELATIVE = 37,
-};
-#endif
-
 constexpr char ELF_MAG[4] = {0x7F, 'E', 'L', 'F'};
 
 typedef uint64_t elf64_addr_t;
@@ -369,3 +338,36 @@ static inline uint32_t ELF64_R_SYM(uint64_t info) {
 static inline uint32_t ELF64_R_TYPE(uint64_t info) {
     return info & 0xFFFFFFFF;
 }
+
+// Architecture specific bits.
+
+#ifdef __x86_64__
+#define ELF_ARCH_CLASS   ELFCLASS64
+#define ELF_ARCH_DATA    ELFDATA2LSB
+#define ELF_ARCH_MACHINE EM_X86_64
+
+#define ELF_R_SYM   ELF64_R_SYM
+#define ELF_R_TYPE  ELF64_R_TYPE
+#define ELF_ST_BIND ELF64_ST_BIND
+#define ELF_ST_TYPE ELF64_ST_TYPE
+
+#define elf_ehdr elf64_ehdr
+#define elf_phdr elf64_phdr
+#define elf_dyn  elf64_dyn
+#define elf_addr elf64_addr
+#define elf_off  elf64_off
+#define elf_nhdr elf64_nhdr
+#define elf_auxv elf64_auxv
+#define elf_sym  elf64_sym
+#define elf_rela elf64_rela
+#define elf_rel  elf64_rel
+
+enum {
+    R_NONE = 0,
+    R_COPY = 5,
+    R_GLOB_DAT = 6,
+    R_JUMP_SLOT = 7,
+    R_RELATIVE = 8,
+    R_IRELATIVE = 37,
+};
+#endif