V5 [PATCH 2/2] x86: Add a LD_PRELOAD IFUNC resolver test for CPU_FEATURE_USABLE

["H.J. Lu" <hjl dot tools at gmail dot com>]

Verify that CPU_FEATURE_USABLE can be used by IFUNC resolver in a
LD_PRELOAD library.

	* sysdeps/x86/Makefile (modules-names): Add tst-x86-platform-mod-4
	and tst-x86-platform-preload-4.
	(LDFLAGS-tst-x86-platform-mod-4.so): New.
	($(objpfx)tst-x86-platform-mod-4.so): Likewise.
	($(objpfx)tst-x86-platform-4): Likewise.
	($(objpfx)tst-x86-platform-4.out): Likewise.
	(tst-x86-platform-4-ENV): Likewise.
---
 sysdeps/x86/Makefile                     | 10 +++-
 sysdeps/x86/tst-x86-platform-4.c         | 54 +++++++++++++++++++++
 sysdeps/x86/tst-x86-platform-mod-4.c     | 37 ++++++++++++++
 sysdeps/x86/tst-x86-platform-preload-4.c | 62 ++++++++++++++++++++++++
 4 files changed, 161 insertions(+), 2 deletions(-)
 create mode 100644 sysdeps/x86/tst-x86-platform-4.c
 create mode 100644 sysdeps/x86/tst-x86-platform-mod-4.c
 create mode 100644 sysdeps/x86/tst-x86-platform-preload-4.c

diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
index 272d8f0b89..1e759d3efc 100644
--- a/sysdeps/x86/Makefile
+++ b/sysdeps/x86/Makefile
@@ -7,8 +7,9 @@ sysdep-dl-routines += dl-get-cpu-features
 
 tests += tst-get-cpu-features tst-get-cpu-features-static \
 	 tst-x86-platform-1 tst-x86-platform-1-static \
-	 tst-x86-platform-2 tst-x86-platform-3
-modules-names += tst-x86-platform-mod-2 tst-x86-platform-mod-3
+	 tst-x86-platform-2 tst-x86-platform-3 tst-x86-platform-4
+modules-names += tst-x86-platform-mod-2 tst-x86-platform-mod-3 \
+		 tst-x86-platform-mod-4 tst-x86-platform-preload-4
 tests-static += tst-get-cpu-features-static tst-x86-platform-1-static
 
 $(objpfx)tst-x86-platform-mod-2.so: $(libsupport)
@@ -16,6 +17,11 @@ $(objpfx)tst-x86-platform-2: $(objpfx)tst-x86-platform-mod-2.so
 LDFLAGS-tst-x86-platform-mod-3.so = -Wl,-z,now
 $(objpfx)tst-x86-platform-mod-3.so: $(libsupport)
 $(objpfx)tst-x86-platform-3: $(objpfx)tst-x86-platform-mod-3.so
+LDFLAGS-tst-x86-platform-mod-4.so = -Wl,-z,now
+$(objpfx)tst-x86-platform-mod-4.so: $(libsupport)
+$(objpfx)tst-x86-platform-4: $(objpfx)tst-x86-platform-mod-4.so
+$(objpfx)tst-x86-platform-4.out: $(objpfx)tst-x86-platform-preload-4.so
+tst-x86-platform-4-ENV = LD_PRELOAD=$(objpfx)tst-x86-platform-preload-4.so
 endif
 
 ifeq ($(subdir),misc)
diff --git a/sysdeps/x86/tst-x86-platform-4.c b/sysdeps/x86/tst-x86-platform-4.c
new file mode 100644
index 0000000000..fe7bd59b82
--- /dev/null
+++ b/sysdeps/x86/tst-x86-platform-4.c
@@ -0,0 +1,54 @@
+/* Test case for x86 <sys/platform/x86.h>.
+   Copyright (C) 2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <sys/platform/x86.h>
+
+extern bool check_sse2 (void);
+extern bool check_avx (void);
+extern bool check_avx2 (void);
+
+static int
+do_test (void)
+{
+  bool failed = false;
+
+  if (CPU_FEATURE_USABLE (SSE2) != check_sse2 ())
+    {
+      printf ("LD_PRELOAD SSE2 check failed\n");
+      failed = true;
+    }
+
+  if (CPU_FEATURE_USABLE (AVX) != check_avx ())
+    {
+      printf ("LD_PRELOAD AVX check failed\n");
+      failed = true;
+    }
+
+  if (CPU_FEATURE_USABLE (AVX2) != check_avx2 ())
+    {
+      printf ("LD_PRELOAD AVX2 check failed\n");
+      failed = true;
+    }
+
+  return failed ? EXIT_FAILURE : EXIT_SUCCESS;
+}
+
+#include <support/test-driver.c>
diff --git a/sysdeps/x86/tst-x86-platform-mod-4.c b/sysdeps/x86/tst-x86-platform-mod-4.c
new file mode 100644
index 0000000000..789389ce3e
--- /dev/null
+++ b/sysdeps/x86/tst-x86-platform-mod-4.c
@@ -0,0 +1,37 @@
+/* Test case for x86 <sys/platform/x86.h>.
+   Copyright (C) 2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <stdbool.h>
+
+bool
+check_sse2 (void)
+{
+  return false;
+}
+
+bool
+check_avx (void)
+{
+  return false;
+}
+
+bool
+check_avx2 (void)
+{
+  return false;
+}
diff --git a/sysdeps/x86/tst-x86-platform-preload-4.c b/sysdeps/x86/tst-x86-platform-preload-4.c
new file mode 100644
index 0000000000..d1216b90e9
--- /dev/null
+++ b/sysdeps/x86/tst-x86-platform-preload-4.c
@@ -0,0 +1,62 @@
+/* Test case for x86 <sys/platform/x86.h>.
+   Copyright (C) 2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <stdbool.h>
+#include <sys/platform/x86.h>
+
+static bool
+ifunc_check_sse2 (void)
+{
+  return CPU_FEATURE_USABLE (SSE2);
+}
+
+static bool
+(*get_check_sse2 (void)) (void)
+{
+  return ifunc_check_sse2;
+}
+
+bool check_sse2 (void) __attribute__((ifunc("get_check_sse2")));
+
+static bool
+ifunc_check_avx (void)
+{
+  return CPU_FEATURE_USABLE (AVX);
+}
+
+static bool
+(*get_check_avx (void)) (void)
+{
+  return ifunc_check_avx;
+}
+
+bool check_avx (void) __attribute__((ifunc("get_check_avx")));
+
+static bool
+ifunc_check_avx2 (void)
+{
+  return CPU_FEATURE_USABLE (AVX2);
+}
+
+static bool
+(*get_check_avx2 (void)) (void)
+{
+  return ifunc_check_avx2;
+}
+
+bool check_avx2 (void) __attribute__((ifunc("get_check_avx2")));
-- 
2.17.1