From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 056613856248 for ; Fri, 28 Apr 2023 06:15:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 056613856248 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-63b60365f53so11342682b3a.0 for ; Thu, 27 Apr 2023 23:15:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682662523; x=1685254523; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=oBfm4P7iG52ydPjfvth/kHHVHJDja3fAIcD0KUxQGN4=; b=DHk5m442CoL3Pc37D88Bgv76zuy5vK6zn1f8UomEL+x11/4p9NJRfg4GuWMZyYbsgm /jrJqSnFlK8e98kCSJOVyLrk2T0ClAu9qfTAgvd11g8P95qHyjEyCWuJEdxX9oHNlWUR JVVtbwOSUPDjfPf6eTRAB6eyN+m8Xhz2lU2A/PhdIYTih5rN4EkXjgxN2jYvoU1Gh/U9 aOQ2FQW/5VSDxn0PudgQCzePuRqMUUzVzLY1AAMGlkkF0iCnLkYlS50ai968kPX03+Fx i8OlxqefO2kjmIGY9m9eU6vx4zKCUsFtw6Z4hU1Nle/jHA/g5PCwcbAViXlXsdvSnPev epGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682662523; x=1685254523; 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=oBfm4P7iG52ydPjfvth/kHHVHJDja3fAIcD0KUxQGN4=; b=HDF9xo0BPAt0dENBwZQXmae783GQAvbjxkB8OXh2wor/CPkjNXrXnwho4ZV01rB8lv 2dwjwAfCHyPvOCrQRks4ZJEavXwvTnuWKKKGWkSQWoqo1GZ9jey1COk8bw1rSQ9xrvGV UI+3u9joTBQRy+1ecj3rJLCBM8U1kWwAb/8GXrdQqwqPCYdw4Q/A/bH3rqYb5loopHRb tArQwka1Hm3u2Mmvnk0ObeWUA4uJUhov0XKAhAp/dVTw7C1nTl+QS09NhfTD+B63Te8Z j6zotn2IfSrCYYDylckOlc1qoX+nnhJxdrwT1dBadTF2A9eSqywBBYFKRB28AkipAA+V vy2g== X-Gm-Message-State: AC+VfDymBS7lpK2SQkDt/2x/XYd45j5AyVrhS3lYnFdvgay2dZgFFvx9 YvxI6wz/tAhMOEe1g7fOORUnWWYWXkM= X-Google-Smtp-Source: ACHHUZ4Q+whPNsduFlsP+2mOzU5EMyoPH2FKYKDHl0ETNg0hHNumwzJSJWP52T23vOKrSWb6mwOi1A== X-Received: by 2002:a05:6a20:3d2a:b0:eb:6e43:8e1b with SMTP id y42-20020a056a203d2a00b000eb6e438e1bmr5328046pzi.30.1682662523519; Thu, 27 Apr 2023 23:15:23 -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 fz4-20020a17090b024400b0024769c573besm753198pjb.15.2023.04.27.23.15.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 23:15:22 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 5A2BD1142D60; Fri, 28 Apr 2023 15:45:20 +0930 (ACST) Date: Fri, 28 Apr 2023 15:45:20 +0930 From: Alan Modra To: binutils@sourceware.org Subject: Remove deprecated bfd_read Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3034.9 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,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 List-Id: 20+ years is long enough to warn. * bfd-in.h (bfd_read, bfd_write): Don't define (_bfd_warn_deprecated): Don't declare. * bfd-in2.h: Regenerate. * libbfd.c (_bfd_warn_deprecated): Delete. --- bfd/bfd-in.h | 18 ------------------ bfd/bfd-in2.h | 18 ------------------ bfd/libbfd.c | 28 ---------------------------- 3 files changed, 64 deletions(-) diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index eb6ee9cf816..de7285626cd 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -362,24 +362,6 @@ extern file_ptr bfd_tell (bfd *); extern int bfd_flush (bfd *); extern int bfd_stat (bfd *, struct stat *); -/* Deprecated old routines. */ -#if __GNUC__ -#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \ - (_bfd_warn_deprecated ("bfd_read", __FILE__, __LINE__, __func__), \ - bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD))) -#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \ - (_bfd_warn_deprecated ("bfd_write", __FILE__, __LINE__, __func__), \ - bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD))) -#else -#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \ - (_bfd_warn_deprecated ("bfd_read", (const char *) 0, 0, (const char *) 0), \ - bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD))) -#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \ - (_bfd_warn_deprecated ("bfd_write", (const char *) 0, 0, (const char *) 0),\ - bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD))) -#endif -extern void _bfd_warn_deprecated (const char *, const char *, int, const char *); - extern bool bfd_cache_close (bfd *abfd); /* NB: This declaration should match the autogenerated one in libbfd.h. */ diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index fcfd22662f3..1eae010d9ca 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -369,24 +369,6 @@ extern file_ptr bfd_tell (bfd *); extern int bfd_flush (bfd *); extern int bfd_stat (bfd *, struct stat *); -/* Deprecated old routines. */ -#if __GNUC__ -#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \ - (_bfd_warn_deprecated ("bfd_read", __FILE__, __LINE__, __func__), \ - bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD))) -#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \ - (_bfd_warn_deprecated ("bfd_write", __FILE__, __LINE__, __func__), \ - bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD))) -#else -#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \ - (_bfd_warn_deprecated ("bfd_read", (const char *) 0, 0, (const char *) 0), \ - bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD))) -#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \ - (_bfd_warn_deprecated ("bfd_write", (const char *) 0, 0, (const char *) 0),\ - bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD))) -#endif -extern void _bfd_warn_deprecated (const char *, const char *, int, const char *); - extern bool bfd_cache_close (bfd *abfd); /* NB: This declaration should match the autogenerated one in libbfd.h. */ diff --git a/bfd/libbfd.c b/bfd/libbfd.c index 7b03bde05e0..d4f1478ec07 100644 --- a/bfd/libbfd.c +++ b/bfd/libbfd.c @@ -1074,34 +1074,6 @@ bfd_generic_is_local_label_name (bfd *abfd, const char *name) return name[0] == locals_prefix; } -/* Give a warning at runtime if someone compiles code which calls - old routines. */ - -void -_bfd_warn_deprecated (const char *what, - const char *file, - int line, - const char *func) -{ - /* Poor man's tracking of functions we've already warned about. */ - static size_t mask = 0; - - if (~(size_t) func & ~mask) - { - fflush (stdout); - /* Note: separate sentences in order to allow - for translation into other languages. */ - if (func) - /* xgettext:c-format */ - fprintf (stderr, _("Deprecated %s called at %s line %d in %s\n"), - what, file, line, func); - else - fprintf (stderr, _("Deprecated %s called\n"), what); - fflush (stderr); - mask |= ~(size_t) func; - } -} - /* Helper function for reading uleb128 encoded data. */ bfd_vma -- Alan Modra Australia Development Lab, IBM