From patchwork Wed Sep 13 12:26:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 22868 Received: (qmail 39381 invoked by alias); 13 Sep 2017 12:26:29 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 38944 invoked by uid 89); 13 Sep 2017 12:26:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qk0-f170.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=8gSlmow4XdELLaLsHestIxJHRcPLo5zQDDBU9Nna4KI=; b=i3FINiHzWMmV3a83Y0RkIM9KJZovTg+/+W+RCQ6rABR6kbHQMAYDB08c1rA4bxgUzz IQQMk13HTlmPELTU9yNWGno5stGDw6E0aRtptF9bO7JExuPhloCCHiJN9xxLlM6w0Xmy UajglM9jBwObqd3XiD+Jo8L7JxHX4Pqz4HgR61vwFXd2lzj5bSd5qkFUCv7gwzCJ8uAW rwjptsmjJ/AB+mMTjjrfoGGFYpZUY6bXUoTmGCgBE0SM4hDRL6giccNmut2vrJVTgTUZ uQk99MN+hMOd/7x95NPNA9OF40BagAclQu9m7cS6Lf+c7EpsYoIpNOzR1If18F0EScje 1ZVw== X-Gm-Message-State: AHPjjUhPVx1Faw5uQSahqHiJyAfYupdZA8eUdVpqFWYf2KCy0r5F047Y /KL9jdju9NTjbfZ8 X-Google-Smtp-Source: AOwi7QDWPzle1Dj9BUYEHbHVNYvekjlh/smkXQN40YQL+2L0kCED/v18rCKDd9MXKeleOirqlE+1XA== X-Received: by 10.55.79.68 with SMTP id d65mr25712714qkb.110.1505305586124; Wed, 13 Sep 2017 05:26:26 -0700 (PDT) Subject: Re: [PATCH 7/9] posix: Consolidate glob implementation To: Andreas Schwab Cc: libc-alpha@sourceware.org, Paul Eggert References: <1504643122-14874-1-git-send-email-adhemerval.zanella@linaro.org> <1504643122-14874-8-git-send-email-adhemerval.zanella@linaro.org> <29c0bb72-189f-f8db-328e-05b9cdd84261@linaro.org> From: Adhemerval Zanella Message-ID: <4e53c914-8264-7501-3577-0757c7e15c3c@linaro.org> Date: Wed, 13 Sep 2017 09:26:20 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: On 12/09/2017 11:34, Andreas Schwab wrote: > On Sep 12 2017, Adhemerval Zanella wrote: > >> I will fix it and maybe it is confusing the linker and making you seem >> the missing glob64 (since oldglob.os and glob64.os both provide the >> same symbol). > > glob64@GLIBC_2.1 is the only version and it isn't the default, thus > becomes hidden. > > Andreas. > I pushed the patch below. It removes the alpha rule to add the oldglob and refrain s390 to build the compat code. diff --git a/sysdeps/unix/sysv/linux/alpha/Makefile b/sysdeps/unix/sysv/linux/alpha/Makefile index 47bd189..50f4fb1 100644 --- a/sysdeps/unix/sysv/linux/alpha/Makefile +++ b/sysdeps/unix/sysv/linux/alpha/Makefile @@ -1,7 +1,3 @@ -ifeq ($(subdir),posix) -sysdep_routines += oldglob -endif - ifeq ($(subdir),stdlib) gen-as-const-headers += ucontext-offsets.sym endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/oldglob.c b/sysdeps/unix/sysv/linux/s390/s390-32/oldglob.c new file mode 100644 index 0000000..56d7d12 --- /dev/null +++ b/sysdeps/unix/sysv/linux/s390/s390-32/oldglob.c @@ -0,0 +1,2 @@ +#define GLOB_NO_OLD_VERSION +#include