libstdc++: Remove undeclared macros from configure.ac [PR122322]

The additions in r16-4443-g651bf5126da124 cause errors when running
autoreconf.

libstdc++-v3/ChangeLog:

	PR libstdc++/122322
	* configure.ac (with_newlib) <*-rtems*>: Remove
	HAVE_SYS_IOCT4YL_H, _GLIBCXX_USE_LINK, _GLIBCXX_USE_READLINK,
	_GLIBCXX_USE_SYMLINK, _GLIBCXX_USE_TRUNCATE, and
	_GLIBCXX_USE_FDOPENDIR. Remove duplicates.
	* configure: Regenerate.

(cherry picked from commit f5fb192c65e618508108525252b771956bdb1078)

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 92c44e6d185290ed19314934176e6847faa6a5ab..08d2a7a825917ce45ab97a49dcfd5718d9354e86 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -28592,14 +28592,10 @@ _ACEOF
 
         $as_echo "#define HAVE_LINK 1" >>confdefs.h
 
-        $as_echo "#define HAVE_SYS_IOCT4YL_H 1" >>confdefs.h
-
         $as_echo "#define HAVE_SYS_STAT_H 1" >>confdefs.h
 
         $as_echo "#define HAVE_SYS_TYPES_H 1" >>confdefs.h
 
-        $as_echo "#define HAVE_S_ISREG 1" >>confdefs.h
-
         $as_echo "#define HAVE_QUICK_EXIT 1" >>confdefs.h
 
         $as_echo "#define HAVE_READLINK 1" >>confdefs.h
@@ -28614,12 +28610,6 @@ _ACEOF
 
         $as_echo "#define HAVE_SYMLINK 1" >>confdefs.h
 
-        $as_echo "#define HAVE_SYS_IOCT4YL_H 1" >>confdefs.h
-
-        $as_echo "#define HAVE_SYS_STAT_H 1" >>confdefs.h
-
-        $as_echo "#define HAVE_SYS_TYPES_H 1" >>confdefs.h
-
         $as_echo "#define HAVE_S_ISREG 1" >>confdefs.h
 
         $as_echo "#define HAVE_TRUNCATE 1" >>confdefs.h
@@ -28640,16 +28630,6 @@ _ACEOF
 
         $as_echo "#define _GLIBCXX_USE_UTIME 1" >>confdefs.h
 
-        $as_echo "#define _GLIBCXX_USE_LINK 1" >>confdefs.h
-
-        $as_echo "#define _GLIBCXX_USE_READLINK 1" >>confdefs.h
-
-        $as_echo "#define _GLIBCXX_USE_SYMLINK 1" >>confdefs.h
-
-        $as_echo "#define _GLIBCXX_USE_TRUNCATE 1" >>confdefs.h
-
-        $as_echo "#define _GLIBCXX_USE_FDOPENDIR 1" >>confdefs.h
-
         $as_echo "#define HAVE_USLEEP 1" >>confdefs.h
 
         ;;

diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
index 5973445d1a9088226cca91559acbc19dacff4f20..c89e6a326a1e9fbdbf6bc87f3fe81fe5e0830ed5 100644 (file)
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
@@ -391,10 +391,8 @@ dnl # rather than hardcoding that information.
         AC_DEFINE(HAVE_ALIGNED_ALLOC)
         AC_DEFINE(HAVE_AT_QUICK_EXIT)
         AC_DEFINE(HAVE_LINK)
-        AC_DEFINE(HAVE_SYS_IOCT4YL_H)
         AC_DEFINE(HAVE_SYS_STAT_H)
         AC_DEFINE(HAVE_SYS_TYPES_H)
-        AC_DEFINE(HAVE_S_ISREG)
         AC_DEFINE(HAVE_QUICK_EXIT)
         AC_DEFINE(HAVE_READLINK)
         AC_DEFINE(HAVE_SETENV)
@@ -402,9 +400,6 @@ dnl # rather than hardcoding that information.
         AC_DEFINE(HAVE_SOCKATMARK)
         AC_DEFINE(HAVE_STRERROR_L)
         AC_DEFINE(HAVE_SYMLINK)
-        AC_DEFINE(HAVE_SYS_IOCT4YL_H)
-        AC_DEFINE(HAVE_SYS_STAT_H)
-        AC_DEFINE(HAVE_SYS_TYPES_H)
         AC_DEFINE(HAVE_S_ISREG)
         AC_DEFINE(HAVE_TRUNCATE)
         AC_DEFINE(HAVE_UNISTD_H)
@@ -415,11 +410,6 @@ dnl # rather than hardcoding that information.
         AC_DEFINE(_GLIBCXX_USE_CHDIR)
         AC_DEFINE(_GLIBCXX_USE_GETCWD)
         AC_DEFINE(_GLIBCXX_USE_UTIME)
-        AC_DEFINE(_GLIBCXX_USE_LINK)
-        AC_DEFINE(_GLIBCXX_USE_READLINK)
-        AC_DEFINE(_GLIBCXX_USE_SYMLINK)
-        AC_DEFINE(_GLIBCXX_USE_TRUNCATE)
-        AC_DEFINE(_GLIBCXX_USE_FDOPENDIR)
         AC_DEFINE(HAVE_USLEEP)
         ;;
     esac