patches/gcc/4.2.0/220-libstdc++-namespace.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
parent 111 2e16b9fc302d
permissions -rw-r--r--
cc/gcc: add option to compile against static libstdc++, for gcc-4.4 and newer

Idea and know-how taken from CodeSourcery build script.

Normal build:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb77f3000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb76e8000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75a1000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb757a000)
/lib/ld-linux.so.2 (0xb77f4000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb755c000)

CC_STATIC_LIBSTDCXX=y:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb7843000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb76e6000)
/lib/ld-linux.so.2 (0xb7844000)

I made CC_STATIC_LIBSTDCXX default=y since I think
it is always desirable.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
yann@111
     1
diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h
yann@111
     2
--- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-12-22 13:06:56.000000000 +0100
yann@111
     3
+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-12-22 15:23:41.000000000 +0100
yann@111
     4
@@ -32,7 +32,8 @@
yann@111
     5
 //
yann@111
     6
 
yann@111
     7
 // Written by Benjamin Kosnik <bkoz@redhat.com>
yann@111
     8
-
yann@111
     9
+namespace std
yann@111
    10
+{
yann@111
    11
 #ifdef __UCLIBC_MJN3_ONLY__
yann@111
    12
 #warning fix prototypes for *textdomain funcs
yann@111
    13
 #endif
yann@111
    14
@@ -115,3 +116,4 @@
yann@111
    15
 	   this->_S_create_c_locale(this->_M_c_locale_messages, __s); 
yann@111
    16
 	 }
yann@111
    17
      }
yann@111
    18
+}
yann@111
    19
diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h
yann@111
    20
--- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h	2006-12-22 13:06:56.000000000 +0100
yann@111
    21
+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h	2006-12-22 15:20:31.000000000 +0100
yann@111
    22
@@ -33,7 +33,8 @@
yann@111
    23
 //
yann@111
    24
 
yann@111
    25
 // Written by Benjamin Kosnik <bkoz@redhat.com>
yann@111
    26
-
yann@111
    27
+namespace std
yann@111
    28
+{
yann@111
    29
   template<typename _CharT>
yann@111
    30
     __timepunct<_CharT>::__timepunct(size_t __refs) 
yann@111
    31
     : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
yann@111
    32
@@ -74,3 +75,4 @@
yann@111
    33
       delete _M_data; 
yann@111
    34
       _S_destroy_c_locale(_M_c_locale_timepunct); 
yann@111
    35
     }
yann@111
    36
+}