about summary refs log tree commit diff
path: root/stdlib/tst-quick_exit.cc
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-06-09 12:02:42 +0200
committerFlorian Weimer <fweimer@redhat.com>2016-06-09 12:09:43 +0200
commit2df1b9804bcf714dfed12def17f8a518403d8d6b (patch)
treecb84cc3a66bdc6f18e97892e092539b0a961d75e /stdlib/tst-quick_exit.cc
parentbd499987c63fae6dd52fc577c8aada54293336bc (diff)
downloadglibc-2df1b9804bcf714dfed12def17f8a518403d8d6b.tar.gz
glibc-2df1b9804bcf714dfed12def17f8a518403d8d6b.tar.xz
glibc-2df1b9804bcf714dfed12def17f8a518403d8d6b.zip
quick_exit tests: Do not use C++ headers
If C++ headers such as <cstdlib> or <thread> are used, GCC 6
will include /usr/include/stdlib.h (instead of stdlib/stdlib.h
in the glibc source directory), and this turns up as a make
dependency.  An implicit rule will kick in and make will try to
install stdlib/stdlib.h as /usr/include/stdlib.h because the
target is out of date.

This commit switches to <stdlib.h> and <pthread.h> instead of
<cstdlib> and <thread>.
Diffstat (limited to 'stdlib/tst-quick_exit.cc')
-rw-r--r--stdlib/tst-quick_exit.cc17
1 files changed, 12 insertions, 5 deletions
diff --git a/stdlib/tst-quick_exit.cc b/stdlib/tst-quick_exit.cc
index c4a15a901c..6fb99c452a 100644
--- a/stdlib/tst-quick_exit.cc
+++ b/stdlib/tst-quick_exit.cc
@@ -15,24 +15,31 @@
    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 <cstdlib>
+
+#include <stdlib.h>
 
 struct A
 {
-  ~A() { abort(); }
+  ~A () { abort (); }
 };
 
 thread_local A a;
 
+void
+__attribute__ ((noinline, noclone))
+optimization_barrier (A &)
+{
+}
+
 static int
-do_test()
+do_test ()
 {
-  (void)a;
+  optimization_barrier (a);
   /* The C++11 standard in 18.5.12 says:
      "Objects shall not be destroyed as a result of calling
       quick_exit."
      If quick_exit calls the destructors the test aborts.  */
-  std::quick_exit(0);
+  quick_exit (0);
   return 0;
 }