From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by sourceware.org (Postfix) with ESMTPS id 06958385840B for ; Tue, 9 Apr 2024 01:54:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 06958385840B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 06958385840B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::531 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712627701; cv=none; b=bIPu6X2SL6Ii3mxOQGtGs5Fyltg18SjyPBNIm2tigcEk1JUc527j8i9s44gRzwoKnGjjzOMPmQFqMOa9nsSOyr68YgNwGVsJFGZEqpytJf0MSCToUydIp+LweESNZNjdYGn1pKDoNvoiQq4e+Qm3cqM8g5Ng+N7t7ZKZ91/2UQc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712627701; c=relaxed/simple; bh=ePL010kfCLWox8m09FCIuoeBp3rpFOcQN55Ef5RJEWQ=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=n4QXWYGOrWGKUyFPqb8Nl1cTriRztzqP0KBj8XcwXVKYBJaWbO94xF8yfWVZmt+GjKOmSX1aIiv8LzOefV27avsmC6m0xTmu5amR3BKazndXWp+Q4XA9ij50mpzNe+wJLNnAszLcnXv+P22dx1FD/b24rFRqfNl6lXiPauIkrPc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-5ce07cf1e5dso3533785a12.2 for ; Mon, 08 Apr 2024 18:54:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712627698; x=1713232498; darn=sourceware.org; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=KtI3l/rdU4clfE/RELPsO+zMrFWMzvaLpwTmf0fmvdc=; b=gQrcjs9lm0OcJvraF1D2hqN8KpRonKmfXK6Su2IwdZyeqKkyGuGZ1Yj8TnrsQBmAA+ xzOd7GYDvYsN4tluUZv8DUtdZSsr3K3yNaHo1fUdlZmzzsbBk/TnqAgClOlsJjPi2PUp sNoBupO+58io0GpfcLXI9pT/ORN3f5deSXRHCXpP4s/1Q660LXaa+/US+0ouIFiz8z6F PQEmEbcDZHmcwqT2vSbRZurzqFopXlpgst2Q1VLf6QksUeDVLd1lIRKePtUQfB7P6M6R 8w7qcBk54RFOo8mMCuU88b2MCZy0VWaav/WPgE4RW4BVNEN+48IWc8kyAOLHgWRqILNx mmXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712627698; x=1713232498; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KtI3l/rdU4clfE/RELPsO+zMrFWMzvaLpwTmf0fmvdc=; b=mnIOFy1aL7goj5fXMzfkZ3qUWPSKxioM3J9IpqMlaMrllDTr4OCCxjIPHZlAT8h9Vu WJCGS7RR3zJA/q0BKn9bNTUxNuJbCpMVzyTcds9C4xGStuynChswOhEKvFZ1KuI8FrvU +409WIOQLEC/aBqhUVMcy8VdGsS5qKTkSFEjCijsdiSZgft930valNxVislgaMyv7icI 0Uaf+gktcojrVhFW5goGnYADd2sVf0UTYrs5HdSHlI7rD5KPKM/BDKXmBD5z5bK+5Q+I wIGDLioj4YFEwskW3GFN7TuMr00e2tM3T2JP34BAPfdMtK2wJQ2rf5mzy056QR3iKfhN /EjA== X-Gm-Message-State: AOJu0Yzg5KN4SuVn+Wpwm3XmULzde1+udewYUNxfPNfqFkHusQud7/ni KWJAkdVPCkQfpe1r734eYFrqTXAcRzI/VigSWTZ6eXuX3EZG0o9c7ZSoHzlG X-Google-Smtp-Source: AGHT+IGV7oStwK+C2HJwWJErg2DpRJMkVvZQrqaLrjoVCs9fhwG7KQdyqMs/euBjq+sFPjZt4J/cnQ== X-Received: by 2002:a05:6a21:151a:b0:1a7:94ea:a9b4 with SMTP id nq26-20020a056a21151a00b001a794eaa9b4mr3377372pzb.32.1712627697553; Mon, 08 Apr 2024 18:54:57 -0700 (PDT) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id j7-20020a170902da8700b001e2a7e90321sm7709880plx.224.2024.04.08.18.54.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 18:54:57 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 224811141423; Tue, 9 Apr 2024 11:24:54 +0930 (ACST) Date: Tue, 9 Apr 2024 11:24:54 +0930 From: Alan Modra To: binutils@sourceware.org Subject: Remove dead code in bfdwin.c Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3033.6 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: All of bfdwin.c is wrapped in USE_MMAP. There isn't any point in HAVE_MMAP tests inside USE_MMAP. * bfdwin.c (bfd_free_window, bfd_get_file_window): Delete HAVE_MMAP conditionals. diff --git a/bfd/bfdwin.c b/bfd/bfdwin.c index 73e44635bcb..0ef7b1418b9 100644 --- a/bfd/bfdwin.c +++ b/bfd/bfdwin.c @@ -118,20 +118,14 @@ bfd_free_window (bfd_window *windowp) if (i->mapped) { -#ifdef HAVE_MMAP munmap (i->data, i->size); goto no_free; -#else - abort (); -#endif } #ifdef HAVE_MPROTECT mprotect (i->data, i->size, PROT_READ | PROT_WRITE); #endif free (i->data); -#ifdef HAVE_MMAP no_free: -#endif i->data = 0; /* There should be no more references to i at this point. */ free (i); @@ -174,7 +168,6 @@ bfd_get_file_window (bfd *abfd, return false; i->data = NULL; } -#ifdef HAVE_MMAP if (ok_to_map && (i->data == NULL || i->mapped == 1) && (abfd->flags & BFD_IN_MEMORY) == 0) @@ -249,9 +242,6 @@ bfd_get_file_window (bfd *abfd, else fprintf (stderr, _("not mapping: env var not set\n")); } -#else - ok_to_map = 0; -#endif #ifdef HAVE_MPROTECT if (!writable) -- Alan Modra Australia Development Lab, IBM