Tuesday, September 23, 2008

Cleaning up old hacks in gcc

Now, since glibc has been fixed properly to access GCC header files in include-fixed directory, there is no reason to keep old hacks and workarounds in corresponding gcc recipes. The recipes for upstream GCC were cleaned by Khem in his commit, but CodeSourcery recipes were left behind.

It is definitely a trivial patch and probably not worth mentioning here, but I had Bugzilla ticket #4560 opened with the following patch:
diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb b/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb
index 99656db..c9f03a7 100644
--- a/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb
+++ b/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb
@@ -4,9 +4,3 @@ require gcc-cross-initial.inc
 S = "${WORKDIR}/gcc-4.2"
 
 EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
-
-# Hack till we fix *libc properly
-do_stage_append() {
- ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
-}
-
diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb b/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
index 99656db..c9f03a7 100644
--- a/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
+++ b/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
@@ -4,9 +4,3 @@ require gcc-cross-initial.inc
 S = "${WORKDIR}/gcc-4.2"
 
 EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
-
-# Hack till we fix *libc properly
-do_stage_append() {
- ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
-}
-
diff --git a/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb b/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb
index 114d983..5423626 100644
--- a/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb
+++ b/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb
@@ -4,9 +4,3 @@ require gcc-cross-intermediate.inc
 S = "${WORKDIR}/gcc-4.2"
 
 EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
-
-# Hack till we fix *libc properly
-do_stage_append() {
- ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
-}
-
diff --git a/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb b/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
index 114d983..5423626 100644
--- a/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
+++ b/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
@@ -4,9 +4,3 @@ require gcc-cross-intermediate.inc
 S = "${WORKDIR}/gcc-4.2"
 
 EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
-
-# Hack till we fix *libc properly
-do_stage_append() {
- ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
-}
-
diff --git a/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb b/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb
index bc66b51..0e77b57 100644
--- a/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb
+++ b/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb
@@ -20,8 +20,3 @@ EXTRA_OECONF += " \
 CFLAGS = ""
 CXXFLAGS = ""
 LDFLAGS = ""
-
-# Hack till we fix *libc properly
-do_install_append() {
-        cp -a ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include/
-}

No comments: