From patchwork Mon Sep 28 23:45:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1372929 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=TtiBwAGc; 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C0fKJ11Q5z9sPB for ; Tue, 29 Sep 2020 09:45:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 70EAB81F22; Tue, 29 Sep 2020 01:45:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de 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; secure) header.d=gmx.net header.i=@gmx.net header.b="TtiBwAGc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7570F821F8; Tue, 29 Sep 2020 01:45:26 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EA09681C2C for ; Tue, 29 Sep 2020 01:45:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1601336721; bh=k65DTxrNIn4+Se+wjIyT/IWfsynmo5+D8AVHGHBcL1s=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=TtiBwAGcvLhCOcUO9c5kkNan4RYRk8GrI/dB/osJEDSL8matKBsa7ch+lJNFwCMLz d80F7mlQF7Mh/5Ctfvpad6CoqKliuYYGq+f3Ig3uojwaE8celpBYV7iDbcQbRf/Edm ayx8v/3mcPHExsjkslZzPlPGSr1D+2/9RYkxg5IU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([178.202.41.107]) by mail.gmx.com (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MZTqg-1jsfsl1TKo-00WSfs; Tue, 29 Sep 2020 01:45:21 +0200 From: Heinrich Schuchardt To: Tom Rini Cc: Simon Glass , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] common: redefine getc() Date: Tue, 29 Sep 2020 01:45:14 +0200 Message-Id: <20200928234514.124945-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:VVuY0m53t+N52Qbw0c2mA/YW6JjlShS+xKwQsV7+XSmX2uRTG3q nJS5m4XW5VzGRZHJD8ax6XDbZVh5x9PDp2MwjgxTmcYj8spD4O8hzqCWgxIpUK3KBsksfKu ohEn6L+cIOSe0xVMkwMnvAiUPjEAp7V1Ikqugd+EQRzzsCfQf38VEFrr6f05DBfE84PoXRZ d2G29WwVfG3rI4WVgcyMg== X-UI-Out-Filterresults: notjunk:1;V03:K0:M/ogQABeEJ8=:2B5tplX40NedxFFzfaKayd KD4TaJRd53jxwRW8c+xgD9Q7JsQLBJhSSj5egj69Gj16JfAsMX+xkqGqvECorRiFdfoXYqBUS pSD3aJJbfMyB6eBZAcf4uwSkDKy4tYv2lZ6upsPpwX+FvpS28emhmFai7RM23CSeGe1Nopw2Z hl3JdiD6i0JfTz79k+F+1iJEU8r2T6Y/gNKUY+WW+J1w8xmmnPCN1VZYfbD8bpiizYFeZLLIc ObuWOaBU1+cD3qK8C2KAW4KKrWKc8Z4LpbCWmIDWc4DjY12cPE1yMgSyoaWKA9s5rdqCTQEDE WZENWXMxEq+mfdtmyu0DaKrZ63kSUP5bN/i2lok5RLCwegmv3gGe69BTtNFDfiS6jrCrGrqgl g56KI+DehyEEo2mRwKkexLxjtCGBK8SaGg7BMQjaOEU0AG3KyGXkRouPKUSqEeEfntGcfRAlx QlRrHmGNZ8gLatTxAXRg2/nlJHIvs1M28gGqTYnfBATPvb7ZWhLl5quwfWRQnJ954KCCU67xv rtVFntnxWL+LE9W6LFgbsuEcpfMqHIoAWD0ZnR4E77OX9xc98aXrzT3Xk0PuEaaiVNCIMctoC 8fL432sQkUQxUge+uflXog+V83z1vgrzRGfYc1HmbcAlmYVEyY1NLd6NWrLNv1p7A+5VQKFN6 NgXmCzr7GPb7sU+bE2pjpAInojIwp1jv4R2lC2mNvyxu9okOcfAWQs4HupT50OGcQ7qEjEeFE SxWowd2u5F6WvuJ9tvmRg/t9N2CsoohMFiyihaSiOMwUEuhKKkKhMN7+Rqe2tRji/LZSWqVp+ XjAwlQhdRbmV2DwR2Er+djDyibYMSWT4fLO8kx9mRUNqP0+iym9DJtplsPn5TjGucpZ/ViwVx 6iEr7ac/kfOJwv80ENG66qHyzIoOtDFWTA7nYCEe7jDo9xFFl39/pwktMzDknh1V6ifCjHWUN rZFM5sdZDNcaT2KlCrXbKKqwzgherhgmrguj5P5FH4sJ7nj/qkxgqj/GXOPnIeidA4dKHR029 yvs64q0khYt8PevEbavzOVnkaRIzpnmcmnii3se87q/qSQL06RsOX9Hj17aFRnLSM1bu9ZX6N I7IAf0ZfvYZUehhbQZ+nm52LllPgazoSONu9iOQm72RNVXbLaZPIDGj0JfYUXb73P0OpeRe1n rhErMkNzzrLDbRa4MgaRRxuoUi43+cPeNIU/oww9mKaMW5eGcqr062+P/OyB36cTUm0fiu+BS AkSM52VWzk4gY8hgx+uyNj6oz05tbCya8P4T3wQ== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean The sandbox is built with the SDL2 library with invokes the X11 library which in turn calls getc(). But getc() in glibc is defined as int getc(FILE *) This does not match our definition. int getc(void) The sandbox crashes when called with parameter -l. Rename our library symbol to be called _u_boot_getc(). To keep the coding changes minimal use a define. Signed-off-by: Heinrich Schuchardt --- include/_exports.h | 2 +- include/exports.h | 2 +- include/stdio.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) -- 2.28.0 diff --git a/include/_exports.h b/include/_exports.h index 1e9ba86108..1da78dea1a 100644 --- a/include/_exports.h +++ b/include/_exports.h @@ -8,7 +8,7 @@ #define EXPORT_FUNC(a, b, c, ...) #endif EXPORT_FUNC(get_version, unsigned long, get_version, void) - EXPORT_FUNC(getc, int, getc, void) + EXPORT_FUNC(getc, int, _u_boot_getc, void) EXPORT_FUNC(tstc, int, tstc, void) EXPORT_FUNC(putc, void, putc, const char) EXPORT_FUNC(puts, void, puts, const char *) diff --git a/include/exports.h b/include/exports.h index b300554091..f982b1b49b 100644 --- a/include/exports.h +++ b/include/exports.h @@ -20,7 +20,7 @@ void jumptable_init(void); /* These are declarations of exported functions available in C code */ unsigned long get_version(void); -int getc(void); +int _u_boot_getc(void); int tstc(void); void putc(const char); void puts(const char*); diff --git a/include/stdio.h b/include/stdio.h index aedf374452..a204e06c69 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -4,6 +4,8 @@ #include #include +#define getc _u_boot_getc + /* stdin */ int getc(void); int tstc(void);