Add Support for Annex K functions according to C11

.github/do-linux

@@ -2,6 +2,8 @@
 set -e
 HERE=`dirname "$0"`
 "$HERE"/do-test arm "$@"
+"$HERE"/do-test clang-thumbv7-a "$@"
+"$HERE"/do-test clang-thumb "$@"
 "$HERE"/do-test cortex-a9 "$@"
 "$HERE"/do-test clang-thumbv7e+fp "$@"
 "$HERE"/do-test clang-thumbv7e+dp "$@"

.github/do-zephyr

@@ -1,6 +1,7 @@
 #!/bin/sh
 set -e
 HERE=`dirname "$0"`
+"$HERE"/do-zephyr-test aarch64-zephyr "$@"
 "$HERE"/do-zephyr-test arc "$@"
 "$HERE"/do-zephyr-test arc64 "$@"
 "$HERE"/do-zephyr-build microblazeel "$@"

.github/zephyr-files.txt

@@ -1,16 +1,17 @@
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_arc-zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_arc64-zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_microblazeel-zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_mips-zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_nios2-zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_sparc-zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_x86_64-zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_xtensa-espressif_esp32s2_zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_xtensa-espressif_esp32_zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_xtensa-intel_ace15_mtpm_zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_xtensa-intel_tgl_adsp_zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_xtensa-nxp_imx8m_adsp_zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_xtensa-nxp_imx_adsp_zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/toolchain_linux-x86_64_xtensa-sample_controller_zephyr-elf.tar.xz
-https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/hosttools_linux-x86_64.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_aarch64-zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_arc-zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_arc64-zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_microblazeel-zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_mips-zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_nios2-zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_sparc-zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_x86_64-zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_xtensa-espressif_esp32s2_zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_xtensa-espressif_esp32_zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_xtensa-intel_ace15_mtpm_zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_xtensa-intel_tgl_adsp_zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_xtensa-nxp_imx8m_adsp_zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_xtensa-nxp_imx_adsp_zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/toolchain_linux-x86_64_xtensa-sample_controller_zephyr-elf.tar.xz
+https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/hosttools_linux-x86_64.tar.xz
 https://maps.altusmetrum.org/qemu-nios2-2.tar.xz

CMakeLists.txt

@@ -229,6 +229,9 @@ set(_HAVE_INITFINI_ARRAY 1)
 # Support _init() and _fini() functions
 set(_HAVE_INIT_FINI 1)
 
+# Enable MMU in pico crt startup
+set(_PICOCRT_ENABLE_MMU 1)
+
 # Compiler has long double type
 picolibc_flag(_HAVE_LONG_DOUBLE)
 

COPYING.picolibc

@@ -2845,7 +2845,7 @@ Files: .clang-format
  scripts/cross-riscv64-unknown-elf.txt
  scripts/cross-riscv64-zephyr-elf.txt
  scripts/cross-rv32imac.txt
- scripts/cross-rv32imac_zicsr.txt
+ scripts/cross-rv32imac_zicsr_zbb.txt
  scripts/cross-sh-unknown-elf.txt
  scripts/cross-sparc-zephyr-elf.txt
  scripts/cross-sparc64-linux-gnu.txt

dummyhost/iob.c

@@ -34,7 +34,6 @@
  */
 
 #include <stdio.h>
-#include <sys/cdefs.h>
 
 /*
  * Dummy stdio hooks. This allows programs to link without requiring

meson.build

@@ -1631,30 +1631,6 @@ endif
 test_env = environment({'PICOLIBC_TEST' : '1'})
 test_env.prepend('PATH', meson.current_source_dir() / 'scripts')
 
-# CompCert needs the '-WUl,' prefix to correctly pass the --spec parameters to the linker
-specs_prefix = ''
-if cc.get_id() == 'ccomp'
-  specs_prefix = '-WUl,'
-endif
-
-if has_semihost
-  specs = picolibc_specs
-  specs_name = picolibc_specs_name
-else
-  specs = configure_file(input: 'test.specs.in',
-			 output: '@BASENAME@',
-			 configuration: specs_data,
-			 install: false)
-  specs_name = 'test.specs'
-endif
-
-# Clang does not support spec files
-specs_line = []
-if cc.get_id() != 'clang'
-  specs_line += [specs_prefix + '--specs', specs_prefix + meson.current_build_dir() / specs_name]
-endif
-test_c_args += specs_line
-
 if has_semihost
   foreach target : ['default-target'] + targets
     if target == 'default-target'
@@ -1676,23 +1652,25 @@ if has_semihost
     endif
 
     set_variable(test_link_args_variable,
-		 ['-nostdlib', '-T', picolibc_ld_string,
-		  lib_gcc] + additional_libs_list + specs_line)
+		 ['-Wl,--gc-sections', '-nostdlib', '-T', picolibc_ld_string,
+		  lib_gcc] + additional_libs_list)
 
     set_variable(test_linker_files_variable, [picolibc_ld_value])
 
     # Make sure all of the tests get re-linked if the linker scripts change.
-    set_variable(test_link_depends_variable, [picolibc_ld_value, specs])
+    set_variable(test_link_depends_variable, [picolibc_ld_value])
   endforeach
 else
-  test_link_args = specs_line
-  test_linker_files = [specs]
-  test_link_depends = [specs]
+  test_link_args = ['-Wl,--gc-sections']
+  test_link_depends = []
 endif
 
 # make sure to include semihost BEFORE picocrt!
 if enable_picocrt
   subdir('picocrt')
+  picocrt_enable_mmu = get_option('picocrt-enable-mmu')
+  conf_data.set('_PICOCRT_ENABLE_MMU', picocrt_enable_mmu,
+                description: 'Turn on mmu in picocrt startup code')
 endif
 subdir('newlib')
 

meson_options.txt

@@ -62,6 +62,9 @@ option('picolib', type: 'boolean', value: true,
 option('picocrt', type: 'boolean', value: true,
        description: 'Include pico crt bits')
 
+option('picocrt-enable-mmu', type: 'boolean', value: true,
+       description: 'Enable memory management unit in picocrt startup')
+
 option('picocrt-lib', type: 'boolean', value: true,
        description: 'Include pico crt bits in lib form')
 

newlib/libc/argz/argz_count.c

@@ -4,7 +4,6 @@
  * is freely granted, provided that this notice is preserved.
  */
 
-#include <sys/cdefs.h>
 #include <argz.h>
 #include <stddef.h>
 #include <sys/types.h>

newlib/libc/argz/argz_stringify.c

@@ -4,7 +4,6 @@
  * is freely granted, provided that this notice is preserved.
  */
 
-#include <sys/cdefs.h>
 #include <argz.h>
 #include <stddef.h>
 #include <sys/types.h>

newlib/libc/ctype/isdigit_l.c

@@ -3,7 +3,6 @@ Copyright (c) 2016 Corinna Vinschen <[email protected]>
 Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <ctype.h>
 
 #undef isdigit_l

newlib/libc/ctype/islower_l.c

@@ -3,7 +3,6 @@ Copyright (c) 2016 Corinna Vinschen <[email protected]>
 Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <ctype.h>
 
 #undef islower_l

newlib/libc/ctype/iswalnum_l.c

@@ -4,7 +4,6 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 /* Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <ctype.h>
 #include <wctype.h>
 #include "local.h"

newlib/libc/ctype/iswalpha_l.c

@@ -4,7 +4,6 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 /* Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <ctype.h>
 #include <wctype.h>
 #include "local.h"

newlib/libc/ctype/iswblank_l.c

@@ -4,7 +4,6 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 /* Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <ctype.h>
 #include <wctype.h>
 #include "local.h"

newlib/libc/ctype/iswcntrl_l.c

@@ -4,7 +4,6 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 /* Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <ctype.h>
 #include <wctype.h>
 #include "local.h"

newlib/libc/ctype/iswctype_l.c

@@ -1,7 +1,6 @@
 /* Copyright (c) 2016 Corinna Vinschen <[email protected]> */
 /* Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <wctype.h>
 #include "local.h"
 

newlib/libc/ctype/iswdigit.c

@@ -62,7 +62,6 @@ PORTABILITY
 
 No supporting OS subroutines are required.
 */
-#include <sys/cdefs.h>
 #include <wctype.h>
 
 int

newlib/libc/ctype/iswdigit_l.c

@@ -3,7 +3,6 @@ Copyright (c) 2016 Corinna Vinschen <[email protected]>
 Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <wctype.h>
 
 int

newlib/libc/ctype/iswlower_l.c

@@ -4,7 +4,6 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 /* Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <ctype.h>
 #include <wctype.h>
 #include "local.h"

newlib/libc/ctype/iswprint_l.c

@@ -4,7 +4,6 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 /* Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <ctype.h>
 #include <wctype.h>
 #include "local.h"

newlib/libc/ctype/iswpunct_l.c

@@ -4,7 +4,6 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 /* Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <ctype.h>
 #include <wctype.h>
 #include "local.h"

newlib/libc/ctype/iswspace_l.c

@@ -4,7 +4,6 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 /* Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <ctype.h>
 #include <wctype.h>
 #include "local.h"

newlib/libc/ctype/iswupper_l.c

@@ -4,7 +4,6 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 /* Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <ctype.h>
 #include <wctype.h>
 #include "local.h"

newlib/libc/ctype/iswxdigit.c

@@ -62,7 +62,6 @@ PORTABILITY
 
 No supporting OS subroutines are required.
 */
-#include <sys/cdefs.h>
 #include <wctype.h>
 
 int

newlib/libc/ctype/iswxdigit_l.c

@@ -3,7 +3,6 @@ Copyright (c) 2016 Corinna Vinschen <[email protected]>
 Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <wctype.h>
 
 int

newlib/libc/ctype/jp2uc.c

@@ -36,7 +36,6 @@
 /* Under Cygwin, the incoming wide character is already given in UTF due
    to the requirements of the underlying OS. */
 
-#include <sys/cdefs.h>
 #include <string.h>
 #include <wctype.h>
 #include "local.h"

newlib/libc/ctype/toascii.c

@@ -65,7 +65,6 @@ No supporting OS subroutines are required.
 */
 
 #define _GNU_SOURCE
-#include <sys/cdefs.h>
 #include <ctype.h>
 #undef toascii
 

newlib/libc/ctype/toascii_l.c

@@ -3,7 +3,6 @@ Copyright (c) 2016 Corinna Vinschen <[email protected]>
 Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <ctype.h>
 
 #undef toascii_l

newlib/libc/ctype/towctrans.c

@@ -70,7 +70,6 @@ No supporting OS subroutines are required.
 */
 
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <wctype.h>
 //#include <errno.h>
 #include "local.h"

newlib/libc/ctype/towctrans_l.c

@@ -4,7 +4,6 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 /* Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <wctype.h>
 #include <stdint.h>
 //#include <errno.h>

newlib/libc/ctype/towlower.c

@@ -65,7 +65,6 @@ PORTABILITY
 No supporting OS subroutines are required.
 */
 
-#include <sys/cdefs.h>
 #include <ctype.h>
 #include <wctype.h>
 #include "local.h"

newlib/libc/ctype/towlower_l.c

@@ -4,7 +4,6 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 /* Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <wctype.h>
 #include "local.h"
 

newlib/libc/ctype/towupper.c

@@ -65,7 +65,6 @@ PORTABILITY
 No supporting OS subroutines are required.
 */
 
-#include <sys/cdefs.h>
 #include <string.h>
 #include <ctype.h>
 #include <wctype.h>

newlib/libc/ctype/towupper_l.c

@@ -4,7 +4,6 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 /* Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <wctype.h>
 #include "local.h"
 

newlib/libc/ctype/wctrans.c

@@ -67,7 +67,6 @@ PORTABILITY
 No supporting OS subroutines are required.
 */
 
-#include <sys/cdefs.h>
 #include <string.h>
 #include <wctype.h>
 #include <errno.h>

newlib/libc/ctype/wctrans_l.c

@@ -3,7 +3,6 @@ Copyright (c) 2016 Corinna Vinschen <[email protected]>
 Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <wctype.h>
 
 wctrans_t

newlib/libc/ctype/wctype_l.c

@@ -3,7 +3,6 @@ Copyright (c) 2016 Corinna Vinschen <[email protected]>
 Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
  */
 #define _DEFAULT_SOURCE
-#include <sys/cdefs.h>
 #include <wctype.h>
 
 wctype_t

newlib/libc/iconv/ccs/big5.c

@@ -8,7 +8,6 @@
 #if defined (ICONV_TO_UCS_CCS_BIG5) \
  || defined (ICONV_FROM_UCS_CCS_BIG5)
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include "ccs.h"