Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.3/240-libstdc++-pic.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
parent 1611 e2516bba8fe5
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> 
     1 diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am gcc-4.4.0/libstdc++-v3/src/Makefile.am

     2 --- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am	2009-04-10 01:23:07.000000000 +0200

     3 +++ gcc-4.4.0/libstdc++-v3/src/Makefile.am	2009-05-27 21:38:34.000000000 +0200

     4 @@ -351,6 +351,13 @@

     5  	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@

     6  

     7  

     8 +install-exec-local:

     9 +	pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \

    10 +	if [ x"$$pic_objs" != x ]; then \

    11 +		$(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \

    12 +		$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \

    13 +	fi

    14 +

    15  # Added bits to build debug library.

    16  if GLIBCXX_BUILD_DEBUG

    17  all-local: build_debug

    18 diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in gcc-4.4.0/libstdc++-v3/src/Makefile.in

    19 --- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in	2009-01-17 03:03:25.000000000 +0100

    20 +++ gcc-4.4.0/libstdc++-v3/src/Makefile.in	2009-05-27 21:38:34.000000000 +0200

    21 @@ -726,7 +726,7 @@

    22  

    23  install-data-am: install-data-local

    24  

    25 -install-exec-am: install-toolexeclibLTLIBRARIES

    26 +install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local

    27  

    28  install-info: install-info-am

    29  

    30 @@ -765,7 +765,7 @@

    31  	maintainer-clean-generic mostlyclean mostlyclean-compile \

    32  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \

    33  	tags uninstall uninstall-am uninstall-info-am \

    34 -	uninstall-toolexeclibLTLIBRARIES

    35 +	uninstall-toolexeclibLTLIBRARIES install-exec-local

    36  

    37  

    38  # Symbol versioning for shared libraries.

    39 @@ -942,6 +942,14 @@

    40  install_debug:

    41  	(cd ${debugdir} && $(MAKE) \

    42  	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)

    43 +

    44 +install-exec-local:

    45 +	pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \

    46 +	if [ x"$$pic_objs" != x ]; then \

    47 +		$(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \

    48 +		$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \

    49 +	fi

    50 +

    51  # Tell versions [3.59,3.63) of GNU make to not export all variables.

    52  # Otherwise a system limit (for SysV at least) may be exceeded.

    53  .NOEXPORT:
crosstool-ng