From patchwork Tue Jan 16 16:54:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 84193 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 A01273858C62 for ; Tue, 16 Jan 2024 16:55:27 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 3F0823858D37 for ; Tue, 16 Jan 2024 16:55:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3F0823858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3F0823858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705424107; cv=none; b=mqETPEGkE0meN7ywX+p/XM/T908/vmDyI5MaEVfwB5I5RUzqt1VO8fbbR8T59vg1cbYX8c+KcxzEXXozkjo8mK9L9El/gf4vCzLYpBD093QFGdwUSKkYAirRSUpDABKX07EbRUWI0x08uO4dJ+CmT1K7vyQaw/vajyaCpz2g9w0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705424107; c=relaxed/simple; bh=vu3UaU3vKfYofWqNxtedvZAzhpz97zDKYAegY3JgrP8=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=h9+paIe0rTsQAEe1VJckwU5K8BbKIfV6Ls5hR7nunw9WlqJdF+2wMeRFvF9nl1N9aQYNzPhYsjsXpJDl7iLoXb3OpNo36ph5lv4XtaUmOLNKX4KVo19NSXGN/BQIiTATikRBxyBu7EjtykXcVBGfWfzQOnhfwrA0h0WaH+u+Avg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6d9f94b9186so8359581b3a.0 for ; Tue, 16 Jan 2024 08:55:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705424103; x=1706028903; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=AhobPDk7MpJdReUI32PjKdXj+3g5KgQVxWWvILMgj+Y=; b=GKlY48B9BL38DlARfmu0ChK9IPIY+qpp2ZcLfi3dbZ3/KtOMqgyL1e+08de32rgmtM fCp5CW1ow6IUfp0cwIOGM9hKN09F09kCHuZjQ8Z/5CbWjn0HL0fB1oDGHUiYkvg3dPEc 6w12Ho+5FZgFp1DsGdlGlFPlAK8FkNS/BuY+h59aBlt7tJbMqgy/X4ExM662Jfvb/a1J KZpEIUfZB0B4Hbjan50azgs9FqDVQtfTSy5Bc2S+4A6+utrs2Ae05QssW/TZoHpjQvjD SWRaLRoIOBBe6f4h8pq5J7x8XzsGSZ7rbG+nvZPEIZCAmOGpkI1XPwqpVESknRsDd9WU 39Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705424103; x=1706028903; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AhobPDk7MpJdReUI32PjKdXj+3g5KgQVxWWvILMgj+Y=; b=VOZEmHhzn4Tc3GKcQw1mVQE9bYd5aZ3dGewqdxlukm+NWo09w+Zs6O2cy5W944rzyZ /vuvM8aIGcPkMwl8z8uqe3iNW7Tqb0vmMrDMFV3zzfU0m46gxLM5SLEAWbdazirfSFaq 8TPq75tsi9SdvEfQ7EiWSD9rGPuunOUHHySZPSV5XokwHib5NuF/rOVr+kreGa64yPAW G6BkTdpuJZBuasIaHWvLNyAOBNtn2uwN2fcWePRpShb9yRjR6VtNy9ZOmGusCnyZBpYH 2LxpywKcErRg5PQd0Svi8z/vnKsfsFd4EXy1iGsa613/YG9lHBxeJw0KaOk/9oBvuGCM Mbkg== X-Gm-Message-State: AOJu0YwkvxOrMPPdbFiG+3MCUiVHO4rYU3lKolIcx0mR2GBkHFhnH4jZ UYTcexZtmgOhExt2MQq7gdT2MuD5QybCTf1HtNov41QkZh4= X-Google-Smtp-Source: AGHT+IGe2+gpaSD8kq4pjVlTwxLKUanbPmQkqafpCaFuL2EI6rYxz4JGb6N40/+mP+BzdXbNb0VVwg== X-Received: by 2002:a62:8142:0:b0:6d9:8d46:814b with SMTP id t63-20020a628142000000b006d98d46814bmr8652138pfd.20.1705424103634; Tue, 16 Jan 2024 08:55:03 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c2:2787:e137:589d:5857:b1cd]) by smtp.gmail.com with ESMTPSA id s129-20020a625e87000000b006db3358a0bdsm9929504pfb.193.2024.01.16.08.55.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 08:55:03 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH] sh: Fix static build with --enable-fortify Date: Tue, 16 Jan 2024 13:54:59 -0300 Message-Id: <20240116165459.2707906-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org For static the internal symbols should not be prepended with the internal __GI_. Checked with a make check for sh4-linux-gnu. --- sysdeps/unix/sysv/linux/sh/____longjmp_chk.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/sh/____longjmp_chk.S b/sysdeps/unix/sysv/linux/sh/____longjmp_chk.S index ede6551bcc..f61db0bc63 100644 --- a/sysdeps/unix/sysv/linux/sh/____longjmp_chk.S +++ b/sysdeps/unix/sysv/linux/sh/____longjmp_chk.S @@ -53,7 +53,7 @@ longjmp_msg: .Lstr: \ .long longjmp_msg@GOTOFF; \ .Lfail: \ - .long __GI___fortify_fail@PLT-(.Lfail0-.); \ + .long HIDDEN_JUMPTARGET(__fortify_fail)@PLT-(.Lfail0-.); \ cfi_restore_state; #else # define CALL_FAIL \ @@ -70,7 +70,7 @@ longjmp_msg: .Lstr: \ .long longjmp_msg; \ .Lfail: \ - .long __fortify_fail; \ + .long HIDDEN_JUMPTARGET(__fortify_fail); \ cfi_restore_state; #endif