[libc] reverts for 32b arm

[nickdesaulniers]

These were fixed properly by f1f1875.

• Revert "[libc] temporarily set -Wno-shorten-64-to-32 ([libc] temporarily set -Wno-shorten-64-to-32 #77396)"
• Revert "[libc] make off_t 32b for 32b arm ([libc] make off_t 32b for 32b arm #77350)"

[llvmbot]

@llvm/pr-subscribers-libc

Author: Nick Desaulniers (nickdesaulniers)

Changes

• Revert "[libc] temporarily set -Wno-shorten-64-to-32 (#77396)"
• Revert "[libc] make off_t 32b for 32b arm (#77350)"

---

Full diff: https://github.com/llvm/llvm-project/pull/78307.diff

2 Files Affected:

• (modified) libc/include/llvm-libc-types/off_t.h (-4)
• (modified) libc/src/sys/mman/linux/CMakeLists.txt (-3)

diff --git a/libc/include/llvm-libc-types/off_t.h b/libc/include/llvm-libc-types/off_t.h
index a0cbe992189d00a..111b29aa68d875e 100644
--- a/libc/include/llvm-libc-types/off_t.h
+++ b/libc/include/llvm-libc-types/off_t.h
@@ -9,10 +9,6 @@
 #ifndef __LLVM_LIBC_TYPES_OFF_T_H__
 #define __LLVM_LIBC_TYPES_OFF_T_H__
 
-#if defined(__LP64__) || defined(__riscv)
 typedef __INT64_TYPE__ off_t;
-#else
-typedef __INT32_TYPE__ off_t;
-#endif // __LP64__ || __riscv
 
 #endif // __LLVM_LIBC_TYPES_OFF_T_H__
diff --git a/libc/src/sys/mman/linux/CMakeLists.txt b/libc/src/sys/mman/linux/CMakeLists.txt
index 08694ec48be3979..163e7dead8887ab 100644
--- a/libc/src/sys/mman/linux/CMakeLists.txt
+++ b/libc/src/sys/mman/linux/CMakeLists.txt
@@ -22,9 +22,6 @@ add_entrypoint_object(
     libc.include.sys_syscall
     libc.src.__support.OSUtil.osutil
     libc.src.errno.errno
-  COMPILE_OPTIONS
-    # TODO: https://github.com/llvm/llvm-project/issues/77395
-    -Wno-shorten-64-to-32
 )
 
 add_entrypoint_object(

[nickdesaulniers]

(I've verified that I can build libc ninja target on the 32b build bot with this PR and #78192 reverted)

[michaelrj-google]

LGTM