From nobody Fri Dec 19 07:47:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1628373778; cv=none; d=zohomail.com; s=zohoarc; b=G35X9tNS9fc4H350d57XKMlJUBOnTnn+ycTY9tKNtrS7e2CZbTl7Q8B+4s2CgB5gPEt3jMuXkoWSrKKaIBweuPJrawOwwMIOALizFygKNTkBi21MFm/G9UNXlcQdeUJn6Te+0HRC8Wa7ZTLm1vfo15IlyIicrPWUSGsZU5aXZww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628373778; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gnr+5rbOJGaDAhEuFudq50cgY0fAjmRcHPUHHvIxNIY=; b=dcMat7j+da+wLQz4wgYiTghcSjoPFp0gAsjadBly78FEbidouptV3/369092jqhTLX4cAV/RctulHBo3opPDkQzEA+KpsQD96iA68cb6ezGW2NOOWCKwbTj3kvdM3oM2XBsVa31kvUYUDPvusw3iuA7eag2jCzL6GU/ONE/J/yY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1628373778882203.7688232809537; Sat, 7 Aug 2021 15:02:58 -0700 (PDT) Received: from localhost ([::1]:34758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCUPB-00065z-Qb for importer@patchew.org; Sat, 07 Aug 2021 18:02:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCU6H-0007wj-Gf for qemu-devel@nongnu.org; Sat, 07 Aug 2021 17:43:25 -0400 Received: from mail-io1-xd2d.google.com ([2607:f8b0:4864:20::d2d]:36826) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCU6G-00057V-0I for qemu-devel@nongnu.org; Sat, 07 Aug 2021 17:43:25 -0400 Received: by mail-io1-xd2d.google.com with SMTP id f11so19876891ioj.3 for ; Sat, 07 Aug 2021 14:43:23 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a17sm8062827ios.36.2021.08.07.14.43.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Aug 2021 14:43:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gnr+5rbOJGaDAhEuFudq50cgY0fAjmRcHPUHHvIxNIY=; b=DEnOTeEEKz5jQc+0CQm62acebqc0uV8/bh9h8CKmIXWUZh4QzCVpI7KDhXruKBLYmr cKIP+QUTeNv9pbPmsv073DZZBrR5oB2n3J3Vvg1P/xPzdW1vM9m+UkR2X3ieMK/vIEX1 D7zNQ2VQB87hELcLYO0zJQnb51KrOcB43FvPMd3y4sgqYYDU1r4vyEz6KoHoy5t1zqTg BkQ7CwcWIdqey0cd4yB3InMv3UPtCq9NwAYbTIFDJ/UFyH1MGFuTQhsMvoHY38uJpwsy i50syFD+9qmHvYT6mwsKuromzInTW8qXAn1NimFS8pPgbuUpKpF7wXQWK2Axovqs6GYJ E6vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gnr+5rbOJGaDAhEuFudq50cgY0fAjmRcHPUHHvIxNIY=; b=CIxAzvzXclciN7C+jaJIKNZt2+vKqArMBXdL6v409SWqpPOPd+sBpwV0vcLhunJpW0 vwX0c6wz+NlbnroKfyxYjS+e79leROReq+r0U8F3j293ekLbkMsx8IQpQ8tPs596kIV5 XuYAgl1F1BjEe3ok5xOk71V4JTNSgF3HG3lkyOfVwDBqvx6beA1GrS2A5LCz5xdh1Bpa zASd0dH21KBsfWCG2KHWpVhsAX8eNpXH3qxsOxFSTEAZsSCLFXFhJuxX1Mqvu6RwPf+w V+//Ib0ejJfL5LP+M1BrwtF/egUNgH/5NXirQ7h5a3X0ytdTvtAFRqp8lGLT/AypGHDx af9w== X-Gm-Message-State: AOAM530znEdx94HoMJfkHZDwbvd0ynY9lcGDnrniEk0CrIauhfnt1mV/ 1cLfixLBDo4nEfomjV38ckGraUHkLCfE+KjF X-Google-Smtp-Source: ABdhPJzYW95/2fNxH2moJj4qnNJBAYFMBre1IPUW486FANAJQMmV5Qno2Tn/XpFUXFMipBEb2hrJBw== X-Received: by 2002:a6b:7f48:: with SMTP id m8mr412751ioq.5.1628372602781; Sat, 07 Aug 2021 14:43:22 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PATCH for 6.2 31/49] bsd-user: Remove dead #ifdefs from elfload.c Date: Sat, 7 Aug 2021 15:42:24 -0600 Message-Id: <20210807214242.82385-32-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210807214242.82385-1-imp@bsdimp.com> References: <20210807214242.82385-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::d2d; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2d.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kevans@freebsd.org, Warner Losh , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @bsdimp-com.20150623.gappssmtp.com) X-ZM-MESSAGEID: 1628373779890100001 Content-Type: text/plain; charset="utf-8" From: Warner Losh LOW_ELF_STACK doesn't exist on FreeBSD and likely never will. Remove it. Likewise, remove an #if 0 block that's not useful Signed-off-by: Warner Losh Reviewed-by: Richard Henderson --- bsd-user/elfload.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index a09f8fb315..c0787a4e52 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -558,9 +558,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct tar= get_pt_regs *regs, abi_ulong elf_entry, interp_load_addr =3D 0; abi_ulong start_code, end_code, start_data, end_data; abi_ulong reloc_func_desc =3D 0; -#ifdef LOW_ELF_STACK - abi_ulong elf_stack =3D ~((abi_ulong)0UL); -#endif =20 load_addr =3D 0; load_bias =3D 0; @@ -761,11 +758,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct ta= rget_pt_regs *regs, exit(-1); } =20 -#ifdef LOW_ELF_STACK - if (TARGET_ELF_PAGESTART(elf_ppnt->p_vaddr) < elf_stack) - elf_stack =3D TARGET_ELF_PAGESTART(elf_ppnt->p_vaddr); -#endif - if (!load_addr_set) { load_addr_set =3D 1; load_addr =3D elf_ppnt->p_vaddr - elf_ppnt->p_offset; @@ -823,9 +815,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct tar= get_pt_regs *regs, =20 close(bprm->fd); =20 -#ifdef LOW_ELF_STACK - info->start_stack =3D bprm->p =3D elf_stack - 4; -#endif bprm->p =3D target_create_elf_tables(bprm->p, bprm->argc, bprm->envc, = bprm->stringp, &elf_ex, load_addr, load_bias, inte= rp_load_addr, info); info->load_addr =3D reloc_func_desc; @@ -842,15 +831,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct ta= rget_pt_regs *regs, =20 padzero(elf_bss, elf_brk); =20 -#if 0 - printf("(start_brk) %x\n" , info->start_brk); - printf("(end_code) %x\n" , info->end_code); - printf("(start_code) %x\n" , info->start_code); - printf("(end_data) %x\n" , info->end_data); - printf("(start_stack) %x\n" , info->start_stack); - printf("(brk) %x\n" , info->brk); -#endif - info->entry =3D elf_entry; =20 return 0; --=20 2.32.0