From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 21 Nov 2002 05:17:40 +0000 (-0000)
Subject: Fixup g++ to prevent gcc_target having a missing
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b2a0d2216648564a815896756588a2d94610181e;p=buildroot.git

Fixup g++ to prevent gcc_target having a missing
dl_iterate_phdr symbol.  Add a target 'cc' link to gcc.
 -Erik
---

diff --git a/make/gcc_target.mk b/make/gcc_target.mk
index ab940fe9d1..956a9b0df4 100644
--- a/make/gcc_target.mk
+++ b/make/gcc_target.mk
@@ -139,6 +139,7 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
 		-C $(GCC_BUILD_DIR3) install;
 	rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc \
 		$(TARGET_DIR)/usr/share/locale
+	(cd $(TARGET_DIR)/usr/bin; ln -s gcc cc)
 	-$(STRIP) $(TARGET_DIR)/bin/* 
 	-$(STRIP) $(TARGET_DIR)/usr/bin/* 
 
diff --git a/make/uclibc_toolchain.mk b/make/uclibc_toolchain.mk
index 2dc6833f02..36a9d3dfba 100644
--- a/make/uclibc_toolchain.mk
+++ b/make/uclibc_toolchain.mk
@@ -326,6 +326,9 @@ $(GCC_DIR)/.ldso_hacks: $(GCC_DIR)/.patched
 		$(GCC_DIR)/libstdc++-v3/config/os/gnu-linux/bits/
 	cp $(GCC_DIR)/libstdc++-v3/config/os/generic/bits/ctype_noninline.h \
 		$(GCC_DIR)/libstdc++-v3/config/os/gnu-linux/bits/
+	# Prevent gcc from using the unwind-dw2-fde-glibc code
+	perl -i -p -e "s,^#ifndef inhibit_libc,#define inhibit_libc\n#ifndef inhibit_libc,g;" \
+		$(GCC_DIR)/gcc/unwind-dw2-fde-glibc.c;
 	touch $(GCC_DIR)/.ldso_hacks
 
 $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.ldso_hacks