diff --git a/CMakeLists.txt b/CMakeLists.txt index b1404ad22b..4d19eb626b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ endif() set(CMAKE_SYSTEM_SUB_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}) if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686" OR - ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") + ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") set(CMAKE_SYSTEM_PROCESSOR "x86") endif() @@ -100,7 +100,7 @@ if(NOT DEFINED PREFER_SIZE_OVER_SPEED) else() set(default_prefer_size 0) endif() - option(PREFER_SIZE_OVER_SPEED ${default_prefer_size}) + option(PREFER_SIZE_OVER_SPEED 0) endif() # Obsoleted. Reentrant syscalls provided for us diff --git a/meson.build b/meson.build index c49856ee0f..679ff57141 100644 --- a/meson.build +++ b/meson.build @@ -154,7 +154,7 @@ if set_double_equals_float float_double_code = ''' char size_test[sizeof(float) == sizeof(double) ? 1 : -1]; ''' - set_double_equals_float = + set_double_equals_float = double_equals_float = cc.compiles(float_double_code, name : 'double same as float', args : core_c_args) endif @@ -502,7 +502,7 @@ else specs_install = true endif -# Let targets add more support libraries +# Let targets add more support libraries additional_libs_list = meson.get_cross_property('additional_libs', []) if cc.get_id() == 'ccomp' @@ -647,7 +647,7 @@ if enable_multilib gen_multilib_crt0_path = specs_prefix_format.format(get_option('libdir') / '%M' / crt0_expr) crt0_gen = gen_format.format(gen_multilib_crt0_path) endif - + # # Construct the *startfile value from the options computed # above. As there's only one value, it's either the @@ -1032,7 +1032,7 @@ conf_data.set('_RETARGETABLE_LOCKING', get_option('newlib-retargetable-locking') conf_data.set('TINY_STDIO', tinystdio, description: 'Use tiny stdio from gcc avr') conf_data.set('_IEEE_LIBM', not get_option('want-math-errno'), description: 'math library does not set errno (offering only ieee semantics)') conf_data.set('_WANT_MATH_ERRNO', get_option('want-math-errno'), description: 'math library sets errno') -conf_data.set('PREFER_SIZE_OVER_SPEED', get_option('optimization') == 's', description: 'Optimize for space over speed') +# conf_data.set('PREFER_SIZE_OVER_SPEED', get_option('optimization') == 's', description: 'Optimize for space over speed') conf_data.set('FAST_STRCMP', fast_strcmp, description: 'Always optimize strcmp for performance') conf_data.set('__HAVE_LOCALE_INFO__', newlib_locale_info, description: 'locale support') conf_data.set('__HAVE_LOCALE_INFO_EXTENDED__', get_option('newlib-locale-info-extended'), description: 'extended locale support') diff --git a/zephyr/zephyr.cmake b/zephyr/zephyr.cmake index cb1daca4f6..f6ecd6692f 100644 --- a/zephyr/zephyr.cmake +++ b/zephyr/zephyr.cmake @@ -72,7 +72,7 @@ if(CONFIG_PICOLIBC_USE_MODULE) picolibc_option_false("__SINGLE_THREAD__" CONFIG_PICOLIBC_MULTITHREAD) picolibc_option_true("PICOLIBC_TLS" CONFIG_THREAD_LOCAL_STORAGE) picolibc_option_true("NEWLIB_GLOBAL_ERRNO" CONFIG_PICOLIBC_GLOBAL_ERRNO) - picolibc_option_true(PREFER_SIZE_OVER_SPEED CONFIG_SIZE_OPTIMIZATIONS) +# picolibc_option_true(PREFER_SIZE_OVER_SPEED CONFIG_SIZE_OPTIMIZATIONS) if(NOT DEFINED CONFIG_THREAD_LOCAL_STORAGE) set(__PICOLIBC_ERRNO_FUNCTION z_errno_wrap)