From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 25 Nov 2024 16:13:11 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tFalz-000FYV-0W for lore@lore.pengutronix.de; Mon, 25 Nov 2024 16:13:11 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tFalx-0007me-Q2 for lore@pengutronix.de; Mon, 25 Nov 2024 16:13:11 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ywBC1pJOPYi5IF/EB44K1ZHCLKScNaRid9HgUsZhFG8=; b=UloLbQj1Qxn407w+i5X6AKgUt2 o6W0MmEObNkXQpW2qlW79KvXxiIwCIzRdeFexMakz4P8KcjuCWnKogdCC9EWkntLeuvjOoVugxQgI f0+kG5rTyH4DrgA113J/25yUS1INYDLRyFcSCenJt0jp/JAai7edVBfIDCpjdsqDv79GVvB4NfKp/ KTPapRlH1X2ePHq+3TNJWuMjIQa56GLmFbwy1KB/RBXPaT7j2o2f7H+juGlPaPtDndyD8ZHdFFhFS 879Qe4gNePZilNcuzMCEYQrSpWXdE8/WaH61xyZEsW2XYvTVI1uZHjpM99d4nCy1b0DsKhA9aIXU/ fy2R8C5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tFalT-00000008Pj3-0s01; Mon, 25 Nov 2024 15:12:39 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tFalM-00000008PbC-28aC for barebox@lists.infradead.org; Mon, 25 Nov 2024 15:12:35 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tFalL-0007D6-AT; Mon, 25 Nov 2024 16:12:31 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tFalK-0006Ms-12; Mon, 25 Nov 2024 16:12:31 +0100 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1tFalK-001lGb-1F; Mon, 25 Nov 2024 16:12:31 +0100 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 25 Nov 2024 16:12:21 +0100 Message-Id: <20241125151228.341441-10-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241125151228.341441-1-a.fatoum@pengutronix.de> References: <20241125151228.341441-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241125_071232_543637_B774CDF3 X-CRM114-Status: GOOD ( 11.42 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 09/16] libfile: stub out file descriptor API for PBL X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) To optimize out calls to undefined functions in PBL at compile-time instead of link time, let's define stubs for the functions that are referenced in obj-pbl-y files, but inside function sections that are ultimately unreferenced. We don't use IS_PROPER here as VFS support is always available in barebox proper. Signed-off-by: Ahmad Fatoum --- include/fcntl.h | 8 ++++++ include/libfile.h | 7 +++++ include/unistd.h | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) diff --git a/include/fcntl.h b/include/fcntl.h index a746471411b5..f3694c2bba5f 100644 --- a/include/fcntl.h +++ b/include/fcntl.h @@ -3,6 +3,7 @@ #define __FCNTL_H #include +#include #define AT_FDCWD -100 /* Special value used to indicate openat should use the current @@ -38,7 +39,14 @@ #define O_TMPFILE (__O_TMPFILE | O_DIRECTORY) +#if IN_PROPER int openat(int dirfd, const char *pathname, int flags); +#else +static inline int openat(int dirfd, const char *pathname, int flags, ...) +{ + return -ENOSYS; +} +#endif static inline int open(const char *pathname, int flags, ...) { diff --git a/include/libfile.h b/include/libfile.h index f772ff8b6af2..bf775b022dc4 100644 --- a/include/libfile.h +++ b/include/libfile.h @@ -32,7 +32,14 @@ int copy_recursive(const char *src, const char *dst); int compare_file(const char *f1, const char *f2); +#if IN_PROPER int open_and_lseek(const char *filename, int mode, loff_t pos); +#else +static inline int open_and_lseek(const char *filename, int mode, loff_t pos) +{ + return -ENOSYS; +} +#endif /* Create a directory and its parents */ int make_directory(const char *pathname); diff --git a/include/unistd.h b/include/unistd.h index f3d2378687e4..aad67ad30f84 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -4,11 +4,13 @@ #include #include +#include #define RW_BUF_SIZE (unsigned)4096 struct stat; +#if IN_PROPER int unlinkat(int dirfd, const char *pathname, int flags); int close(int fd); int lstatat(int dirfd, const char *filename, struct stat *s); @@ -26,6 +28,76 @@ char *pushd(const char *dir); int popd(char *dir); const char *getcwd(void); int ftruncate(int fd, loff_t length); +#else +static inline int unlinkat(int dirfd, const char *pathname, int flags) +{ + return -ENOSYS; +} +static inline int close(int fd) +{ + return -ENOSYS; +} +static inline int lstatat(int dirfd, const char *filename, struct stat *s) +{ + return -ENOSYS; +} +static inline int statat(int dirfd, const char *filename, struct stat *s) +{ + return -ENOSYS; +} +static inline int fstat(int fd, struct stat *s) +{ + return -ENOSYS; +} +static inline ssize_t read(int fd, void *buf, size_t count) +{ + return -ENOSYS; +} +static inline ssize_t pread(int fd, void *buf, size_t count, loff_t offset) +{ + return -ENOSYS; +} +static inline ssize_t write(int fd, const void *buf, size_t count) +{ + return -ENOSYS; +} +static inline ssize_t pwrite(int fd, const void *buf, size_t count, loff_t offset) +{ + return -ENOSYS; +} +static inline loff_t lseek(int fildes, loff_t offset, int whence) +{ + return -ENOSYS; +} +static inline int symlink(const char *pathname, const char *newpath) +{ + return -ENOSYS; +} +static inline int readlinkat(int dirfd, const char *path, char *buf, size_t bufsiz) +{ + return -ENOSYS; +} +static inline int chdir(const char *pathname) +{ + return -ENOSYS; +} +static inline char *pushd(const char *dir) +{ + return NULL; +} +static inline int popd(char *dir) +{ + return -ENOSYS; +} +static inline const char *getcwd(void) +{ + return NULL; +} +static inline int ftruncate(int fd, loff_t length) +{ + return -ENOSYS; +} +#endif static inline int unlink(const char *pathname) { -- 2.39.5