diff --git a/ChangeLog b/ChangeLog
index e2618feda9..31d02b428c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-06-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[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.
+
 2016-06-30  Aurelien Jarno  <aurelien@aurel32.net>
 
 	* sysdeps/i386/i686/fpu/multiarch/libm-test-ulps: Regenerated.
diff --git a/nptl/Makefile b/nptl/Makefile
index e0bc1b7403..6322107c4d 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 0000000000..00bafe4580
--- /dev/null
+++ b/nptl/tst-cleanupx4aux.c
@@ -0,0 +1 @@
+#include "tst-cleanup4aux.c"