* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@248853 138bc75d-0d04-0410-961f-82ee72b054a4
lw000 · Jun 3, 2017 · a703ac2 · a703ac2
1 parent a977cac
commit a703ac2
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 1 deletion.
diff --git 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
@@ -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
@@ -0,0 +1 @@
+CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE -fexceptions -frtti
diff --git 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
@@ -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
@@ -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
@@ -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)
     {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE -fexceptions -frtti