diff options
| author | Andreas Schwab <schwab@suse.de> | 2008-09-09 13:37:14 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2008-09-09 13:37:14 +0000 |
| commit | d4abedf1056826b1f7faf23ba97e325ced8e6886 (patch) | |
| tree | 0adde9e353b6f81ce40585ec6561d4a282fe0534 | |
| parent | e5c73177bf31ed98d3dc9887eaa5836cd0a6148a (diff) | |
| download | gcc-d4abedf1056826b1f7faf23ba97e325ced8e6886.zip gcc-d4abedf1056826b1f7faf23ba97e325ced8e6886.tar.gz gcc-d4abedf1056826b1f7faf23ba97e325ced8e6886.tar.bz2 | |
(GLIBCXX_CHECK_STANDARD_LAYOUT): Fix compile check
not to redefine main.
From-SVN: r140148
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 11 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 8 |
3 files changed, 9 insertions, 15 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 60af9a7..d8f8b94 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2008-09-09 Andreas Schwab <schwab@suse.de> + + * acinclude.m4 (GLIBCXX_CHECK_STANDARD_LAYOUT): Fix compile check + not to redefine main. + 2008-09-07 Paolo Carlini <paolo.carlini@oracle.com> * acinclude.m4 ([GLIBCXX_CHECK_C99_TR1]): Check wcstoimax and diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 2485922..4936cc8 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1664,14 +1664,9 @@ AC_DEFUN([GLIBCXX_CHECK_STANDARD_LAYOUT], [ private: b& operator=(const b&); b(const b&); - }; - - int main() - { - b tst1 = { false }; - return 0; - }],, - [ac_standard_layout=yes], [ac_standard_layout=no]) + };], + [b tst1 = { false };], + [ac_standard_layout=yes], [ac_standard_layout=no]) CXXFLAGS="$ac_save_CXXFLAGS" AC_LANG_RESTORE diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 1a1c418..cf0c424 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -14285,16 +14285,10 @@ struct b b& operator=(const b&); b(const b&); }; - - int main() - { - b tst1 = { false }; - return 0; - } int main () { - +b tst1 = { false }; ; return 0; } |