configure.ac (*-*-linux-android*): Set target_makefile_frag.

	* configure.ac (*-*-linux-android*): Set target_makefile_frag.
	* configure: Regenerate.
config/
	* mt-android: New file.
libstdc++-v3/
	* src/filesystem/dir.cc (fs::_Dir::advance): Use std::exchange.

From-SVN: r248853

diff --git a/ChangeLog b/ChangeLog
index 775d72e7eb158c728e875eeeeb88f3ad87a99d22..4794e5e3c52e0a2c0fb76e732a2aa3d1974ea4aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * configure.ac (*-*-linux-android*): Set target_makefile_frag.
+       * configure: Regenerate.
+
 2017-05-31  Martin Liska  <mliska@suse.cz>
 
        * configure.ac: Add handling of stage2_werror_flags to

diff --git a/config/ChangeLog b/config/ChangeLog
index 020032b62fa5f69b103b32951317c340e8aeb1b5..4d54353500745aca78e6d8fd86fec8963e57c812 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * mt-android: New file.
+
 2017-02-13  Richard Biener  <rguenther@suse.de>
 
        * isl.m4: Remove support for ISL 0.14.

diff --git a/config/mt-android b/config/mt-android
new file mode 100644 (file)
index 0000000..0db854f
--- /dev/null
+++ b/config/mt-android
@@ -0,0 +1 @@
+CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE -fexceptions -frtti

diff --git a/configure b/configure
index 2cbb4b7ab9ddd0c30c5fecf0ba3d845ce8d11ec7..084986f475e6ade045c58b57ef22b49b7770a0ff 100755 (executable)
--- a/configure
+++ b/configure
@@ -6930,6 +6930,9 @@ case "${target}" in
   nios2-*-elf*)
     target_makefile_frag="config/mt-nios2-elf"
     ;;
+  *-*-linux-android*)
+    target_makefile_frag="config/mt-android"
+    ;;
   *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
     target_makefile_frag="config/mt-gnu"
     ;;

diff --git a/configure.ac b/configure.ac
index 82faf06946d5f459df4e8c0904527e0b825cce5c..0cf052b2c756eadd2e105ac61966e9f855afe315 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2521,6 +2521,9 @@ case "${target}" in
   nios2-*-elf*)
     target_makefile_frag="config/mt-nios2-elf"
     ;;
+  *-*-linux-android*)
+    target_makefile_frag="config/mt-android"
+    ;;
   *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
     target_makefile_frag="config/mt-gnu"
     ;;

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4d9148437d57d7aea47c9e1da2e76749b8e574cc..1f8ac8a267e039cf7a52f53acdc8dd6b8c5b7a96 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * src/filesystem/dir.cc (fs::_Dir::advance): Use std::exchange.
+
 2017-06-02  Jonathan Wakely  <jwakely@redhat.com>
 
        PR libstdc++/80624

diff --git a/libstdc++-v3/src/filesystem/dir.cc b/libstdc++-v3/src/filesystem/dir.cc
index c8457bde102bd84eb12471ee9e005a94789a1d65..9aecd8042a5d991c83298f88eb149bb62c2f9ee4 100644 (file)
--- a/libstdc++-v3/src/filesystem/dir.cc
+++ b/libstdc++-v3/src/filesystem/dir.cc
@@ -146,7 +146,8 @@ fs::_Dir::advance(error_code* ec, directory_options options)
 
   int err = std::exchange(errno, 0);
   const auto entp = readdir(dirp);
-  std::swap(errno, err);
+  // std::swap cannot be used with Bionic's errno
+  err = std::exchange(errno, err);
 
   if (entp)
     {