[PATCH] Compile tst-cleanupx4 test with -fexceptions

[H.J. Lu]

On Wed, Jun 1, 2016 at 2:17 PM, H.J. Lu <hongjiu.lu@intel.com> 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.
>
> Tested on x86-64 and i686.  OK for master?
>
>
> H.J.
> --
>         [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 eaa6f7f..684c538 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -333,8 +333,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
> @@ -476,6 +477,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)
> @@ -519,7 +521,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.5.5
>

I'd like to check in this patch to fix the last test failure on i686.
Any comments, feedbacks?

-- 
H.J.