summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
index 3a7f8a9acc7..3e2c6d1f044 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
@@ -68,14 +68,6 @@ typedef signed int s32;
typedef signed long long s64; // NOLINT
typedef int fd_t;
-// Unaligned versions.
-typedef __attribute__((aligned(1))) u16 uu16;
-typedef __attribute__((aligned(1))) u32 uu32;
-typedef __attribute__((aligned(1))) u64 uu64;
-typedef __attribute__((aligned(1))) s16 us16;
-typedef __attribute__((aligned(1))) s32 us32;
-typedef __attribute__((aligned(1))) s64 us64;
-
// WARNING: OFF_T may be different from OS type off_t, depending on the value of
// _FILE_OFFSET_BITS. This definition of OFF_T matches the ABI of system calls
// like pread and mmap, as opposed to pread64 and mmap64.
@@ -160,6 +152,14 @@ using namespace __sanitizer; // NOLINT
# endif
#endif // _MSC_VER
+// Unaligned versions of basic types.
+typedef ALIGNED(1) u16 uu16;
+typedef ALIGNED(1) u32 uu32;
+typedef ALIGNED(1) u64 uu64;
+typedef ALIGNED(1) s16 us16;
+typedef ALIGNED(1) s32 us32;
+typedef ALIGNED(1) s64 us64;
+
#if SANITIZER_WINDOWS
typedef unsigned long DWORD; // NOLINT
typedef DWORD thread_return_t;
OpenPOWER on IntegriCloud