patches/gcc/4.4.2/240-libstdc++-pic.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Dec 31 18:47:37 2011 +0100 (2011-12-31)
changeset 2829 0c3c95f911ec
parent 1544 2228ea3f6b79
permissions -rw-r--r--
docs: credit Konrad EISELE for the initial multilib support

Konrad submitted an initial patch adding multlib support:
http://sourceware.org/ml/crossgcc/2011-11/msg00040.html

The patch was full of good ideas, but had a few issues, so
I (Yann E. MORIN) started it all from scatch, re-using part
of the original patch. This got implemented in this series:
hg log -r 446a17b5dd1e:e47d17391ae3

As I forgot to credit Konrad in these changelogs, update the
docs so that the work by Konrad gets credited. Without his
initial effort, we would probably not have had multlib support
so soon. Thank you Konrad!

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@1393
     1
diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am gcc-4.4.0/libstdc++-v3/src/Makefile.am
yann@1393
     2
--- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am	2009-04-10 01:23:07.000000000 +0200
yann@1393
     3
+++ gcc-4.4.0/libstdc++-v3/src/Makefile.am	2009-05-27 21:38:34.000000000 +0200
yann@1393
     4
@@ -351,6 +351,13 @@
yann@1393
     5
 	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
yann@1393
     6
 
yann@1393
     7
 
yann@1393
     8
+install-exec-local:
yann@1393
     9
+	pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
yann@1393
    10
+	if [ x"$$pic_objs" != x ]; then \
yann@1393
    11
+		$(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
yann@1393
    12
+		$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
yann@1393
    13
+	fi
yann@1393
    14
+
yann@1393
    15
 # Added bits to build debug library.
yann@1393
    16
 if GLIBCXX_BUILD_DEBUG
yann@1393
    17
 all-local: build_debug
yann@1393
    18
diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in gcc-4.4.0/libstdc++-v3/src/Makefile.in
yann@1393
    19
--- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in	2009-01-17 03:03:25.000000000 +0100
yann@1393
    20
+++ gcc-4.4.0/libstdc++-v3/src/Makefile.in	2009-05-27 21:38:34.000000000 +0200
yann@1393
    21
@@ -726,7 +726,7 @@
yann@1393
    22
 
yann@1393
    23
 install-data-am: install-data-local
yann@1393
    24
 
yann@1393
    25
-install-exec-am: install-toolexeclibLTLIBRARIES
yann@1393
    26
+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
yann@1393
    27
 
yann@1393
    28
 install-info: install-info-am
yann@1393
    29
 
yann@1393
    30
@@ -765,7 +765,7 @@
yann@1393
    31
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
yann@1393
    32
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
yann@1393
    33
 	tags uninstall uninstall-am uninstall-info-am \
yann@1393
    34
-	uninstall-toolexeclibLTLIBRARIES
yann@1393
    35
+	uninstall-toolexeclibLTLIBRARIES install-exec-local
yann@1393
    36
 
yann@1393
    37
 
yann@1393
    38
 # Symbol versioning for shared libraries.
yann@1393
    39
@@ -942,6 +942,14 @@
yann@1393
    40
 install_debug:
yann@1393
    41
 	(cd ${debugdir} && $(MAKE) \
yann@1393
    42
 	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
yann@1393
    43
+
yann@1393
    44
+install-exec-local:
yann@1393
    45
+	pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
yann@1393
    46
+	if [ x"$$pic_objs" != x ]; then \
yann@1393
    47
+		$(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
yann@1393
    48
+		$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
yann@1393
    49
+	fi
yann@1393
    50
+
yann@1393
    51
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
yann@1393
    52
 # Otherwise a system limit (for SysV at least) may be exceeded.
yann@1393
    53
 .NOEXPORT: