From patchwork Thu Jun 30 03:26:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 13499 Received: (qmail 62516 invoked by alias); 30 Jun 2016 03:26:20 -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 62501 invoked by uid 89); 30 Jun 2016 03:26:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=5227, 5207, 4776, 3349 X-HELO: mail-qk0-f171.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=PntPpswS207StxSOMZNYLq5UMtCEUsx4O+6WVdlnWvE=; b=DaQlsva/y1E8lxpNvmxob4dsyDApbDNtC7z+dgaFA5KR/EmedynKUJ39K0KXXUXlGu +EmdYvROnPXRMTC8DFhZTHRBFpqb9WCZzqTqKoxNZUMYM2gxm3H5rYF5S0z9XNxwstP5 /IFR+6AN/QC8s15eYO8QqbBgIgMlBiMOzvy913U+AN6sjx2wBTm+Ug2Nu/OWN06/SdVJ sBtkVbxDVARK0KcCkuHQ2JYuYC016sGcqe46VawBTHIMq/B5jmMi5Ucpo6u1hv6Csu3Z DPsIPzawvcATPvEtArt8jmgisma2TtIWlga0hN6pU1LiywGRkFI4Ci5rvxMfQXxLblVV /e4g== X-Gm-Message-State: ALyK8tJnkvMGbDTsby2vpVxMSMzeRLHSjXoTpqfVn6Wy3n17lNduRIbtIdhKhq6vkKwPfZLZX2xkL6OHKxKjDQ== X-Received: by 10.55.214.135 with SMTP id p7mr15839671qkl.195.1467257176227; Wed, 29 Jun 2016 20:26:16 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20160630012521.GX4685@vapier.lan> References: <20160601211705.GA29115@intel.com> <20160630012521.GX4685@vapier.lan> From: "H.J. Lu" Date: Wed, 29 Jun 2016 20:26:15 -0700 Message-ID: Subject: Re: [PATCH] Compile tst-cleanupx4 test with -fexceptions To: GNU C Library On Wed, Jun 29, 2016 at 6:25 PM, Mike Frysinger wrote: > On 01 Jun 2016 14:17, H.J. Lu wrote: >> tst-cleanupx4 is linked with tst-cleanupx4.o and tst-cleanup4aux.o. >> Since tst-cleanupx4.o is compiled from tst-cleanup4.c with -fexceptions, >> tst-cleanupx4.c should also be compiled with -fexceptions. > > i think this last line you meant "tst-cleanupx4aux.c", or at least > generalize it to say "the aux object". > >> Tested on x86-64 and i686. OK for master? >> >> >> H.J. >> -- >> [BZ 18645] > > need a # before the bug number > >> * nptl/Makefile (extra-test-objs): Add tst-cleanupx4aux.o > > period at the end > > nits aside, patch looks OK > -mike This is what I checked in. Thanks. From 4b66f78856f355b978a67c38b4e994253a06720c Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 1 Jun 2016 14:11:16 -0700 Subject: [PATCH] Compile tst-cleanupx4 test with -fexceptions tst-cleanupx4 is linked with tst-cleanupx4.o and tst-cleanup4aux.o. Since tst-cleanupx4.o is compiled from tst-cleanup4.c with -fexceptions, tst-cleanup4aux.c should also be compiled with -fexceptions. Tested on x86-64 and i686. [BZ #18645] * nptl/Makefile (extra-test-objs): Add tst-cleanupx4aux.o. (test-extras): Add tst-cleanupx4aux. (CFLAGS-tst-cleanupx4aux.c): New. Set to -fexceptions. ($(objpfx)tst-cleanupx4): Replace tst-cleanup4aux.o with tst-cleanupx4aux.o. * nptl/tst-cleanupx4aux.c: New file. --- nptl/Makefile | 8 +++++--- nptl/tst-cleanupx4aux.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 nptl/tst-cleanupx4aux.c diff --git a/nptl/Makefile b/nptl/Makefile index e0bc1b7..6322107 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -334,8 +334,9 @@ modules-names = tst-atfork2mod tst-tls3mod tst-tls4moda tst-tls4modb \ tst-tls5modd tst-tls5mode tst-tls5modf tst-stack4mod \ tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod \ tst-join7mod -extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) tst-cleanup4aux.o -test-extras += $(modules-names) tst-cleanup4aux +extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) \ + tst-cleanup4aux.o tst-cleanupx4aux.o +test-extras += $(modules-names) tst-cleanup4aux tst-cleanupx4aux test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names))) tst-atfork2mod.so-no-z-defs = yes @@ -477,6 +478,7 @@ CFLAGS-tst-cleanupx1.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-tst-cleanupx2.c += -fexceptions CFLAGS-tst-cleanupx3.c += -fexceptions CFLAGS-tst-cleanupx4.c += -fexceptions +CFLAGS-tst-cleanupx4aux.c += -fexceptions CFLAGS-tst-oncex3.c += -fexceptions CFLAGS-tst-oncex4.c += -fexceptions CFLAGS-tst-align.c += $(stack-align-test-flags) @@ -520,7 +522,7 @@ clean: rm -f $(tst-stack4mod.sos) $(objpfx)tst-cleanup4: $(objpfx)tst-cleanup4aux.o $(shared-thread-library) -$(objpfx)tst-cleanupx4: $(objpfx)tst-cleanup4aux.o $(shared-thread-library) +$(objpfx)tst-cleanupx4: $(objpfx)tst-cleanupx4aux.o $(shared-thread-library) $(objpfx)tst-tls3: $(libdl) $(shared-thread-library) LDFLAGS-tst-tls3 = -rdynamic diff --git a/nptl/tst-cleanupx4aux.c b/nptl/tst-cleanupx4aux.c new file mode 100644 index 0000000..00bafe4 --- /dev/null +++ b/nptl/tst-cleanupx4aux.c @@ -0,0 +1 @@ +#include "tst-cleanup4aux.c" -- 2.7.4