From 95ca2e2cf9d6d1e15df851269026eba78e064292 Mon Sep 17 00:00:00 2001
From: Caslyn Tonelli <caslyn@google.com>
Date: Tue, 11 Apr 2023 02:57:38 +0000
Subject: [PATCH] [libc] Fix swab placement

Per https://reviews.llvm.org/D147970#4256889, swab.cpp is moved out of
the /linux subdirectory and cmake specifications are amended to reflect
that swab is not OS-specific.

Differential Revision: https://reviews.llvm.org/D147988
---
 libc/config/linux/aarch64/entrypoints.txt |  2 +-
 libc/config/linux/riscv64/entrypoints.txt |  2 +-
 libc/config/linux/x86_64/entrypoints.txt  |  2 +-
 libc/src/unistd/CMakeLists.txt            | 18 +++++++++++-------
 libc/src/unistd/linux/CMakeLists.txt      |  8 --------
 libc/src/unistd/{linux => }/swab.cpp      |  0
 6 files changed, 14 insertions(+), 18 deletions(-)
 rename libc/src/unistd/{linux => }/swab.cpp (100%)

diff --git a/libc/config/linux/aarch64/entrypoints.txt b/libc/config/linux/aarch64/entrypoints.txt
index 7d76e83d..ef9a44f 100644
--- a/libc/config/linux/aarch64/entrypoints.txt
+++ b/libc/config/linux/aarch64/entrypoints.txt
@@ -189,7 +189,6 @@ set(TARGET_LIBC_ENTRYPOINTS
     libc.src.unistd.readlink
     libc.src.unistd.readlinkat
     libc.src.unistd.rmdir
-    libc.src.unistd.swab
     libc.src.unistd.symlink
     libc.src.unistd.symlinkat
     libc.src.unistd.sysconf
@@ -464,6 +463,7 @@ if(LLVM_LIBC_FULL_BUILD)
     libc.src.unistd.optind
     libc.src.unistd.optopt
     libc.src.unistd.opterr
+    libc.src.unistd.swab
 
     # sys/select.h entrypoints
     libc.src.sys.select.select
diff --git a/libc/config/linux/riscv64/entrypoints.txt b/libc/config/linux/riscv64/entrypoints.txt
index 936949f..ff741ed 100644
--- a/libc/config/linux/riscv64/entrypoints.txt
+++ b/libc/config/linux/riscv64/entrypoints.txt
@@ -191,7 +191,6 @@ set(TARGET_LIBC_ENTRYPOINTS
     libc.src.unistd.readlink
     libc.src.unistd.readlinkat
     libc.src.unistd.rmdir
-    libc.src.unistd.swab
     libc.src.unistd.symlink
     libc.src.unistd.symlinkat
     libc.src.unistd.sysconf
@@ -494,6 +493,7 @@ if(LLVM_LIBC_FULL_BUILD)
     libc.src.unistd.optind
     libc.src.unistd.optopt
     libc.src.unistd.opterr
+    libc.src.unistd.swab
 
     # sys/select.h entrypoints
     libc.src.sys.select.select
diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt
index 9e450ea..bc98b47 100644
--- a/libc/config/linux/x86_64/entrypoints.txt
+++ b/libc/config/linux/x86_64/entrypoints.txt
@@ -193,7 +193,6 @@ set(TARGET_LIBC_ENTRYPOINTS
     libc.src.unistd.readlink
     libc.src.unistd.readlinkat
     libc.src.unistd.rmdir
-    libc.src.unistd.swab
     libc.src.unistd.symlink
     libc.src.unistd.symlinkat
     libc.src.unistd.sysconf
@@ -507,6 +506,7 @@ if(LLVM_LIBC_FULL_BUILD)
     libc.src.unistd.optind
     libc.src.unistd.optopt
     libc.src.unistd.opterr
+    libc.src.unistd.swab
 
     # sys/select.h entrypoints
     libc.src.sys.select.select
diff --git a/libc/src/unistd/CMakeLists.txt b/libc/src/unistd/CMakeLists.txt
index 261e16e..1eb653d 100644
--- a/libc/src/unistd/CMakeLists.txt
+++ b/libc/src/unistd/CMakeLists.txt
@@ -192,13 +192,6 @@ add_entrypoint_object(
 )
 
 add_entrypoint_object(
-  swab
-  ALIAS
-  DEPENDS
-    .${LIBC_TARGET_OS}.swab
-)
-
-add_entrypoint_object(
   symlink
   ALIAS
   DEPENDS
@@ -276,6 +269,17 @@ add_entrypoint_object(
     libc.src.stdio.fprintf
 )
 
+add_entrypoint_object(
+  swab
+  SRCS
+    swab.cpp
+  HDRS
+    swab.h
+  DEPENDS
+    libc.include.unistd
+    libc.src.__support.CPP.optional
+)
+
 # These aren't actual external per-se, but this is just an easy way to create
 # targets that don't do anything. They exist to be referenced in entrypoints.txt
 # so that the header will properly expose their definitions. Their declaration
diff --git a/libc/src/unistd/linux/CMakeLists.txt b/libc/src/unistd/linux/CMakeLists.txt
index 8ca5d59..2507e1e 100644
--- a/libc/src/unistd/linux/CMakeLists.txt
+++ b/libc/src/unistd/linux/CMakeLists.txt
@@ -354,14 +354,6 @@ add_entrypoint_object(
 )
 
 add_entrypoint_object(
-  swab
-  SRCS
-    swab.cpp
-  HDRS
-    ../swab.h
-)
-
-add_entrypoint_object(
   symlink
   SRCS
     symlink.cpp
diff --git a/libc/src/unistd/linux/swab.cpp b/libc/src/unistd/swab.cpp
similarity index 100%
rename from libc/src/unistd/linux/swab.cpp
rename to libc/src/unistd/swab.cpp
-- 
2.7.4