From 865171abc7bc468a577987725303ac9b8c580e52 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 19 Feb 2019 23:39:14 -0800 Subject: Stash the uClibc config after our mods ... before running `make olddefconfig`. This helps in debugging. Signed-off-by: Alexey Neyman --- scripts/build/libc/uClibc.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts/build/libc/uClibc.sh') diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index 5ea5c580..d80de57f 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -404,6 +404,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() -- cgit v1.2.3 From 8088c6ef4733d0b9fff9cd538c7f2c745434f149 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 20 Feb 2019 00:43:39 -0800 Subject: Select flat/FDPIC in accordance with ct-ng setting uClibc-ng 1.0.31 enabled FDPIC as an option for ARM/no-MMU configurations and defaults to that option if not set explicitly. Signed-off-by: Alexey Neyman --- scripts/build/libc/uClibc.sh | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'scripts/build/libc/uClibc.sh') diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index d80de57f..fbee4aa3 100644 --- a/scripts/build/libc/uClibc.sh +++ b/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 -- cgit v1.2.3