From patchwork Thu Oct 22 19:03:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 40823 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 67D353986813; Thu, 22 Oct 2020 19:03:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 67D353986813 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1603393400; bh=OLqcTIdibi+DBi+TPJhw7IeNMEclEl1L3ksuVAsRZAQ=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=sIZtHiOS6t1SewiN3A9grJE1HVDkbU6OVMSmX2gZK3b/Anv6xhUHSCusGFjSTrkxL gA+sG5pGhapo4FAn03gHChHN42UHA3FRnnPU46WncZ6q/nDtgqcu1axLdcd8mC/i3R B7hE/yBxD8V8L8tYWqMXrgFQ6Zf3U3TKsK49x7t8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) by sourceware.org (Postfix) with ESMTPS id 84D73386103B for ; Thu, 22 Oct 2020 19:03:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 84D73386103B Received: by mail-qt1-x841.google.com with SMTP id r8so2049593qtp.13 for ; Thu, 22 Oct 2020 12:03:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OLqcTIdibi+DBi+TPJhw7IeNMEclEl1L3ksuVAsRZAQ=; b=Ta98RIFQ87y5FQlXYZGWPPcvxgAIh6XuaN+gkcseJeKzh7qEEhAXwq8w+Ec9c02zID dMzZzs0Nwf3RaGput7UUcfkWdxUiriAdHhbrZpmYK9W0RL98AU/FDkqoF8kXnb/zj3es aBNbPvMS6jQxhITkYLc13OF7KVpdZFk970PgesjC5FLVvWJXutxA5usQ5R9yqylVUQZD 4zygaJ0CQi7bkD6W57hatyuozMXfXYU5pTQRqoYH/10zvj9LLZfXZdKq07dXZP7NC0xX x4IAqLjTz0j6Bu/CbehSmS2MakWz/ZY7xa1kOsVd1pugxSb5dAlie9DAuav51B5lgBdn sjQw== X-Gm-Message-State: AOAM532MtTIbWHS52YnHujeDMP+XGoT4bIMTghFMXq142mBt21OTqM1Z kNKjOVjaOYd5NRwjZQGR9T+olg//Prn/6Q== X-Google-Smtp-Source: ABdhPJyoQ5/X2tim4uCpi5T42vfiG1dDpQVUB3PYF7qa5FNwb3dE9Yp5pA+BoSq+EV8P43XWUDyavg== X-Received: by 2002:ac8:7559:: with SMTP id b25mr3613477qtr.38.1603393397419; Thu, 22 Oct 2020 12:03:17 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id h7sm1628272qtd.82.2020.10.22.12.03.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2020 12:03:17 -0700 (PDT) To: libc-alpha@sourceware.org, Florian Weimer Subject: [PATCH 2/2] Revert "linux: Move xmknod{at} to compat symbols" Date: Thu, 22 Oct 2020 16:03:02 -0300 Message-Id: <20201022190302.2000118-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201022190302.2000118-1-adhemerval.zanella@linaro.org> References: <20201022190302.2000118-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-14.0 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 autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This reverts commit 81b83ff61f95f30ad53d6075247af0ea61a0b16e responsible to make both __xmknod{at} compatible symbols. The idea is to not force static libraries built against old glibc to update against new glibcs (since they reference the the xmknod{at} symbols). --- sysdeps/mach/hurd/xmknod.c | 11 ----------- sysdeps/mach/hurd/xmknodat.c | 11 ----------- sysdeps/unix/sysv/linux/xmknod.c | 3 --- sysdeps/unix/sysv/linux/xmknodat.c | 2 -- 4 files changed, 27 deletions(-) diff --git a/sysdeps/mach/hurd/xmknod.c b/sysdeps/mach/hurd/xmknod.c index a1b5af086d..fa69bc3bec 100644 --- a/sysdeps/mach/hurd/xmknod.c +++ b/sysdeps/mach/hurd/xmknod.c @@ -17,7 +17,6 @@ #include #include -#include /* Create a device file named FILE_NAME, with permission and special bits MODE and device number DEV (which can be constructed from major and minor @@ -28,13 +27,3 @@ __xmknod (int vers, const char *file_name, mode_t mode, dev_t *dev) return __xmknodat (vers, AT_FDCWD, file_name, mode, dev); } libc_hidden_def (__xmknod) - -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) -int -__xmknod_compat (int vers, const char *file_name, mode_t mode, dev_t *dev) -{ - return __xmknod (vers, file_name, mode, dev); -} - -compat_symbol (libc, __xmknod_compat, __xmknod, GLIBC_2_0); -#endif diff --git a/sysdeps/mach/hurd/xmknodat.c b/sysdeps/mach/hurd/xmknodat.c index 90724694d5..e46c63036e 100644 --- a/sysdeps/mach/hurd/xmknodat.c +++ b/sysdeps/mach/hurd/xmknodat.c @@ -26,7 +26,6 @@ #include #include #include -#include /* Create a device file named PATH relative to FD, with permission and special bits MODE and device number DEV (which can be constructed @@ -118,13 +117,3 @@ __xmknodat (int vers, int fd, const char *path, mode_t mode, dev_t *dev) return 0; } libc_hidden_def (__xmknodat) - -#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) -int -__xmknodat_compat (int vers, int fd, const char *path, mode_t mode, dev_t *dev) -{ - return __xmknodat (vers, fd, path, mode, dev); -} - -compat_symbol (libc, __xmknodat_compat, __xmknodat, GLIBC_2_4); -#endif diff --git a/sysdeps/unix/sysv/linux/xmknod.c b/sysdeps/unix/sysv/linux/xmknod.c index 82bb0bd953..f7eb104423 100644 --- a/sysdeps/unix/sysv/linux/xmknod.c +++ b/sysdeps/unix/sysv/linux/xmknod.c @@ -26,7 +26,6 @@ and device number DEV (which can be constructed from major and minor device numbers with the `makedev' macro above). */ int -attribute_compat_text_section __xmknod (int vers, const char *path, mode_t mode, dev_t *dev) { if (vers != _MKNOD_VER) @@ -34,6 +33,4 @@ __xmknod (int vers, const char *path, mode_t mode, dev_t *dev) return __mknodat (AT_FDCWD, path, mode, *dev); } - -compat_symbol (libc, __xmknod, __xmknod, GLIBC_2_0); #endif diff --git a/sysdeps/unix/sysv/linux/xmknodat.c b/sysdeps/unix/sysv/linux/xmknodat.c index fae3fe54d1..b1a43229c8 100644 --- a/sysdeps/unix/sysv/linux/xmknodat.c +++ b/sysdeps/unix/sysv/linux/xmknodat.c @@ -31,6 +31,4 @@ __xmknodat (int vers, int fd, const char *file, mode_t mode, dev_t *dev) return __mknodat (fd, file, mode, *dev); } - -compat_symbol (libc, __xmknodat, __xmknodat, GLIBC_2_4); #endif