Patchwork Compile tst-cleanupx4 test with -fexceptions

login
register
mail settings
Submitter H.J. Lu
Date June 30, 2016, 3:26 a.m.
Message ID <CAMe9rOoP29SUZbXfzrxt=Qc3DfJuTSwS8aNjZg9WEaz4BeTx0A@mail.gmail.com>
Download mbox | patch
Permalink /patch/13499/
State New
Headers show

Comments

H.J. Lu - June 30, 2016, 3:26 a.m.
On Wed, Jun 29, 2016 at 6:25 PM, Mike Frysinger <vapier@gentoo.org> 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.

Patch

From 4b66f78856f355b978a67c38b4e994253a06720c Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
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