From patchwork Thu Mar 6 14:07:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Haehnel X-Patchwork-Id: 2055998 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernkonzept.com header.i=@kernkonzept.com header.a=rsa-sha256 header.s=mx1 header.b=d4v9+9iA; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=uclibc-ng.org (client-ip=89.238.66.15; helo=helium.openadk.org; envelope-from=devel-bounces@uclibc-ng.org; receiver=patchwork.ozlabs.org) Received: from helium.openadk.org (helium.openadk.org [89.238.66.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Z7rqQ44Kyz1yKh for ; Fri, 7 Mar 2025 01:08:18 +1100 (AEDT) Received: from helium.openadk.org (localhost [IPv6:::1]) by helium.openadk.org (Postfix) with ESMTP id 01135352090F; Thu, 6 Mar 2025 15:08:14 +0100 (CET) Authentication-Results: helium.openadk.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernkonzept.com header.i=@kernkonzept.com header.a=rsa-sha256 header.s=mx1 header.b=d4v9+9iA; dkim-atps=neutral Received: from mx.kernkonzept.com (serv1.kernkonzept.com [159.69.200.6]) by helium.openadk.org (Postfix) with ESMTPS id A725F35208E8 for ; Thu, 6 Mar 2025 15:08:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kernkonzept.com; s=mx1; h=Content-Transfer-Encoding:MIME-Version:Message-ID :Date:Subject:Cc:To:From:References:In-Reply-To:Reply-To:Content-Type: Content-ID:Content-Description; bh=sgHZdb1uAd0KBiJMimimxNFeqtIn+dxQdrwtZbAwV7c=; b=d4v9+9iA0UAxX5MFY1N1to1N2/ r0Eaj/hQWM3aneo2gL2xT62epwzg7VRExcH5Glam2PmPBJSrXrfwA5PsXPTBO7ERPEKXJAqO3aRA7 MPVEJA8i9k4/Ir6s29uMkkPl1IZSwjXqMnnvgONENQPIgZlr3fqEy/nD/CJopejDe8Ju2yf2v9GoM GFwAXNsDU0HyzJfqGFPNaOuNrH9kyRtH95ToKgNSVH216AhOusD7arBT3zIVc1L0Ll3pIIhJVESNj xwLGwd0CDzrswAR6G3kk0mxkt4C6OIYnm5OkVgkuj6Fi6qvP96KAIwgEe0zFRYluij1WBUFf3xzYm 5KkoX51A==; Received: from ipb21a4294.dynamic.kabel-deutschland.de ([178.26.66.148] helo=amethyst.dd1.int.kernkonzept.com) by mx.kernkonzept.com with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.96) id 1tqBtP-001dg6-2P; Thu, 06 Mar 2025 15:08:07 +0100 From: Marcus Haehnel To: devel@uclibc-ng.org Date: Thu, 6 Mar 2025 15:07:55 +0100 Message-ID: <20250306140802.19472-1-marcus.haehnel@kernkonzept.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Message-ID-Hash: HVJKIBX44T3IJYRRCABPV3INY6Z4Z2XK X-Message-ID-Hash: HVJKIBX44T3IJYRRCABPV3INY6Z4Z2XK X-MailFrom: marcus.haehnel@kernkonzept.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Marcus Haehnel , Georg Kotheimer X-Mailman-Version: 3.3.3 Precedence: list Subject: [uclibc-ng-devel] [PATCH] Fix missing include in __uClibc_main List-Id: uClibc-ng Development Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Commit 227b7c825b6c79479f7222be03e83991b927da26 introduced a dependency on _dl_auxvt but missed to include the header defining the symbol. Include the ldso.h header that defines this and safeguard other parts of that header that do not play nice if fcntl.h has already been included. The latter is the case only for __uClibc_main.c. Reviewed-by: Georg Kotheimer Signed-off-by: Marcus Haehnel --- ldso/include/ldso.h | 2 ++ libc/misc/internals/__uClibc_main.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h index 60e0a5bec..a2c3ec040 100755 --- a/ldso/include/ldso.h +++ b/ldso/include/ldso.h @@ -34,6 +34,7 @@ #include #include /* for ptrdiff_t */ #include +#if !defined(_FCNTL_H) #define _FCNTL_H /* We need this if arch has only new syscalls defined */ #ifndef AT_FDCWD @@ -190,6 +191,7 @@ extern void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE loa #include #endif +#endif /* _FCNTL_H */ #define AUX_MAX_AT_ID 40 extern ElfW(auxv_t) _dl_auxvt[AUX_MAX_AT_ID]; /* Cache frequently accessed auxiliary vector entries */ diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index a84492248..87f80d4f2 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -84,6 +84,8 @@ static void fdpic_init_array_jump(void *addr) #ifndef SHARED void *__libc_stack_end = NULL; +#include "ldso.h" /* Needed for _dl_auxvt */ + # ifdef __UCLIBC_HAS_SSP__ # include static uintptr_t stack_chk_guard;