From patchwork Tue Jan 10 16:19:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1724164 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=bAm0bAWR; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Nrx010WQMz23gB for ; Wed, 11 Jan 2023 03:21:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6005985559; Tue, 10 Jan 2023 17:20:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="bAm0bAWR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1FCB385559; Tue, 10 Jan 2023 17:19:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yw1-x1129.google.com (mail-yw1-x1129.google.com [IPv6:2607:f8b0:4864:20::1129]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9E8EE8551C for ; Tue, 10 Jan 2023 17:19:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yw1-x1129.google.com with SMTP id 00721157ae682-4d0f843c417so46746837b3.7 for ; Tue, 10 Jan 2023 08:19:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vIdGxXI7nUpsmWaDUK6oukIZ20AmpczcoJOw4OrgL+Q=; b=bAm0bAWREbIXQwJlV+ebxhzWpCFMizO0uC8O/pJTlH3e7HvTOtPiS6hwMbUgKLIiuF M/jMgu4Tu3wk46+H2pYddGsnCYd9MdMnn58McguSH0SFbuuIaJOsWiljND5NlP+BHBIH bzd5wzG+N2vw80S4hwNPwn9LvczZcigNjJ+YA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vIdGxXI7nUpsmWaDUK6oukIZ20AmpczcoJOw4OrgL+Q=; b=Kyccw2hubfKgcphXqZ0TPg+AVLgGKTqSV792B+SnVrG2YgYXKd3taRm9qRwyDeWIcR MrU3a9D8sqbNDQsHdqN5RPL/CyKLbn/wbE2Yyq5PZhayKCfU9svvtyhcbGU5y1NGvOJC uBp+LyN3vIy/rh7oM1tcVlNV76uhQowrlyOSTPul8dpuLrOIa0fbbAuYvbrOL4WfwOTM PgO0VCI5fDIOOshvNipphz/BYPT0K3xqyIzJqBsKLokUtp8ZHs9x1tF5SiY1L6eWw+nH r4SvchSgk12A0HV6THi8FFX9j/c8sCrSuQoPkJPGO3GZMkcsZ73xRwc8NnRhf+2A/o+M ZfgA== X-Gm-Message-State: AFqh2kqNO2xdzUqjXEMkRgLl68LwecjaAuYkT7aowYiupnHXBVnudEz/ gGXXNIuB9DCuVxUvz5fXRritu39Ek6qJPk0p5wI= X-Google-Smtp-Source: AMrXdXuFPJN28AypCodVg1nmHrCvx0ShyJz7Pi8EzLA7X7m/GEWvUJTYuXbLWd+JEb/0un1NNn74nA== X-Received: by 2002:a05:7500:6a4:b0:ee:9be:bf5b with SMTP id bv36-20020a05750006a400b000ee09bebf5bmr5752289gab.57.1673367591951; Tue, 10 Jan 2023 08:19:51 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-2c2f-ce0f-8dee-7136.res6.spectrum.com. [2603:6081:7b00:6400:2c2f:ce0f:8dee:7136]) by smtp.gmail.com with ESMTPSA id d12-20020a05620a240c00b006fcc3858044sm7557110qkn.86.2023.01.10.08.19.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 08:19:51 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 06/19] arm: lib1funcs.S: Update compatibility with Linux comment slightly Date: Tue, 10 Jan 2023 11:19:33 -0500 Message-Id: <20230110161946.3816866-6-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230110161946.3816866-1-trini@konsulko.com> References: <20230110161946.3816866-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean At this point, the Linux code for "lib1funcs" has changed rather dramatically. While a resync would be beneficial, it's outside the scope of what we need here. Simply remove the define for CONFIG_AEABI and tests for it. Signed-off-by: Tom Rini --- arch/arm/lib/lib1funcs.S | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S index 7ff4446dd644..de15d09e3605 100644 --- a/arch/arm/lib/lib1funcs.S +++ b/arch/arm/lib/lib1funcs.S @@ -15,12 +15,11 @@ /* * U-Boot compatibility bit, define empty UNWIND() macro as, since we - * do not support stack unwinding and define CONFIG_AEABI to make all - * of the functions available without diverging from Linux code. + * do not support stack unwinding to make all of the functions available + * without diverging from Linux code. */ #ifdef __UBOOT__ #define UNWIND(x...) -#define CONFIG_AEABI #endif .macro ARM_DIV_BODY dividend, divisor, result, curbit @@ -314,8 +313,6 @@ UNWIND(.fnend) ENDPROC(__modsi3) .popsection -#ifdef CONFIG_AEABI - .pushsection .text.__aeabi_uidivmod, "ax" ENTRY(__aeabi_uidivmod) UNWIND(.fnstart) @@ -348,8 +345,6 @@ UNWIND(.fnend) ENDPROC(__aeabi_idivmod) .popsection -#endif - .pushsection .text.Ldiv0, "ax" Ldiv0: UNWIND(.fnstart)