patches/gcc/4.2.3/160-libstdc++-pic.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
parent 431 8bde4c6ea47a
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@313
     1
diff -durN gcc-4.2.1.orig/libstdc++-v3/src/Makefile.am gcc-4.2.1/libstdc++-v3/src/Makefile.am
yann@313
     2
--- gcc-4.2.1.orig/libstdc++-v3/src/Makefile.am	2006-07-28 06:57:34.000000000 +0200
yann@313
     3
+++ gcc-4.2.1/libstdc++-v3/src/Makefile.am	2007-08-03 20:32:27.000000000 +0200
yann@313
     4
@@ -257,6 +257,12 @@
yann@313
     5
 	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
yann@313
     6
 
yann@313
     7
 
yann@313
     8
+install-exec-local:
yann@313
     9
+ifeq ($(enable_shared),yes)
yann@313
    10
+	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
yann@313
    11
+	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
yann@313
    12
+endif
yann@313
    13
+
yann@313
    14
 # Added bits to build debug library.
yann@313
    15
 if GLIBCXX_BUILD_DEBUG
yann@313
    16
 all-local: build_debug
yann@313
    17
diff -durN gcc-4.2.1.orig/libstdc++-v3/src/Makefile.in gcc-4.2.1/libstdc++-v3/src/Makefile.in
yann@313
    18
--- gcc-4.2.1.orig/libstdc++-v3/src/Makefile.in	2006-10-16 21:08:22.000000000 +0200
yann@313
    19
+++ gcc-4.2.1/libstdc++-v3/src/Makefile.in	2007-08-03 20:32:27.000000000 +0200
yann@313
    20
@@ -657,7 +657,7 @@
yann@313
    21
 
yann@313
    22
 install-data-am: install-data-local
yann@313
    23
 
yann@313
    24
-install-exec-am: install-toolexeclibLTLIBRARIES
yann@313
    25
+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
yann@313
    26
 
yann@313
    27
 install-info: install-info-am
yann@313
    28
 
yann@313
    29
@@ -690,6 +690,7 @@
yann@313
    30
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
yann@313
    31
 	html-am info info-am install install-am install-data \
yann@313
    32
 	install-data-am install-data-local install-exec \
yann@313
    33
+	install-exec-local \
yann@313
    34
 	install-exec-am install-info install-info-am install-man \
yann@313
    35
 	install-strip install-toolexeclibLTLIBRARIES installcheck \
yann@313
    36
 	installcheck-am installdirs maintainer-clean \
yann@313
    37
@@ -799,6 +800,13 @@
yann@313
    38
 install_debug:
yann@313
    39
 	(cd ${debugdir} && $(MAKE) \
yann@313
    40
 	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
yann@313
    41
+
yann@313
    42
+install-exec-local:
yann@313
    43
+ifeq ($(enable_shared),yes)
yann@313
    44
+	$(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
yann@313
    45
+	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
yann@313
    46
+endif
yann@313
    47
+
yann@313
    48
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
yann@313
    49
 # Otherwise a system limit (for SysV at least) may be exceeded.
yann@313
    50
 .NOEXPORT: