Merge pull request #1143 from stilor/rc2-fixes-2

RC2 fixes, part 2

scripts/build/cc/gcc.sh

@@ -542,9 +542,10 @@ do_gcc_core_backend() {
 
     CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
 
-    # We may need to modify host/build CFLAGS separately below
+    # We may need to modify host/build/target CFLAGS separately below. Note
+    # that ${cflags} may refer either to build or host CFLAGS; they are provided
+    # by the caller.
     cflags_for_build="${CT_CFLAGS_FOR_BUILD}"
-    cflags="${CT_CFLAGS_FOR_HOST}"
     cflags_for_target="${CT_TARGET_CFLAGS}"
 
     # Clang's default bracket-depth is 256, and building GCC

scripts/build/libc/uClibc.sh

@@ -237,6 +237,15 @@ manage_uClibc_config()
         CT_KconfigEnableOption "ARCH_USE_MMU" "${dst}"
     else
         CT_KconfigDisableOption "ARCH_USE_MMU" "${dst}"
+        CT_KconfigDisableOption "UCLIBC_FORMAT_FDPIC" "${dst}"
+        CT_KconfigDisableOption "UCLIBC_FORMAT_FLAT" "${dst}"
+        CT_KconfigDisableOption "UCLIBC_FORMAT_SHARED_FLAT" "${dst}"
+        case "${CT_ARCH_BINFMT_FLAT},${CT_ARCH_BINFMT_FDPIC},${CT_SHARED_LIBS}" in
+            y,,y) CT_KconfigEnableOption "UCLIBC_FORMAT_SHARED_FLAT" "${dst}";;
+            y,,) CT_KconfigEnableOption "UCLIBC_FORMAT_FLAT" "${dst}";;
+            ,y,*) CT_KconfigEnableOption "UCLIBC_FORMAT_FDPIC" "${dst}";;
+            *) CT_Abort "Unsupported binary format";;
+        esac
     fi
 
     if [ "${CT_SHARED_LIBS}" = "y" ]; then
@@ -404,6 +413,10 @@ manage_uClibc_config()
     # Now allow architecture to tweak as it wants
     CT_DoArchUClibcConfig "${dst}"
     CT_DoArchUClibcCflags "${dst}" "${flags}"
+
+    # Preserve the config we created (before uclibc's `make olddefconfig`
+    # overrides anything).
+    CT_DoExecLog ALL cp "${dst}" "${dst}.created-by-ct-ng"
 }
 
 uClibc_post_cc()

scripts/functions

@@ -1419,6 +1419,7 @@ CT_KconfigSetOption() {
     local value="$2"
     local file="$3"
 
+    CT_DoLog DEBUG "${file}: set ${option}=${value}"
     ${grep} -E -q "^${option}=.*" "${file}" && \
         ${sed} -i -r -e "s;^${option}=.*$;${option}=${value};" "${file}" || \
     ${grep} -E -q "^# ${option} is not set$" "${file}" && \
@@ -1441,6 +1442,7 @@ CT_KconfigDisableOption() {
     local option="${1}"
     local file="${2}"
 
+    CT_DoLog DEBUG "${file}: disable ${option}"
     ${grep} -E -q "^# ${option} is not set$" "${file}" || \
     ${grep} -E -q "^${option}=.*$" "${file}" && \
         ${sed} -i -r -e "s;^${option}=.*$;# ${option} is not set;" "${file}" || \
@@ -1454,6 +1456,7 @@ CT_KconfigDeleteOption() {
     local option="${1}"
     local file="${2}"
 
+    CT_DoLog DEBUG "${file}: delete ${option}"
     ${grep} -E -q "^# ${option} is not set$" "${file}" && \
         ${sed} -i -r -e "/^# ${option} is not set$/d" "${file}" || \
     ${grep} -E -q "^${option}=.*$" "${file}" && \