From patchwork Fri Sep 24 16:41:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 45423 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E5A1F385802E for ; Fri, 24 Sep 2021 16:42:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E5A1F385802E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1632501723; bh=+atbCd93ksy4fMpn6q4Zl2vMzbc29FgKcv9ySS39gCg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=giIXPS0D3G5gMIDfZTPMy4BAPva7dmgjIa17GPxCAVUDMYMRdOQSDWjlt8gNyOCFm XvegPV5brz6kGl8j4zqrsvj5GE/eqDcL0qNLXolgxe1uvOW371v0CtqieBlR7oUNBN fT0e0cNn+d+4Nw9DSLn2JRLiDjBIKJmbaqzOgIIA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by sourceware.org (Postfix) with ESMTPS id 871403858C60 for ; Fri, 24 Sep 2021 16:41:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 871403858C60 Received: by mail-pg1-x52f.google.com with SMTP id 81so6843934pgb.0 for ; Fri, 24 Sep 2021 09:41:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=+atbCd93ksy4fMpn6q4Zl2vMzbc29FgKcv9ySS39gCg=; b=d82NG00cHNmzlS/Fu6meAVbAs3jbqYmztTwz5EQ7GnOWG571kN3r7mgGzR1o/4AHNq aDSFCvDhL8+FZX2UblgGD2fqB5Zlc5MfXY62UkGOGPHbPJYxqEwFvpMUhaZmOZ4oejyw fLkAR06j0T7tVA7XBd1X213oA8dK1raeoT/lOiJ0DqdoQWl0F4uIYGxERBS+YzZvepM3 FMrYiRYu8/bHr4LqCRtY5AYrAFvHUJz3bF05RJE5fsv00eWJ7/ADIMzdBMt3oNXtdbke VQv2V3Kfu/iDvXZHmI3dc67Zb4+jFbhMCz03xcKYHpKqMFz62Tr/ESEq4KFK5oN+NWJI HxGQ== X-Gm-Message-State: AOAM532e8CLfaLg5dAUHiWlkyfNobtOXhIzIAw+4yWotOa0gMKHE0LZ0 ce8Bf7a1BgAhm+JwaZtII5bxYnFfXhc= X-Google-Smtp-Source: ABdhPJxjbdzjGEExffW0n2GS+u3QdOvEE6/tSqC4FrGYYr85ZU0TOmEBdIop588BHQZ4vfWwDquTbA== X-Received: by 2002:a62:60c2:0:b0:446:b494:39cc with SMTP id u185-20020a6260c2000000b00446b49439ccmr10537319pfb.22.1632501701490; Fri, 24 Sep 2021 09:41:41 -0700 (PDT) Received: from gnu-gram-1.localdomain (cpe-76-173-15-247.hawaii.res.rr.com. [76.173.15.247]) by smtp.gmail.com with ESMTPSA id n9sm11393356pjk.3.2021.09.24.09.41.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 09:41:41 -0700 (PDT) Received: from gnu-gram-1.localdomain (localhost [IPv6:::1]) by gnu-gram-1.localdomain (Postfix) with ESMTP id E85FEE0072 for ; Fri, 24 Sep 2021 09:41:38 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH] Disable symbol hack in libc_nonshared.a Date: Fri, 24 Sep 2021 09:41:31 -0700 Message-Id: <20210924164131.2326532-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3032.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Don't reference __GI_memmove, __GI_memset, __GI_memcpy, __divdi3_internal, __udivdi3_internal and __moddi3_internal in libc_nonshared.a. --- sysdeps/generic/symbol-hacks.h | 3 ++- sysdeps/wordsize-32/divdi3-symbol-hacks.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sysdeps/generic/symbol-hacks.h b/sysdeps/generic/symbol-hacks.h index 3586e6ed38..1115e4c0a7 100644 --- a/sysdeps/generic/symbol-hacks.h +++ b/sysdeps/generic/symbol-hacks.h @@ -1,6 +1,7 @@ /* Some compiler optimizations may transform loops into memset/memmove calls and without proper declaration it may generate PLT calls. */ -#if !defined __ASSEMBLER__ && IS_IN (libc) && defined SHARED +#if !defined __ASSEMBLER__ && IS_IN (libc) && defined SHARED \ + && !defined LIBC_NONSHARED asm ("memmove = __GI_memmove"); asm ("memset = __GI_memset"); asm ("memcpy = __GI_memcpy"); diff --git a/sysdeps/wordsize-32/divdi3-symbol-hacks.h b/sysdeps/wordsize-32/divdi3-symbol-hacks.h index 3e7c54bd0c..efbb0cce8b 100644 --- a/sysdeps/wordsize-32/divdi3-symbol-hacks.h +++ b/sysdeps/wordsize-32/divdi3-symbol-hacks.h @@ -23,7 +23,8 @@ assembler. Note: in_divdi3_c is only used to avoid symbol alias on divdi3 build itself. */ -#if !defined __ASSEMBLER__ && !defined in_divdi3_c && IS_IN (libc) && defined SHARED +#if !defined __ASSEMBLER__ && !defined in_divdi3_c && IS_IN (libc) \ + && defined SHARED && !defined LIBC_NONSHARED asm ("__divdi3 = __divdi3_internal"); asm ("__udivdi3 = __udivdi3_internal"); asm ("__moddi3 = __moddi3_internal");