summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2019-02-20 08:43:39 (GMT)
committerAlexey Neyman <stilor@att.net>2019-02-20 08:43:39 (GMT)
commit8088c6ef4733d0b9fff9cd538c7f2c745434f149 (patch)
tree03298bac0fd9ddd09ba38ea385f4ad8f709ed490
parent16efa9d3e7d2fcbfd0971062d7b17bd5709d41fd (diff)
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 <stilor@att.net>
-rw-r--r--scripts/build/libc/uClibc.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index d80de57..fbee4aa 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