diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Configs/Config.in | 7 | ||||
| -rw-r--r-- | extra/Configs/Config.in.arch | 13 | ||||
| -rw-r--r-- | extra/Configs/Config.nds32 | 1 | ||||
| -rw-r--r-- | extra/config/lxdialog/check-lxdialog.sh | 2 | ||||
| -rw-r--r-- | extra/scripts/unifdef.c | 12 |
5 files changed, 23 insertions, 12 deletions
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 3a0136c99..454b6ddb8 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -545,7 +545,7 @@ config LDSO_LD_LIBRARY_PATH If unsure, simply say Y here. config UCLIBC_CTOR_DTOR - bool + bool "Support global constructors and destructors" default y help If you wish to build uClibc with support for global constructor @@ -615,7 +615,7 @@ config UCLIBC_HAS_THREADS_NATIVE !TARGET_h8300 && \ !TARGET_hppa && \ !TARGET_ia64 && \ - (ARCH_USE_MMU || TARGET_arm) + (ARCH_USE_MMU || TARGET_arm || TARGET_xtensa) help If you want to compile uClibc with NPTL support, then answer Y. @@ -1040,8 +1040,7 @@ config UCLIBC_USE_TIME64 TARGET_sh || \ TARGET_xtensa # TODO: add support for other architectures - default y if TARGET_riscv32 - default n + default y help Replace 32bit syscalls to their 64/time64 analog if possible. diff --git a/extra/Configs/Config.in.arch b/extra/Configs/Config.in.arch index 1ae5134b9..24c0db157 100644 --- a/extra/Configs/Config.in.arch +++ b/extra/Configs/Config.in.arch @@ -20,7 +20,7 @@ config UCLIBC_FORMAT_ELF select HAVE_LDSO config UCLIBC_FORMAT_FDPIC_ELF bool "FDPIC ELF" - depends on !ARCH_USE_MMU && (TARGET_bfin || TARGET_frv || TARGET_arm) + depends on !ARCH_USE_MMU && (TARGET_bfin || TARGET_frv || TARGET_arm || TARGET_xtensa) select DOPIC config UCLIBC_FORMAT_DSBT_ELF bool "DBST ELF" @@ -164,9 +164,20 @@ config UCLIBC_HAS_FENV bool "Enable C99 Floating-point environment" depends on UCLIBC_HAS_FLOATS depends on TARGET_i386 || \ + TARGET_aarch64 || \ + TARGET_arc || \ + TARGET_arm || \ + TARGET_csky || \ + TARGET_m68k || \ TARGET_metag || \ + TARGET_mips || \ TARGET_nds32 || \ + TARGET_or1k || \ (TARGET_powerpc && CONFIG_E500) || \ + TARGET_riscv32 || \ + TARGET_riscv64 || \ + (TARGET_sh && (CONFIG_SH4 || CONFIG_SH4A)) || \ + TARGET_sparc || \ TARGET_x86_64 help If you want the uClibc math library to contain the C99 floating diff --git a/extra/Configs/Config.nds32 b/extra/Configs/Config.nds32 index 8bac9e679..2ed6a32b7 100644 --- a/extra/Configs/Config.nds32 +++ b/extra/Configs/Config.nds32 @@ -11,6 +11,7 @@ config FORCE_OPTIONS_FOR_ARCH bool default y select ARCH_ANY_ENDIAN + select ARCH_HAS_DEPRECATED_SYSCALLS select ARCH_HAS_MMU select ARCH_HAS_UCONTEXT diff --git a/extra/config/lxdialog/check-lxdialog.sh b/extra/config/lxdialog/check-lxdialog.sh index 9d2a4c585..66bfcb549 100644 --- a/extra/config/lxdialog/check-lxdialog.sh +++ b/extra/config/lxdialog/check-lxdialog.sh @@ -43,7 +43,7 @@ trap "rm -f $tmp" 0 1 2 3 15 check() { $cc -x c - -o $tmp 2>/dev/null <<'EOF' #include CURSES_LOC -main() {} +int main() {} EOF if [ $? != 0 ]; then echo " *** Unable to find the ncurses libraries or the" 1>&2 diff --git a/extra/scripts/unifdef.c b/extra/scripts/unifdef.c index 0f059205f..cfe34377a 100644 --- a/extra/scripts/unifdef.c +++ b/extra/scripts/unifdef.c @@ -201,7 +201,7 @@ static int depth; /* current #if nesting */ static int delcount; /* count of deleted lines */ static unsigned blankcount; /* count of blank lines */ static unsigned blankmax; /* maximum recent blankcount */ -static bool constexpr; /* constant #if expression */ +static bool const_expr; /* constant #if expression */ static bool zerosyms; /* to format symdepth output */ static bool firstsym; /* ditto */ @@ -951,7 +951,7 @@ static long prec(const struct ops *ops) /* * Function for evaluating the innermost parts of expressions, * viz. !expr (expr) number defined(symbol) symbol - * We reset the constexpr flag in the last two cases. + * We reset the const_expr flag in the last two cases. */ static Linetype eval_unary(const struct ops *ops, long *valp, const char **cpp) @@ -1011,7 +1011,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp) *valp = (value[sym] != NULL); lt = *valp ? LT_TRUE : LT_FALSE; } - constexpr = false; + const_expr = false; } else if (!endsym(*cp)) { debug("eval%d symbol", prec(ops)); sym = findsym(&cp); @@ -1028,7 +1028,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp) lt = *valp ? LT_TRUE : LT_FALSE; cp = skipargs(cp); } - constexpr = false; + const_expr = false; } else { debug("eval%d bad expr", prec(ops)); return (LT_ERROR); @@ -1088,10 +1088,10 @@ ifeval(const char **cpp) long val = 0; debug("eval %s", *cpp); - constexpr = killconsts ? false : true; + const_expr = killconsts ? false : true; ret = eval_table(eval_ops, &val, cpp); debug("eval = %d", val); - return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret); + return (const_expr ? LT_IF : ret == LT_ERROR ? LT_IF : ret); } /* |