Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libc] reverts for 32b arm #78307

Merged
merged 2 commits into from Jan 18, 2024
Merged

Conversation

nickdesaulniers
Copy link
Member

@nickdesaulniers nickdesaulniers commented Jan 16, 2024

These were fixed properly by f1f1875.

This reverts commit 70cea91.

The correct fix was
commit f1f1875 ("[libc][cmake] reset COMPILE_DEFINITIONS (llvm#77810)")

Link: llvm#77395
This reverts commit ce1305a.

The correct fix was
commit f1f1875 ("[libc][cmake] reset COMPILE_DEFINITIONS (llvm#77810)")

Link: llvm#77395
@llvmbot llvmbot added the libc label Jan 16, 2024
@llvmbot
Copy link
Collaborator

llvmbot commented Jan 16, 2024

@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
Copy link
Member Author

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

Copy link
Contributor

@michaelrj-google michaelrj-google left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nickdesaulniers nickdesaulniers merged commit de03c46 into llvm:main Jan 18, 2024
5 checks passed
@nickdesaulniers nickdesaulniers deleted the arm_reverts branch January 18, 2024 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants