From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 16276 invoked from network); 3 Sep 2020 11:24:12 -0000 Received: from mother.openwall.net (195.42.179.200) by inbox.vuxu.org with ESMTPUTF8; 3 Sep 2020 11:24:12 -0000 Received: (qmail 16077 invoked by uid 550); 3 Sep 2020 11:24:01 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 15928 invoked from network); 3 Sep 2020 11:23:59 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=CbXoQYzKqxOkb vMm+MTYk+eR9eJInhTNPIS5ggn+Z3g=; b=ZfAOLWpFD9oG8XljYHOWFxvUYTEmQ /rPV2YlJZwlBPJx+qM49r0pUW7tT6KxJzkmCc9/Z+ZfphxtwQC53xiNF3fLXFbL2 ehRoVhAmjQ9vLvs/Pb+LbO+dRwjqNTJc7WVqOP7iKmvnkj6ZRfs9Eyw9m3Alnc1F Leubh9tj5IyaaaP7Gpsoel7P9G97aLGCZ5J9o+Kr2mngglfLU5OsJjQrUjPhg+mb YDuCIViCcOZsnnTP/tmG6jKk/mIKhASjKo/TtaD9d3qhDxoNrb7hC+9d4BLjukqb arQ85UdvqVvuBTDGPCTs+IbqcI8PiGoYM7hyt0XCqySeXrl90CnyO1FWQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=CbXoQYzKqxOkbvMm+MTYk+eR9eJInhTNPIS5ggn+Z3g=; b=VG61+DtW /FYeRoZynfEZCT6i5O1ze1Fl6qEeZ2u3yRQ8MUCtAQe1gkUT1hIkJMCmn31UA3JX q0g/ALjLgUsK6s7d1MOdl15Tg6KkVj4pS8aKKQ2icTtfziN0V/TcdSwJU9K5Tovv 6xoSdkK/Bs942GsZy8FY4dYJLTXVmRA4yerp0uWA56aGjVt8LJitdc4a992rqK2e vB0zIVg1qyreQZV7iJ9ZfWoJc8IVluFMd+10Bsw20LozBp1lUQPyF+2mwZRQXQvh NwoRC5Bzt5qBxsHQEcUwDCu3cuz3IFLovM7su6WvQ3zMOmv0HLJViMH91lamrRFP 7GZtt/6ZKL5HHg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudeguddggedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepufhtvghfrghnucfqkdftvggrrhcuoehsohhrvggrrhesfhgr shhtmhgrihhlrdgtohhmqeenucggtffrrghtthgvrhhnpeegueehieeifeehleevgfdvfe fgtefhhedtieduhfegiefhtdfghfdtteeijeelveenucfkphepvddtledriedrudehgedr feegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepsh horhgvrghrsehfrghsthhmrghilhdrtghomh X-ME-Proxy: From: Stefan O'Rear To: musl@lists.openwall.com Cc: Stefan O'Rear Date: Thu, 3 Sep 2020 07:22:57 -0400 Message-Id: <20200903112309.102601-3-sorear@fastmail.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200903112309.102601-1-sorear@fastmail.com> References: <20200903112309.102601-1-sorear@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [musl] [PATCH 02/14] time64: Don't make aliases to nonexistent syscalls riscv32 and future architectures lack the _time32 variants entirely, so don't try to use their numbers. --- src/internal/syscall.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/internal/syscall.h b/src/internal/syscall.h index d5f294d4..66fc4e5c 100644 --- a/src/internal/syscall.h +++ b/src/internal/syscall.h @@ -201,6 +201,7 @@ static inline long __alt_socketcall(int sys, int sock, int cp, long a, long b, l #define SYS_sendfile SYS_sendfile64 #endif +#ifdef SYS_timer_settime32 #ifndef SYS_timer_settime #define SYS_timer_settime SYS_timer_settime32 #endif @@ -240,6 +241,7 @@ static inline long __alt_socketcall(int sys, int sock, int cp, long a, long b, l #ifndef SYS_settimeofday #define SYS_settimeofday SYS_settimeofday_time32 #endif +#endif /* Ensure that the plain syscall names are defined even for "time64-only" * archs. These facilitate callers passing null time arguments, and make -- 2.25.4