From ace8d491639773f28e89ab91b95173014dcf7150 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 11 Nov 2019 20:20:10 +0100 Subject: [PATCH] Move toolchain overlay to Nixpkgs fork --- flake.lock | 6 +- flake.nix | 3 +- packages.nix | 7 +- toolchain-overlay/Genode.cmake | 32 - toolchain-overlay/binutils.patch | 83 -- toolchain-overlay/default.nix | 41 - toolchain-overlay/headers/default.nix | 56 - toolchain-overlay/libc/MB_CUR_MAX.patch | 24 - .../libc/_CurrentRuneLocale.patch | 23 - toolchain-overlay/libc/cdefs_no_hidden.patch | 63 - toolchain-overlay/libc/default.nix | 92 -- toolchain-overlay/libc/gdtoa.patch | 43 - toolchain-overlay/libc/genode_rel.ld | 261 ---- toolchain-overlay/libc/libc-builder.sh | 287 ----- toolchain-overlay/libc/libc.pc.in | 8 - toolchain-overlay/libc/libc.symbols | 1057 ----------------- toolchain-overlay/libc/log2.patch | 20 - toolchain-overlay/libc/mktime.patch | 44 - toolchain-overlay/libc/printfcommon.patch | 12 - toolchain-overlay/libc/rcmd.patch | 32 - toolchain-overlay/libc/res_init_c.patch | 125 -- toolchain-overlay/libc/runetype.patch | 15 - toolchain-overlay/libc/semaphore.patch | 11 - toolchain-overlay/libc/thread_local.patch | 23 - toolchain-overlay/libc/types.patch | 52 - toolchain-overlay/libc/vfwprintf_c_warn.patch | 31 - toolchain-overlay/libc/xlocale.patch | 35 - toolchain-overlay/libc/xlocale_private.patch | 59 - toolchain-overlay/libc/xprintf_float.patch | 12 - 29 files changed, 6 insertions(+), 2551 deletions(-) delete mode 100644 toolchain-overlay/Genode.cmake delete mode 100644 toolchain-overlay/binutils.patch delete mode 100644 toolchain-overlay/default.nix delete mode 100644 toolchain-overlay/headers/default.nix delete mode 100644 toolchain-overlay/libc/MB_CUR_MAX.patch delete mode 100644 toolchain-overlay/libc/_CurrentRuneLocale.patch delete mode 100644 toolchain-overlay/libc/cdefs_no_hidden.patch delete mode 100644 toolchain-overlay/libc/default.nix delete mode 100644 toolchain-overlay/libc/gdtoa.patch delete mode 100644 toolchain-overlay/libc/genode_rel.ld delete mode 100755 toolchain-overlay/libc/libc-builder.sh delete mode 100644 toolchain-overlay/libc/libc.pc.in delete mode 100644 toolchain-overlay/libc/libc.symbols delete mode 100644 toolchain-overlay/libc/log2.patch delete mode 100644 toolchain-overlay/libc/mktime.patch delete mode 100644 toolchain-overlay/libc/printfcommon.patch delete mode 100644 toolchain-overlay/libc/rcmd.patch delete mode 100644 toolchain-overlay/libc/res_init_c.patch delete mode 100644 toolchain-overlay/libc/runetype.patch delete mode 100644 toolchain-overlay/libc/semaphore.patch delete mode 100644 toolchain-overlay/libc/thread_local.patch delete mode 100644 toolchain-overlay/libc/types.patch delete mode 100644 toolchain-overlay/libc/vfwprintf_c_warn.patch delete mode 100644 toolchain-overlay/libc/xlocale.patch delete mode 100644 toolchain-overlay/libc/xlocale_private.patch delete mode 100644 toolchain-overlay/libc/xprintf_float.patch diff --git a/flake.lock b/flake.lock index b6a0a67..67d745d 100644 --- a/flake.lock +++ b/flake.lock @@ -34,9 +34,9 @@ }, "nixpkgs": { "inputs": {}, - "narHash": "sha256-1pvSqpPbcREIGI7BF6A29b81bH/dZvywTPwYhrMaRa0=", - "originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git", - "url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=master&rev=ff59349d99ff0ff2496e85278c596df3a14ef3ec" + "narHash": "sha256-1bzVtI5qk3bFvAnf4ww3R4grNymC4EdZZsRncuKe/gQ=", + "originalUrl": "git+file:///home/repo/nixpkgs?ref=genode", + "url": "git+file:///home/repo/nixpkgs?ref=genode&rev=52db5235aa35b4e334a7187ba18517cb5dc6410d" } }, "version": 3 diff --git a/flake.nix b/flake.nix index 1233661..763179e 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ description = "Genode packages"; inputs = { - nixpkgs.uri = "git+https://gitea.c3d2.de/ehmry/nixpkgs.git"; + nixpkgs.uri = "git+file:///home/repo/nixpkgs?ref=genode"; dhall-haskell.uri = "git+https://github.com/dhall-lang/dhall-haskell?ref=flake"; }; @@ -29,5 +29,6 @@ inherit self nixpkgs dhall-haskell genode-depot; genodepkgs = builtins.getAttr system self.packages; }); + }; } diff --git a/packages.nix b/packages.nix index 4344648..f675b4d 100644 --- a/packages.nix +++ b/packages.nix @@ -8,12 +8,7 @@ let toolchainOverlay = import ./toolchain-overlay; # Overlay of toolchain patches - super = import nixpkgs { - # Evaluate an overlayed Nixpkgs for a Genode target - localSystem = "x86_64-linux"; - crossSystem = "x86_64-genode"; - overlays = [ toolchainOverlay ]; - }; + super = builtins.getAttr system nixpkgs.legacyPackages; inherit (super) callPackage; diff --git a/toolchain-overlay/Genode.cmake b/toolchain-overlay/Genode.cmake deleted file mode 100644 index 962da53..0000000 --- a/toolchain-overlay/Genode.cmake +++ /dev/null @@ -1,32 +0,0 @@ -set(GENODE 1) - -set(CMAKE_DL_LIBS "") -set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC") -set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE") -set(_CMAKE_C_PIE_MAY_BE_SUPPORTED_BY_LINKER YES) -set(CMAKE_C_LINK_OPTIONS_PIE ${CMAKE_C_COMPILE_OPTIONS_PIE} "-pie") -set(CMAKE_C_LINK_OPTIONS_NO_PIE "-no-pie") -set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") -set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") -set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") -set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") -set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") - -# Disable the stack protector until a later stage of LLVM migration -set(CMAKE_C_FLAGS "-fno-stack-protector") -set(CMAKE_CXX_FLAGS "-fno-stack-protector") - -# Shared libraries with no builtin soname may not be linked safely by -# specifying the file path. -set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1) - -# Initialize C link type selection flags. These flags are used when -# building a shared library, shared module, or executable that links -# to other libraries to select whether to use the static or shared -# versions of the libraries. -foreach(type SHARED_LIBRARY SHARED_MODULE EXE) - set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic") - set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic") -endforeach() diff --git a/toolchain-overlay/binutils.patch b/toolchain-overlay/binutils.patch deleted file mode 100644 index a9f514f..0000000 --- a/toolchain-overlay/binutils.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/bfd/config.bfd b/bfd/config.bfd -index 6391f35684..f2ab802fb5 100644 ---- a/bfd/config.bfd -+++ b/bfd/config.bfd -@@ -554,7 +554,7 @@ case "${targ}" in - targ_selvecs=hppa_elf32_vec - ;; - -- i[3-7]86-*-elf* | i[3-7]86-*-rtems*) -+ i[3-7]86-*-elf* | i[3-7]86-*-rtems* | i[3-7]86-*-genode*) - targ_defvec=i386_elf32_vec - targ_selvecs="iamcu_elf32_vec i386_coff_vec" - ;; -@@ -662,7 +662,7 @@ case "${targ}" in - targ_selvecs="i386_elf32_vec iamcu_elf32_vec l1om_elf64_vec k1om_elf64_vec" - want64=true - ;; -- x86_64-*-elf* | x86_64-*-rtems* | x86_64-*-fuchsia) -+ x86_64-*-elf* | x86_64-*-rtems* | x86_64-*-fuchsia | x86_64-*-genode*) - targ_defvec=x86_64_elf64_vec - targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec l1om_elf64_vec k1om_elf64_vec" - case "${targ}" in -diff --git a/config.sub b/config.sub -index c95acc681d..388c305636 100755 ---- a/config.sub -+++ b/config.sub -@@ -1376,7 +1376,7 @@ case $os in - | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ - | skyos* | haiku* | rdos* | toppers* | drops* | es* \ - | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ -- | midnightbsd*) -+ | midnightbsd* | genode*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - qnx*) -diff --git a/gas/configure.tgt b/gas/configure.tgt -index 3d0415c1aa..7cd96b6be4 100644 ---- a/gas/configure.tgt -+++ b/gas/configure.tgt -@@ -139,7 +139,8 @@ case ${generic_target} in - - arm-*-phoenix*) fmt=elf ;; - arm-*-elf) fmt=elf ;; -- arm-*-eabi* | arm-*-rtems*) fmt=elf em=armeabi ;; -+ arm-*-eabi* | arm-*-rtems* | arm-*-genode*) -+ fmt=elf em=armeabi ;; - arm-*-symbianelf*) fmt=elf em=symbian ;; - arm-*-kaos*) fmt=elf ;; - arm-*-conix*) fmt=elf ;; -@@ -213,6 +214,7 @@ case ${generic_target} in - i386-*-elfiamcu) fmt=elf arch=iamcu ;; - i386-*-elf*) fmt=elf ;; - i386-*-fuchsia*) fmt=elf ;; -+ i386-*-genode*) fmt=elf ;; - i386-*-kaos*) fmt=elf ;; - i386-*-bsd*) fmt=aout em=386bsd ;; - i386-*-nacl*) fmt=elf em=nacl -diff --git a/ld/configure.tgt b/ld/configure.tgt -index fad8b2e5c8..04f7fa0e70 100644 ---- a/ld/configure.tgt -+++ b/ld/configure.tgt -@@ -115,7 +115,7 @@ arm-*-nto*) targ_emul=armnto ;; - arm-*-phoenix*) targ_emul=armelf ;; - armeb-*-elf | armeb-*-eabi*) - targ_emul=armelfb ;; --arm-*-elf | arm*-*-eabi* | arm-*-rtems*) -+arm-*-elf | arm*-*-eabi* | arm-*-rtems* | arm-*-genode*) - targ_emul=armelf ;; - arm*-*-symbianelf*) targ_emul=armsymbian;; - arm-*-kaos*) targ_emul=armelf ;; -@@ -302,10 +302,10 @@ x86_64-*-netbsd*) targ_emul=elf_x86_64 - esac ;; - i[3-7]86-*-elfiamcu) targ_emul=elf_iamcu - targ_extra_emuls=elf_i386 ;; --i[3-7]86-*-elf* | i[3-7]86-*-rtems*) -+i[3-7]86-*-elf* | i[3-7]86-*-rtems* | i[3-7]86-*-genode*) - targ_emul=elf_i386 - targ_extra_emuls=elf_iamcu ;; --x86_64-*-elf* | x86_64-*-rtems* | x86_64-*-fuchsia*) -+x86_64-*-elf* | x86_64-*-rtems* | x86_64-*-fuchsia* | x86_64-*-genode*) - targ_emul=elf_x86_64 - targ_extra_emuls="elf_i386 elf_iamcu elf32_x86_64 elf_l1om elf_k1om" - targ_extra_libpath="elf_i386 elf_iamcu elf32_x86_64 elf_l1om elf_k1om" diff --git a/toolchain-overlay/default.nix b/toolchain-overlay/default.nix deleted file mode 100644 index 3425dec..0000000 --- a/toolchain-overlay/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-FileCopyrightText: Emery Hemingway -# -# SPDX-License-Identifier: LicenseRef-Hippocratic-1.1 - -self: super: - -let - inherit (super) lib; - - hasGenode = with super.stdenv; - (if hostPlatform ? isGenode then hostPlatform.isGenode else false) - || (if targetPlatform ? isGenode then targetPlatform.isGenode else false); - - genodelibc = self.callPackage ./libc { stdenv = self.crossLibcStdenv; }; - -in { - - binutils-unwrapped = super.binutils-unwrapped.overrideAttrs (attrs: { - patches = attrs.patches ++ (lib.optional hasGenode ./binutils.patch); - }); - - cmake = super.cmake.overrideAttrs (attrs: { - postInstall = if hasGenode then '' - local MODULE="$out/share/cmake-${ - lib.versions.majorMinor attrs.version - }/Modules/Platform/Genode.cmake" - if [ -e "$MODULE" ]; then - echo "Upstream provides $MODULE!" - exit 1 - fi - cp ${./Genode.cmake} $MODULE - '' else - null; - }); - - genodeHeaders = self.callPackage ./headers { }; - - inherit genodelibc; - libcCross = genodelibc; - -} diff --git a/toolchain-overlay/headers/default.nix b/toolchain-overlay/headers/default.nix deleted file mode 100644 index 39e2bb9..0000000 --- a/toolchain-overlay/headers/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -# SPDX-FileCopyrightText: Emery Hemingway -# -# SPDX-License-Identifier: LicenseRef-Hippocratic-1.1 - -{ stdenvNoCC, lib, fetchurl }: - -let - stdenv = stdenvNoCC; - version = "19.08"; - platform = stdenv.targetPlatform; -in stdenv.mkDerivation { - pname = platform.system + "-headers"; - inherit version; - - src = fetchurl { - url = "https://github.com/genodelabs/genode/archive/${version}.tar.gz"; - sha256 = "1x5yjb4l36pfg87k389qyq3y3kv5yblzn9r6ikyqgam413bpxabi"; - }; - - specs = with platform; [] - ++ lib.optional is32bit "32bit" - ++ lib.optional is64bit "64bit" - ++ lib.optional isAarch32 "arm" - ++ lib.optional isAarch64 "arm_64" - ++ lib.optional isRiscV "riscv" - ++ lib.optional isx86 "x86" - ++ lib.optional isx86_32 "x86_32" - ++ lib.optional isx86_64 "x86_64"; - - builder = builtins.toFile "builder.sh" '' - source $stdenv/setup - - tar fx $src \ - --strip-components=2 \ - genode-$version/repos/base/include \ - genode-$version/repos/demo/include \ - genode-$version/repos/gems/include \ - genode-$version/repos/libports/include \ - genode-$version/repos/os/include \ - genode-$version/repos/ports/include \ - - includeDir=$out/include - mkdir -p $includeDir - - for DIR in */include; do - for SPEC in $specs; do - if [ -d $DIR/spec/$SPEC ]; then - cp -r $DIR/spec/$SPEC/* $includeDir/ - rm -r $DIR/spec/$SPEC - fi - done - rm -rf $DIR/spec - cp -r $DIR/* $includeDir - done - ''; -} diff --git a/toolchain-overlay/libc/MB_CUR_MAX.patch b/toolchain-overlay/libc/MB_CUR_MAX.patch deleted file mode 100644 index 7419fcc..0000000 --- a/toolchain-overlay/libc/MB_CUR_MAX.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/lib/libc/include/stdlib.h.orig 2019-04-18 13:26:58.781188866 +0200 -+++ src/lib/libc/include/stdlib.h 2019-04-18 13:27:46.100594001 +0200 -@@ -81,7 +81,8 @@ - #endif - extern int __mb_cur_max; - extern int ___mb_cur_max(void); --#define MB_CUR_MAX ((size_t)___mb_cur_max()) -+/* ASCII only */ -+#define MB_CUR_MAX 1 - - _Noreturn void abort(void); - int abs(int) __pure2; - ---- src/lib/libc/include/xlocale/_stdlib.h.orig 2019-04-18 13:28:52.691756865 +0200 -+++ src/lib/libc/include/xlocale/_stdlib.h 2019-04-18 13:29:13.079500565 +0200 -@@ -57,5 +57,6 @@ - int wctomb_l(char *, wchar_t, locale_t); - - int ___mb_cur_max_l(locale_t); --#define MB_CUR_MAX_L(x) ((size_t)___mb_cur_max_l(x)) -+/* ASCII only */ -+#define MB_CUR_MAX_L(x) 1 - - diff --git a/toolchain-overlay/libc/_CurrentRuneLocale.patch b/toolchain-overlay/libc/_CurrentRuneLocale.patch deleted file mode 100644 index 1420e84..0000000 --- a/toolchain-overlay/libc/_CurrentRuneLocale.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/lib/libc/include/runetype.h.orig 2019-04-16 11:51:27.954530199 +0200 -+++ src/lib/libc/include/runetype.h 2019-04-16 11:51:53.346901123 +0200 -@@ -88,19 +88,7 @@ - __BEGIN_DECLS - extern const _RuneLocale _DefaultRuneLocale; - extern const _RuneLocale *_CurrentRuneLocale; --#if defined(__NO_TLS) || defined(__RUNETYPE_INTERNAL) --extern const _RuneLocale *__getCurrentRuneLocale(void); --#else --extern _Thread_local const _RuneLocale *_ThreadRuneLocale; --static __inline const _RuneLocale *__getCurrentRuneLocale(void) --{ -- -- if (_ThreadRuneLocale) -- return _ThreadRuneLocale; -- return _CurrentRuneLocale; --} --#endif /* __NO_TLS || __RUNETYPE_INTERNAL */ --#define _CurrentRuneLocale (__getCurrentRuneLocale()) -+#define _CurrentRuneLocale (&_DefaultRuneLocale) - __END_DECLS - - #endif /* !_RUNETYPE_H_ */ diff --git a/toolchain-overlay/libc/cdefs_no_hidden.patch b/toolchain-overlay/libc/cdefs_no_hidden.patch deleted file mode 100644 index 67c691f..0000000 --- a/toolchain-overlay/libc/cdefs_no_hidden.patch +++ /dev/null @@ -1,63 +0,0 @@ -Prevent the use of the hidden attribute for symbols. In particular, -the attribute must not be applied to '__libc'-prefixed symbols to allow -overwriting the dummies defined in dummies.cc by other non-weak -implementations such as those in 'libc_noux.lib.so'. - -This attribute is applied inconsistently in -libc/lib/libc/include/libc_private.h anyway. - -Also, force i386 to call __libc_sigprocmask via PLT to prevent -R_386_PC32 relocations, which had to change the text segment. Other -architectures do this automatically. - ---- src/lib/libc/sys/sys/cdefs.h -+++ src/lib/libc/sys/sys/cdefs.h -@@ -447,7 +447,7 @@ - #if __GNUC_PREREQ__(4, 0) - #define __null_sentinel __attribute__((__sentinel__)) - #define __exported __attribute__((__visibility__("default"))) --#define __hidden __attribute__((__visibility__("hidden"))) -+#define __hidden - #else - #define __null_sentinel - #define __exported ---- src/lib/libc/lib/libc/i386/gen/setjmp.S -+++ src/lib/libc/lib/libc/i386/gen/setjmp.S -@@ -54,7 +54,7 @@ - pushl %eax /* (sigset_t*)oset */ - pushl $0 /* (sigset_t*)set */ - pushl $1 /* SIG_BLOCK */ -- call __libc_sigprocmask -+ call __i386_libc_sigprocmask - addl $12,%esp - movl 4(%esp),%ecx - movl 0(%esp),%edx -@@ -76,7 +76,7 @@ - leal 28(%edx), %eax - pushl %eax /* (sigset_t*)set */ - pushl $3 /* SIG_SETMASK */ -- call __libc_sigprocmask -+ call __i386_libc_sigprocmask - addl $12,%esp - movl 4(%esp),%edx - movl 8(%esp),%eax ---- src/lib/libc/lib/libc/i386/gen/sigsetjmp.S -+++ src/lib/libc/lib/libc/i386/gen/sigsetjmp.S -@@ -63,7 +63,7 @@ - pushl %eax /* (sigset_t*)oset */ - pushl $0 /* (sigset_t*)set */ - pushl $1 /* SIG_BLOCK */ -- call __libc_sigprocmask -+ call __i386_libc_sigprocmask - addl $12,%esp - movl 4(%esp),%ecx - 2: movl 0(%esp),%edx -@@ -87,7 +87,7 @@ - leal 28(%edx), %eax - pushl %eax /* (sigset_t*)set */ - pushl $3 /* SIG_SETMASK */ -- call __libc_sigprocmask -+ call __i386_libc_sigprocmask - addl $12,%esp - movl 4(%esp),%edx - 2: movl 8(%esp),%eax diff --git a/toolchain-overlay/libc/default.nix b/toolchain-overlay/libc/default.nix deleted file mode 100644 index 9e9e093..0000000 --- a/toolchain-overlay/libc/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -# SPDX-FileCopyrightText: Emery Hemingway -# -# SPDX-License-Identifier: LicenseRef-Hippocratic-1.1 - -{ stdenv, fetchgit, fetchurl, genodeHeaders, bison, flex, glibc }: - -let - archInfo = with stdenv.hostPlatform; - if isAarch32 then { - inherit isArm isAarch32; - } else if isAarch64 then { - inherit isArm isAarch64; - } else if isx86_32 then { - inherit isx86 isx86_32; - } else if isx86_64 then { - inherit isx86 isx86_64; - } else - { }; -in stdenv.mkDerivation (archInfo // { - name = "genodelibc-12.0.0"; - outputs = [ "out" "dev" ]; - - builder = ./libc-builder.sh; - - inherit genodeHeaders; - - depsBuildBuild = [ - bison - flex - glibc # provides rpcgen - ]; - - src = fetchurl { - url = - "http://ftp.freebsd.org/pub/FreeBSD/releases/amd64/12.0-RELEASE/src.txz"; - sha256 = "0da393ac2174168a71c1c527d1453e07372295187d05c288250800cb152a889b"; - }; - - unpackPhase = "tar xf $src $tarFlags"; - - tarFlags = [ - "--strip-components=2" - "usr/src/contrib/gdtoa" - "usr/src/contrib/libc-vis" - "usr/src/contrib/tzcode/stdtime" - "usr/src/include" - "usr/src/lib/libc" - "usr/src/lib/msun" - "usr/src/sys/amd64" - "usr/src/sys/arm" - "usr/src/sys/arm64" - "usr/src/sys/bsm" - "usr/src/sys/crypto/chacha20" - "usr/src/sys/i386" - "usr/src/sys/libkern" - "usr/src/sys/net" - "usr/src/sys/netinet" - "usr/src/sys/netinet6" - "usr/src/sys/riscv" - "usr/src/sys/rpc" - "usr/src/sys/sys" - "usr/src/sys/vm" - "usr/src/sys/x86" - ]; - - patches = [ - ./cdefs_no_hidden.patch - ./_CurrentRuneLocale.patch - ./gdtoa.patch - ./log2.patch - ./MB_CUR_MAX.patch - ./mktime.patch - ./printfcommon.patch - ./rcmd.patch - ./res_init_c.patch - ./runetype.patch - ./semaphore.patch - ./thread_local.patch - ./types.patch - ./vfwprintf_c_warn.patch - ./xlocale.patch - ./xlocale_private.patch - ./xprintf_float.patch - ]; - - patchFlags = "-p0 --strip 3"; - - ldScriptSo = ./genode_rel.ld; - - libcPcIn = ./libc.pc.in; - libcSymbols = ./libc.symbols; -}) diff --git a/toolchain-overlay/libc/gdtoa.patch b/toolchain-overlay/libc/gdtoa.patch deleted file mode 100644 index d9d6ae3..0000000 --- a/toolchain-overlay/libc/gdtoa.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- src/lib/libc/contrib/gdtoa/gdtoaimp.h.orig 2019-04-16 11:11:02.420833030 +0200 -+++ src/lib/libc/contrib/gdtoa/gdtoaimp.h 2019-04-16 11:11:17.704278981 +0200 -@@ -506,40 +506,6 @@ - #define Bcopy(x,y) memcpy(&x->sign,&y->sign,y->wds*sizeof(ULong) + 2*sizeof(int)) - #endif /* NO_STRING_H */ - --/* -- * Paranoia: Protect exported symbols, including ones in files we don't -- * compile right now. The standard strtof and strtod survive. -- */ --#define dtoa __dtoa --#define gdtoa __gdtoa --#define freedtoa __freedtoa --#define strtodg __strtodg --#define g_ddfmt __g_ddfmt --#define g_dfmt __g_dfmt --#define g_ffmt __g_ffmt --#define g_Qfmt __g_Qfmt --#define g_xfmt __g_xfmt --#define g_xLfmt __g_xLfmt --#define strtoId __strtoId --#define strtoIdd __strtoIdd --#define strtoIf __strtoIf --#define strtoIQ __strtoIQ --#define strtoIx __strtoIx --#define strtoIxL __strtoIxL --#define strtord_l __strtord_l --#define strtordd __strtordd --#define strtorf __strtorf --#define strtorQ_l __strtorQ_l --#define strtorx_l __strtorx_l --#define strtorxL __strtorxL --#define strtodI __strtodI --#define strtopd __strtopd --#define strtopdd __strtopdd --#define strtopf __strtopf --#define strtopQ __strtopQ --#define strtopx __strtopx --#define strtopxL __strtopxL -- - /* Protect gdtoa-internal symbols */ - #define Balloc __Balloc_D2A - #define Bfree __Bfree_D2A diff --git a/toolchain-overlay/libc/genode_rel.ld b/toolchain-overlay/libc/genode_rel.ld deleted file mode 100644 index a756ffa..0000000 --- a/toolchain-overlay/libc/genode_rel.ld +++ /dev/null @@ -1,261 +0,0 @@ -/* - * \brief Linker script for libraries - * \author Sebastian Sumpf - * \date 2009-11-05 - * - * Script for --shared -z combreloc: shared library, combine & sort relocs - */ - -/* - * Copyright (C) 2009-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -PHDRS -{ - ro PT_LOAD; - rw PT_LOAD; - dynamic PT_DYNAMIC; - eh_frame PT_GNU_EH_FRAME; -} - -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - .note.gnu.build-id : { *(.note.gnu.build-id) } : ro - .hash : { *(.hash) } - .gnu.hash : { *(.gnu.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.dyn : - { - *(.rel.init) - *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) - *(.rel.fini) - *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) - *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*) - *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) - *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) - *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) - *(.rel.ctors) - *(.rel.dtors) - *(.rel.got) - *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) - } - .rela.dyn : - { - *(.rela.init) - *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) - *(.rela.fini) - *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) - *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) - *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) - *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) - *(.rela.ctors) - *(.rela.dtors) - *(.rela.got) - *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) - } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - .init : - { - KEEP (*(.init)) - } = 0x0 - .plt : { *(.plt) } - .text : - { - *(.text .stub .text.* .gnu.linkonce.t.*) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - } = 0x0 - .fini : - { - KEEP (*(.fini)) - } =0x0 - PROVIDE (__etext = .); - PROVIDE (_etext = .); - PROVIDE (etext = .); - .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } - .rodata1 : { *(.rodata1) } - - .eh_frame_hdr : { *(.eh_frame_hdr) } : eh_frame : ro - .gcc_except_table : { *(.gcc_except_table .gcc_except_table.*) } - - /* - * Adjust the address for the data segment. We want to adjust up to - * the same address within the page on the next page up. - */ - . = ALIGN(0x1000); - - .data : - { - /* - * Leave space for parent capability parameters at start of data - * section. The protection domain creator is reponsible for storing - * sane values here. - */ - _parent_cap = .; - _parent_cap_thread_id = .; - LONG(0xffffffff); - _parent_cap_local_name = .; - LONG(0xffffffff); - LONG(0xffffffff); - LONG(0xffffffff); - LONG(0xffffffff); - LONG(0xffffffff); - LONG(0xffffffff); - LONG(0xffffffff); - - /* - * Platform-specific entry for Fiasco.OC. - * - * PIC-code compiled for Fiasco.OC, needs some PIC-compatible - * way to enter the kernel, the fixed address of the kernel - * entry code address needs to be found here. - */ - __l4sys_invoke_indirect = .; - LONG(0xeacff000); - - *(.data .data.* .gnu.linkonce.d.*) - SORT(CONSTRUCTORS) - } : rw - - /* .ARM.exidx is sorted, so has to go in its own output section */ - .ARM.extab : { - *(.ARM.extab*) - } - __exidx_start = .; - .ARM.exidx : { - *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } - __exidx_end = .; - - /* Thread Local Storage sections */ - .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } - .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } - - .preinit_array : - { - KEEP (*(.preinit_array)) - } - .fini_array : - { - KEEP (*(.fini_array)) - KEEP (*(SORT(.fini_array.*))) - } - .ctors : - { - /* - * gcc uses crtbegin.o to find the start of the constructors, so we make - * sure it is first. Because this is a wildcard, it doesn't matter if the - * user does not actually link against crtbegin.o; the linker won't look - * for a file to match a wildcard. The wildcard also means that it - * doesn't matter which directory crtbegin.o is in. - * */ - /* KEEP (*crtbegin.o(.ctors)) - KEEP (*crtbegin?.o(.ctors))*/ - /* - * We don't want to include the .ctor section from the crtend.o file until - * after the sorted ctors. The .ctor section from the crtend file contains - * the end of ctors marker and it must be last - */ - KEEP(*(_mark_ctors_start)); - _ctors_start = .; - KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - KEEP (*(.init_array)) /* list of constructors specific for ARM eabi */ - _ctors_end = .; - KEEP(*(_mark_ctors_end)); - - } - .dtors : - { - PROVIDE(_dtors_start = .); - KEEP (*crtbegin.o(.dtors)) - KEEP (*crtbegin?.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - PROVIDE(_dtors_end = .); - } - .jcr : { KEEP (*(.jcr)) } - .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) } - - .data1 : { *(.data1) } - .dynamic : { *(.dynamic) } : dynamic : rw - /* See: genode_dyn.ld */ - .got : { *(.got.plt) *(.got) } - /* Exception handling */ - .eh_frame : - { - __eh_frame_start__ = .; - KEEP (*(.eh_frame)) - LONG(0) - } - _edata = .; PROVIDE (edata = .); - __bss_start = .; - .bss : - { - *(.dynbss) - *(.bss .bss.* .gnu.linkonce.b.*) - *(COMMON) - - /* - * Align here to ensure that the .bss section occupies space up to - * _end. Align after .bss to ensure correct alignment even if the - * .bss section disappears because there are no input sections. - * - * FIXME: Why do we need it? When there is no .bss section, we don't - * pad the .data section. - */ - . = ALIGN(. != 0 ? 32 / 8 : 1); - } - . = ALIGN(32 / 8); - . = ALIGN(32 / 8); - _end = .; PROVIDE (end = .); - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - /* DWARF 3 */ - .debug_pubtypes 0 : { *(.debug_pubtypes) } - .debug_ranges 0 : { *(.debug_ranges) } - .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) } - /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) } -} diff --git a/toolchain-overlay/libc/libc-builder.sh b/toolchain-overlay/libc/libc-builder.sh deleted file mode 100755 index 4c21dac..0000000 --- a/toolchain-overlay/libc/libc-builder.sh +++ /dev/null @@ -1,287 +0,0 @@ -source $stdenv/setup - -export includedir=${dev}/include -export pkgconfigdir=${out}/lib/pkgconfig - -compileStub() { - local ASM_SYM_DEPENDENCY="movq \1@GOTPCREL(%rip), %rax" - # TODO: .long \1 - - sed \ - -e "s/^\(\w\+\) D \(\w\+\)\$/.data; .global \1; .type \1,%object; .size \1,\2; \1:/" \ - -e "s/^\(\w\+\) V/.data; .weak \1; .type \1,%object; \1:/" \ - -e "s/^\(\w\+\) T/.text; .global \1; .type \1,%function; \1:/" \ - -e "s/^\(\w\+\) R \(\w\+\)\$/.section .rodata; .global \1; .type \1,%object; .size \1,\2; \1:/" \ - -e "s/^\(\w\+\) W/.text; .weak \1; .type \1,%function; \1:/" \ - -e "s/^\(\w\+\) B \(\w\+\)\$/.bss; .global \1; .type \1,%object; .size \1,\2; \1:/" \ - -e "s/^\(\w\+\) U/.text; .global \1; ${ASM_SYM_DEPENDENCY}/" \ - $1 > symbols.s - - $CC -x assembler -c symbols.s -o tmp.o - - $LD -o $2 \ - -shared \ - -T$ldScriptSo \ - tmp.o - - rm tmp.o symbols.s -} - - -# Add a prefix to the following arguments -# -addPrefix() { - local prefix=$1 - local files="" - - for (( i = 2; i <= $#; i++)); do - files="$files $prefix${!i}" - done - echo -n $files -} - -# -# Copy into dest the following arguments, -# rooted at $includedir -# -copyIncludes() { - local to=$1; shift - local from=$1; shift - - mkdir -p $to - for i in $*; do - cp $from/$i $to/ - done -} - - -# -# CPU-architecture-specific headers -# -# The 'common_include_*_content' functions take the CPU architecture as first -# argument. -# - -common_include_libc_arch_content() { - local content - for i in stdarg.h float.h - do content="$content sys/$1/include/$i"; done - - for i in arith.h _fpmath.h SYS.h gd_qnan.h - do content="$content lib/libc/$2/$i"; done - - echo -n $content -} - -common_include_libc_arch_machine_content() { - for i in \ - _types.h endian.h _limits.h signal.h trap.h _stdint.h \ - sysarch.h ieeefp.h frame.h vm.h \ - cpufunc.h vmparam.h atomic.h elf.h exec.h reloc.h pmap.h \ - ucontext.h setjmp.h asm.h param.h _inttypes.h _align.h float.h - do echo sys/$1/include/$i; done -} - -rpcgen_() { - rpcgen -C -h -DWANT_NFS3 $1 -o $2 -} - - -installPhase() { - mkdir -p $includedir/machine - - # - # CPU-architecture-specific headers - # - - # - # x86-specific headers - # - if [ -n "${isx86:-}" ]; then - cp lib/msun/x86/fenv.h $includedir - cp -r sys/x86/include $includedir/x86 - fi - - # - # i386-specific headers - # - if [ -n "${isx86_32:-}" ]; then - cp \ - $(common_include_libc_arch_content i386 i386) \ - $includedir - - cp \ - $(common_include_libc_arch_machine_content i386) \ - sys/i386/include/specialreg.h \ - sys/i386/include/npx.h \ - $includedir/machine - fi - - # - # AMD64-specific headers - # - if [ -n "${isx86_64:-}" ]; then - cp \ - $(common_include_libc_arch_content amd64 amd64) \ - $includedir - - cp \ - $(common_include_libc_arch_machine_content amd64) \ - sys/amd64/include/specialreg.h \ - sys/amd64/include/fpu.h \ - $includedir/machine - fi - - # - # ARM-specific headers - # - if [ -n "${isAarch32:-}" ]; then - cp \ - $(common_include_libc_arch_content arm arm) \ - lib/msun/arm/fenv.h \ - $includedir - - cp \ - $(common_include_libc_arch_machine_content arm) \ - $includedir/machine - - copyIncludes $includedir/machine sys/arm/include \ - armreg.h atomic-v6.h ieee.h sysreg.h - fi - - # - # ARM64-specific headers - # - if [ -n "${isAarch32:-}" ]; then - cp \ - $(common_include_libc_arch_content arm64 aarch64) \ - lib/msun/aarch64/fenv.h \ - $includedir - - cp \ - $(common_include_libc_arch_machine_content arm64) \ - $includedir/machine - - copyIncludes $includedir/machine sys/arm64/include/ \ - armreg.h - fi - - - ############################################################## - - flex -P_nsyy -t lib/libc/net/nslexer.l \ - | sed -e '/YY_BUF_SIZE/s/16384/1024/' \ - > lib/libc/net/nslexer.c - - bison -d -p_nsyy lib/libc/net/nsparser.y \ - --defines=lib/libc/net/nsparser.h \ - --output=lib/libc/net/nsparser.c - - local generated_files="include/rpc/rpcb_prot.h" - for h in \ - bootparam_prot.h nfs_prot.h nlm_prot.h rstat.h ypupdate_prot.h \ - crypt.h nis_cache.h pmap_prot.h rwall.h yp.h \ - key_prot.h nis_callback.h rex.h sm_inter.h ypxfrd.h \ - klm_prot.h nis_object.h rnusers.h spray.h \ - mount.h nis.h rquota.h yppasswd.h - do generated_files="$generated_files include/rpcsvc/$h"; done - - for file in $generated_files; do - rpcgen -C -h -DWANT_NFS3 ${file%h}x -o $file - done - - - # - # Generic headers - # - copyIncludes $includedir include \ - strings.h limits.h string.h ctype.h _ctype.h \ - stdlib.h stdio.h signal.h unistd.h wchar.h time.h sysexits.h \ - resolv.h wctype.h locale.h langinfo.h regex.h paths.h ieeefp.h \ - inttypes.h fstab.h netdb.h ar.h memory.h res_update.h \ - netconfig.h ifaddrs.h pthread.h err.h getopt.h search.h \ - varargs.h stddef.h stdbool.h assert.h monetary.h printf.h \ - libgen.h dirent.h dlfcn.h link.h fmtmsg.h fnmatch.h fts.h ftw.h \ - db.h grp.h nsswitch.h pthread_np.h pwd.h ttyent.h \ - stringlist.h glob.h a.out.h elf-hints.h nlist.h spawn.h \ - readpassphrase.h setjmp.h elf.h ulimit.h utime.h wordexp.h \ - complex.h semaphore.h uchar.h iconv.h termios.h \ - xlocale.h runetype.h \ - - copyIncludes $includedir sys/sys \ - syslog.h fcntl.h stdint.h sched.h ktrace.h _semaphore.h ucontext.h errno.h - - cp lib/msun/src/math.h $includedir - cp contrib/libc-vis/vis.h $includedir - - copyIncludes $includedir/rpc include/rpc \ - rpc.h xdr.h auth.h clnt_stat.h clnt.h clnt_soc.h rpc_msg.h \ - auth_unix.h auth_des.h svc.h svc_soc.h svc_auth.h pmap_clnt.h \ - pmap_prot.h rpcb_clnt.h rpcent.h des_crypt.h des.h nettype.h \ - rpcsec_gss.h raw.h rpc_com.h - - cp sys/rpc/rpcb_prot.h $includedir/rpc - - copyIncludes $includedir/rpcsvc include/rpcsvc \ - yp_prot.h ypclnt.h nis_tags.h nislib.h - - rpcgen_ include/rpcsvc/nis.x $includedir/rpcsvc/nis.h - rpcgen_ include/rpcsvc/crypt.x $includedir/rpcsvc/crypt.h - - mkdir $includedir/gssapi - cp include/gssapi/gssapi.h $includedir/gssapi - - copyIncludes $includedir/arpa include/arpa \ - inet.h ftp.h nameser.h nameser_compat.h telnet.h tftp.h - - copyIncludes $includedir/vm sys/vm vm_param.h vm.h pmap.h - - copyIncludes $includedir/net sys/net \ - if.h if_dl.h if_tun.h if_types.h radix.h route.h - - copyIncludes $includedir/netinet sys/netinet \ - in.h in_systm.h ip.h tcp.h - - mkdir -p $includedir/netinet6 - cp sys/netinet6/in6.h $includedir/netinet6 - - mkdir -p $includedir/bsm - cp sys/bsm/audit.h $includedir/bsm - - copyIncludes $includedir/sys sys/sys \ - _types.h limits.h cdefs.h _null.h types.h _pthreadtypes.h \ - syslimits.h select.h _sigset.h _timeval.h timespec.h \ - _timespec.h stat.h signal.h unistd.h time.h param.h stdint.h \ - event.h eventhandler.h disk.h errno.h poll.h queue.h mman.h \ - stddef.h sysctl.h uio.h _iovec.h ktrace.h ioctl.h ttycom.h \ - ioccom.h filio.h sockio.h wait.h file.h fcntl.h resource.h \ - disklabel.h link_elf.h endian.h mount.h ucred.h dirent.h \ - cpuset.h socket.h un.h ttydefaults.h imgact_aout.h elf32.h \ - elf64.h elf_generic.h elf_common.h nlist_aout.h ipc.h sem.h \ - exec.h _lock.h _mutex.h statvfs.h ucontext.h syslog.h times.h \ - utsname.h elf.h mtio.h _stdint.h atomic_common.h _ucontext.h \ - _cpuset.h _bitset.h bitset.h _stdarg.h _uio.h auxv.h random.h \ - _sockaddr_storage.h termios.h _termios.h _umtx.h kerneldump.h \ - conf.h disk_zone.h counter.h time.h \ - - mkdir $includedir/sys/rpc - cp sys/rpc/types.h $includedir/sys/rpc - - cp -r include/xlocale $includedir/ - - ln -s sys/poll.h $includedir/poll.h - - rm -r include # Don't need this anymore - - cp -r $genodeHeaders/include/* $includedir/ - - mkdir -p $pkgconfigdir - substituteAll $libcPcIn $pkgconfigdir/libc.pc - compileStub $libcSymbols $out/lib/libc.lib.so - ln -s $out/lib/libc.lib.so $out/lib/libc.so - ln -s $out/lib $out/lib64 - -} - - -genericBuild diff --git a/toolchain-overlay/libc/libc.pc.in b/toolchain-overlay/libc/libc.pc.in deleted file mode 100644 index 5f3521f..0000000 --- a/toolchain-overlay/libc/libc.pc.in +++ /dev/null @@ -1,8 +0,0 @@ -Name: libc -Description: Genode C runtime library -URL: https://genode.org/ -Version: @version@ -Requires: genode-libports -Requires.private: vfs -Cflags: -D__FreeBSD__=12 -D__GENODE__ -fno-builtin-sin -fno-builtin-cos -fno-builtin-sinf -fno-builtin-cosf -I@includedir@ -Libs: -l:libc.lib.so diff --git a/toolchain-overlay/libc/libc.symbols b/toolchain-overlay/libc/libc.symbols deleted file mode 100644 index 4b8fd9b..0000000 --- a/toolchain-overlay/libc/libc.symbols +++ /dev/null @@ -1,1057 +0,0 @@ -___runetype T -___tolower T -___toupper T -__assert T -__dn_expand T -__error T -__flt_rounds T -__fpclassifyd T -__fpclassifyf T -__has_sse D 4 -__h_errno T -__h_errno_set T -__inet_addr T -__inet_aton T -__inet_nsap_ntoa T -__inet_ntoa T -__inet_ntop T -__inet_pton T -__isthreaded B 4 -__mb_cur_max D 8 -___mb_cur_max D 50 -__res_init T -__res_query T -__res_state T -__srget T -__stderrp D 8 -__stdinp D 8 -__stdoutp D 8 -__swbuf T -__test_sse T -__xuname T -_exit T -_getlong T -_getshort T -a64l T -abort T -abs T -accept T -accept4 T -access T -alarm T -alphasort T -arc4random T -arc4random_addrandom T -arc4random_buf T -arc4random_stir T -arc4random_uniform T -asctime T -asctime_r T -asprintf T -atexit T -atof T -atoi T -atol T -atoll T -basename T -bcmp T -bcopy T -bind T -bsearch T -btowc T -bzero T -calloc T -cfgetispeed T -cfgetospeed T -cfmakeraw T -cfsetispeed T -cfsetospeed T -cfsetspeed T -cgetcap T -cgetclose T -cgetent T -cgetfirst T -cgetmatch T -cgetnext T -cgetnum T -cgetset T -cgetstr T -cgetustr T -chdir T -check_utility_compat T -chmod W -chown W -chroot W -clearerr T -clearerr_unlocked T -clock T -clock_gettime W -clock_getres W -close T -closedir T -closelog T -confstr T -connect T -creat W -crypt W -ctermid T -ctermid_r T -ctime T -ctime_r T -daemon T -dbopen W -des_cipher T -des_setkey T -difftime T -digittoint T -dirname T -div T -dl_iterate_phdr W -dladdr T -dlclose T -dlerror T -dlfunc T -dlinfo T -dllockinit W -dlopen T -dlsym T -dlvsym T -dprintf T -drand48 T -dup T -dup2 T -encrypt T -endfsent T -endgrent T -endnetgrent T -endpwent W -endttyent T -endusershell T -environ B 8 -erand48 T -err W -err_set_exit T -err_set_file T -errc T -errx T -execl T -execle T -execlp T -execv T -execvP T -execve T -execvp T -exit T -f_prealloc T -fchdir T -fchmod W -fchown W -fclose T -fcloseall W -fcntl T -fdatasync W -fdevname T -fdevname_r T -fdopen T -fdopendir T -feof T -feof_unlocked T -ferror T -ferror_unlocked T -fflagstostr T -fflush T -ffs T -ffsl T -ffsll T -fgetc T -fgetln T -fgetpos T -fgets T -fgetwc T -fgetwln T -fgetws T -fileno T -fileno_unlocked T -flock W -flockfile W -fls T -flsl T -flsll T -fmtcheck W -fmtmsg T -fnmatch T -fopen T -fork W -fpathconf W -fprintf T -fpurge T -fputc T -fputs T -fputwc T -fputws T -fread T -free T -freeaddrinfo T -freebsd7___semctl W -freebsd7_semctl T -freelocale T -freopen T -fscanf T -fseek T -fseeko T -fsetpos T -fstat T -fstatat T -fstatfs T -fstatvfs T -fsync T -ftell T -ftello T -ftok T -ftruncate T -ftrylockfile W -fts_children T -fts_close T -fts_get_clientptr T -fts_get_stream T -fts_open T -fts_read T -fts_set T -fts_set_clientptr T -ftw T -funlockfile W -funopen T -fwide T -fwprintf T -fwrite T -fwscanf T -gai_strerror T -getaddrinfo T -getbootfile T -getbsize T -getc T -getc_unlocked T -getchar T -getchar_unlocked T -getcontext W -getcwd T -getdelim T -getdirentries T -getdiskbyname T -getdomainname T -getdtablesize W -getegid W -getentropy W -getenv T -geteuid W -getfsent T -getfsfile T -getfsspec T -getfsstat W -getfstab T -getgid W -getgrent T -getgrent_r T -getgrgid T -getgrgid_r T -getgrnam T -getgrnam_r T -getgrouplist T -getgroups W -gethostbyaddr T -gethostbyaddr_r T -gethostbyname W -gethostid T -gethostname T -getline T -getloadavg T -getlogin T -getlogin_r T -getmntinfo T -getmode T -getnameinfo W -getnetgrent T -getopt T -getopt_long T -getopt_long_only T -getpagesize T -getpass T -getpeereid T -getpeername T -getpgrp W -getpid W -getppid W -getpriority W -getprogname W -getprotobyname T -getprotobyname_r T -getpwent W -getpwent_r W -getpwnam W -getpwnam_r W -getpwuid W -getpwuid_r W -getrandom W -getrlimit W -getrusage W -gets T -getservbyname W -getservbyport T -getservbyport_r T -getsid W -getsockname T -getsockopt T -getsubopt T -gettimeofday W -getttyent T -getttynam T -getuid W -getusershell T -getw T -getwc T -getwchar T -getwd T -glob T -globfree T -gmtime T -gmtime_r T -grantpt T -group_from_gid T -hcreate T -hdestroy T -heapsort T -hsearch T -imaxabs T -imaxdiv T -in6addr_any R 16 -in6addr_linklocal_allnodes R 16 -in6addr_loopback R 16 -in6addr_nodelocal_allnodes R 16 -index T -inet_addr W -inet_aton W -inet_lnaof W -inet_makeaddr W -inet_net_ntop W -inet_net_pton W -inet_neta W -inet_netof W -inet_network W -inet_nsap_addr W -inet_nsap_ntoa W -inet_ntoa W -inet_ntoa_r W -inet_ntop W -inet_pton W -initgroups T -initstate T -innetgr T -insque T -ioctl T -isalnum T -isalpha T -isascii T -isatty T -isblank T -iscntrl T -isdialuptty T -isdigit T -isgraph T -ishexnumber T -isideogram T -isinf W -islower T -isnan W -isnanf W -isnettty T -isnumber T -isphonogram T -isprint T -ispunct T -isrune T -issetugid T -isspace T -isspecial T -isupper T -iswalnum T -iswalpha T -iswascii T -iswblank T -iswcntrl T -iswctype T -iswdigit T -iswgraph T -iswhexnumber T -iswideogram T -iswlower T -iswnumber T -iswphonogram T -iswprint T -iswpunct T -iswrune T -iswspace T -iswspecial T -iswupper T -iswxdigit T -isxdigit T -jrand48 T -kill W -killpg T -ksem_init T -l64a T -l64a_r T -labs T -lcong48 T -ldexp T -ldiv T -lfind T -libc_select_notify V -link W -listen T -llabs T -lldiv T -localeconv T -localtime T -localtime_r T -lockf T -longjmp W -longjmperror T -lrand48 T -lsearch T -lseek T -lstat T -madvise W -makecontext W -malloc T -mblen T -mbrlen T -mbrtowc T -mbsinit T -mbsnrtowcs T -mbsrtowcs T -mbstowcs T -mbtowc T -memccpy T -memchr T -memcmp T -memcpy T -memmem T -memmove T -memrchr T -memset T -mergesort T -mkdir T -mkdtemp T -mkfifo W -mknod W -mkstemp T -mkstemps T -mktemp T -mktime T -mmap T -mprotect W -mrand48 T -msync T -munmap T -nanosleep W -clock_nanosleep W -newlocale T -nextwctype T -nftw T -nice T -nl_langinfo T -nlist T -nrand48 T -offtime T -open T -openat T -opendir T -openlog T -optarg B 8 -opterr D 4 -optind D 4 -optopt B 4 -optreset B 4 -pathconf W -pause W -pclose T -perror T -pipe T -poll W -ppoll W -popen T -posix2time T -posix_fadvise T -posix_madvise T -posix_spawn T -posix_spawn_file_actions_addclose T -posix_spawn_file_actions_adddup2 T -posix_spawn_file_actions_addopen T -posix_spawn_file_actions_destroy T -posix_spawn_file_actions_init T -posix_spawnattr_destroy T -posix_spawnattr_getflags T -posix_spawnattr_getpgroup T -posix_spawnattr_getschedparam T -posix_spawnattr_getschedpolicy T -posix_spawnattr_getsigdefault T -posix_spawnattr_getsigmask T -posix_spawnattr_init T -posix_spawnattr_setflags T -posix_spawnattr_setpgroup T -posix_spawnattr_setschedparam T -posix_spawnattr_setschedpolicy T -posix_spawnattr_setsigdefault T -posix_spawnattr_setsigmask T -posix_spawnp T -pread T -printf T -pselect W -psignal T -pthread_atfork T -pthread_attr_destroy T -pthread_attr_getdetachstate T -pthread_attr_getguardsize T -pthread_attr_getinheritsched T -pthread_attr_get_np T -pthread_attr_getschedparam T -pthread_attr_getschedpolicy T -pthread_attr_getscope T -pthread_attr_getstack T -pthread_attr_getstackaddr T -pthread_attr_getstacksize T -pthread_attr_init T -pthread_attr_setdetachstate T -pthread_attr_setguardsize T -pthread_attr_setinheritsched T -pthread_attr_setschedparam T -pthread_attr_setschedpolicy T -pthread_attr_setscope T -pthread_attr_setstackaddr T -pthread_attr_setstacksize T -pthread_cancel T -pthread_cleanup_pop T -pthread_cleanup_push T -pthread_cond_broadcast T -pthread_cond_destroy T -pthread_cond_init T -pthread_cond_signal T -pthread_cond_timedwait T -pthread_cond_wait T -pthread_condattr_destroy T -pthread_condattr_init T -pthread_condattr_setclock T -pthread_create W -pthread_detach T -pthread_equal T -pthread_exit T -pthread_getspecific T -pthread_join T -pthread_key_create T -pthread_key_delete T -pthread_kill T -pthread_main_np T -pthread_mutex_destroy T -pthread_mutex_init T -pthread_mutex_lock T -pthread_mutex_trylock T -pthread_mutex_unlock T -pthread_mutexattr_destroy T -pthread_mutexattr_init T -pthread_mutexattr_settype T -pthread_once T -pthread_rwlock_destroy T -pthread_rwlock_init T -pthread_rwlock_rdlock T -pthread_rwlock_tryrdlock T -pthread_rwlock_trywrlock T -pthread_rwlock_unlock T -pthread_rwlock_wrlock T -pthread_self T -pthread_setcancelstate T -pthread_setcanceltype T -pthread_setspecific T -pthread_sigmask T -pthread_testcancel T -ptsname T -putc T -putc_unlocked T -putchar T -putchar_unlocked T -putenv T -puts T -putw T -putwc T -putwchar T -pwrite T -qsort T -qsort_r T -radixsort T -raise W -rand T -rand_r T -random T -read T -readdir T -readdir_r T -readlink T -readpassphrase T -readv T -realloc T -reallocf T -realpath T -recv T -recvfrom T -recvmsg T -regcomp T -regerror T -regexec T -regfree T -register_printf_function T -register_printf_render T -register_printf_render_std T -remove T -remque T -rename T -rewind T -rewinddir T -rindex T -rmdir T -rpmatch T -sbrk W -scandir T -scanf T -sched_setparam W -sched_setscheduler W -sched_yield W -seed48 T -seekdir T -select W -sem_close T -semctl T -sem_destroy T -sem_getvalue T -semget W -sem_init T -sem_open T -semop W -sem_post T -sem_timedwait T -sem_trywait T -sem_unlink T -sem_wait T -send T -sendmsg W -sendto T -setbuf T -setbuffer T -setcontext W -setdomainname T -setegid W -setenv T -seteuid W -setfsent T -setfstab T -setgid W -setgrent T -setgroupent T -setgroups W -sethostid T -sethostname T -setitimer W -setjmp T -setkey T -setlinebuf T -setlocale T -setlogmask T -setmode T -setnetgrent T -setpassent W -setpgid W -setpgrp T -setpriority W -setprogname T -setpwent W -setregid W -setreuid W -setrgid T -setrlimit W -setruid T -setsid W -setsockopt T -setstate T -setttyent T -setuid W -setusershell T -setvbuf T -shutdown T -sigaction W -sigaddset T -sigblock T -sigdelset T -sigemptyset T -sigfillset T -sighold T -sigignore T -siginterrupt T -sigismember T -siglongjmp W -signal T -sigpause T -sigprocmask W -sigrelse T -sigset T -sigsetjmp T -sigsetmask T -sigsuspend W -sigvec T -sl_add T -sl_find T -sl_free T -sl_init T -sleep W -snprintf T -socket T -socketpair W -sprintf T -sradixsort T -srand T -srand48 T -sranddev T -srandom T -srandomdev T -sscanf T -stat T -statfs W -statvfs T -stpcpy T -stpncpy T -strcasecmp T -strcasestr T -strcat T -strchr T -strcmp T -strcoll T -strcpy T -strcspn T -strdup T -strerror T -strerror_r T -strfmon T -strftime T -strlcat T -strlcpy T -strlen T -strmode T -strncasecmp T -strncat T -strncmp T -strncpy T -strndup T -strnlen T -strnstr T -strpbrk T -strptime T -strrchr T -strsep T -strsignal T -strspn T -strstr T -strtod T -strtof T -strtofflags T -strtoimax T -strtok T -strtok_r W -strtol T -strtold T -strtoll T -strtonum T -strtoq T -strtoul T -strtoull T -strtoumax T -strtouq T -strunvis T -strunvisx T -strvis T -strvisx T -strxfrm T -suboptarg B 8 -swab T -swapcontext W -swprintf T -swscanf T -symlink T -sync W -sys_errlist D 776 -sys_nerr R 4 -sys_nsig R 4 -sys_siglist D 256 -sys_signame D 256 -syscall T -sysconf T -sysctl T -sysctlbyname T -sysctlnametomib T -syslog T -system W -tcdrain W -tcflow T -tcflush T -tcgetattr T -tcgetpgrp T -tcgetsid T -tcsendbreak T -tcsetattr T -tcsetpgrp T -tcsetsid T -tdelete T -telldir T -tempnam T -tfind T -time T -time2posix T -timegm T -timelocal T -timeoff T -times T -timezone T -tmpfile T -tmpnam T -toascii T -tolower T -toupper T -towctrans T -towlower T -towupper T -truncate W -tsearch T -ttyname T -ttyname_r T -ttyslot T -twalk T -tzname D 16 -tzset T -tzsetwall T -ualarm T -ulimit T -umask W -uname T -ungetc T -ungetwc T -unlink T -unlockpt T -unsetenv T -unvis T -uselocale T -user_from_uid T -usleep W -utimes W -utime W -vasprintf T -vdprintf T -verr T -verrc T -verrx T -vfork W -vfprintf T -vfscanf W -vfwprintf T -vfwscanf T -vis T -vprintf T -vscanf T -vsnprintf T -vsprintf T -vsscanf T -vswprintf T -vswscanf T -vsyslog T -vwarn T -vwarnc T -vwarnx T -vwprintf T -vwscanf T -wait W -wait3 T -waitpid W -warn W -warnc T -warnx T -wcpcpy T -wcpncpy T -wcrtomb T -wcscasecmp T -wcscat T -wcschr T -wcscmp T -wcscoll T -wcscpy T -wcscspn T -wcsdup T -wcsftime T -wcslcat T -wcslcpy T -wcslen T -wcsncasecmp T -wcsncat T -wcsncmp T -wcsncpy T -wcsnlen T -wcsnrtombs T -wcspbrk T -wcsrchr T -wcsrtombs T -wcsspn T -wcsstr T -wcstod T -wcstof T -wcstoimax T -wcstok T -wcstol T -wcstold T -wcstoll T -wcstombs T -wcstoul T -wcstoull T -wcstoumax T -wcswidth T -wcsxfrm T -wctob T -wctomb T -wctrans T -wctype T -wcwidth T -wmemchr T -wmemcmp T -wmemcpy T -wmemmove T -wmemset T -wordexp T -wordfree T -wprintf T -write T -writev T -wscanf T -xsi_sigpause T - - -# -# Symbols needed by libm -# -__mb_sb_limit D 4 -_DefaultRuneLocale D 4224 -_CurrentRuneLocale D 8 -__isinf T - - -# -# Public interface between Genode-component code and the libc runtime -# -_ZN4Libc9Component9constructERNS_3EnvE U -_ZN4Libc9Component10stack_sizeEv W -_ZN4Libc30execute_in_application_contextERNS_16Application_codeE T -_ZN4Libc19Select_handler_base6selectEiR6fd_setS2_S2_ T -_ZN4Libc19Select_handler_baseC1Ev T -_ZN4Libc19Select_handler_baseC2Ev T -_ZN4Libc19Select_handler_baseD1Ev T -_ZN4Libc19Select_handler_baseD2Ev T -_ZN4Libc10resume_allEv T -_ZN4Libc7suspendERNS_15Suspend_functorEm T -_Z16pthread_registryv T -_ZN16Pthread_registry6insertEP7pthread T -_ZN16Pthread_registry6removeEP7pthread T -_ZN16Pthread_registry8containsEP7pthread T -_ZN4Libc14pthread_createEPP7pthreadPFPvS3_ES3_mPKcPN6Genode11Cpu_sessionENS8_8Affinity8LocationE T -_ZN4Libc14pthread_createEPP7pthreadRN6Genode6ThreadE T - -# -# Libc plugin interface -# -_ZN4Libc16schedule_suspendEPFvvE T -_ZN4Libc25File_descriptor_allocator15find_by_libc_fdEi T -_ZN4Libc25File_descriptor_allocator4freeEPNS_15File_descriptorE T -_ZN4Libc25File_descriptor_allocator5allocEPNS_6PluginEPNS_14Plugin_contextEi T -_ZN4Libc25file_descriptor_allocatorEv T -_ZN4Libc6Plugin10getsockoptEPNS_15File_descriptorEiiPvPj T -_ZN4Libc6Plugin10setsockoptEPNS_15File_descriptorEiiPKvj T -_ZN4Libc6Plugin11getpeernameEPNS_15File_descriptorEP8sockaddrPj T -_ZN4Libc6Plugin11getsocknameEPNS_15File_descriptorEP8sockaddrPj T -_ZN4Libc6Plugin13getdirentriesEPNS_15File_descriptorEPcmPx T -_ZN4Libc6Plugin13getdirentriesEPNS_15File_descriptorEPcmPl T -_ZN4Libc6Plugin13supports_mmapEv T -_ZN4Libc6Plugin13supports_openEPKci T -_ZN4Libc6Plugin13supports_pipeEv T -_ZN4Libc6Plugin13supports_pollEv T -_ZN4Libc6Plugin13supports_statEPKc T -_ZN4Libc6Plugin14supports_mkdirEPKct T -_ZN4Libc6Plugin14supports_rmdirEPKc T -_ZN4Libc6Plugin15supports_accessEPKci T -_ZN4Libc6Plugin15supports_execveEPKcPKPcS5_ T -_ZN4Libc6Plugin15supports_renameEPKcS2_ T -_ZN4Libc6Plugin15supports_selectEiP6fd_setS2_S2_P7timeval T -_ZN4Libc6Plugin15supports_socketEiii T -_ZN4Libc6Plugin15supports_unlinkEPKc T -_ZN4Libc6Plugin16supports_symlinkEPKcS2_ T -_ZN4Libc6Plugin17supports_readlinkEPKcPcj T -_ZN4Libc6Plugin17supports_readlinkEPKcPcm T -_ZN4Libc6Plugin3dupEPNS_15File_descriptorE T -_ZN4Libc6Plugin4bindEPNS_15File_descriptorEPK8sockaddrj T -_ZN4Libc6Plugin4dup2EPNS_15File_descriptorES2_ T -_ZN4Libc6Plugin4mmapEPvmiiPNS_15File_descriptorEx T -_ZN4Libc6Plugin4mmapEPvmiiPNS_15File_descriptorEl T -_ZN4Libc6Plugin4openEPKci T -_ZN4Libc6Plugin4pipeEPPNS_15File_descriptorE T -_ZN4Libc6Plugin4pollERNS_15File_descriptorER6pollfd T -_ZN4Libc6Plugin4readEPNS_15File_descriptorEPvj T -_ZN4Libc6Plugin4readEPNS_15File_descriptorEPvm T -_ZN4Libc6Plugin4recvEPNS_15File_descriptorEPvji T -_ZN4Libc6Plugin4recvEPNS_15File_descriptorEPvmi T -_ZN4Libc6Plugin4sendEPNS_15File_descriptorEPKvji T -_ZN4Libc6Plugin4sendEPNS_15File_descriptorEPKvmi T -_ZN4Libc6Plugin4statEPKcP4stat T -_ZN4Libc6Plugin5closeEPNS_15File_descriptorE T -_ZN4Libc6Plugin5fcntlEPNS_15File_descriptorEil T -_ZN4Libc6Plugin5fstatEPNS_15File_descriptorEP4stat T -_ZN4Libc6Plugin5fsyncEPNS_15File_descriptorE T -_ZN4Libc6Plugin5ioctlEPNS_15File_descriptorEiPc T -_ZN4Libc6Plugin5lseekEPNS_15File_descriptorEli T -_ZN4Libc6Plugin5lseekEPNS_15File_descriptorExi T -_ZN4Libc6Plugin5mkdirEPKct T -_ZN4Libc6Plugin5msyncEPvmi T -_ZN4Libc6Plugin5rmdirEPKc T -_ZN4Libc6Plugin5writeEPNS_15File_descriptorEPKvj T -_ZN4Libc6Plugin5writeEPNS_15File_descriptorEPKvm T -_ZN4Libc6Plugin6acceptEPNS_15File_descriptorEP8sockaddrPj T -_ZN4Libc6Plugin6accessEPKci T -_ZN4Libc6Plugin6execveEPKcPKPcS5_ T -_ZN4Libc6Plugin6listenEPNS_15File_descriptorEi T -_ZN4Libc6Plugin6munmapEPvj T -_ZN4Libc6Plugin6munmapEPvm T -_ZN4Libc6Plugin6renameEPKcS2_ T -_ZN4Libc6Plugin6selectEiP6fd_setS2_S2_P7timeval T -_ZN4Libc6Plugin6sendtoEPNS_15File_descriptorEPKvjiPK8sockaddrj T -_ZN4Libc6Plugin6sendtoEPNS_15File_descriptorEPKvmiPK8sockaddrj T -_ZN4Libc6Plugin6socketEiii T -_ZN4Libc6Plugin6unlinkEPKc T -_ZN4Libc6Plugin7connectEPNS_15File_descriptorEPK8sockaddrj T -_ZN4Libc6Plugin7fstatfsEPNS_15File_descriptorEP6statfs T -_ZN4Libc6Plugin7recvmsgEPNS_15File_descriptorEP6msghdri T -_ZN4Libc6Plugin7symlinkEPKcS2_ T -_ZN4Libc6Plugin8priorityEv T -_ZN4Libc6Plugin8readlinkEPKcPcj T -_ZN4Libc6Plugin8readlinkEPKcPcm T -_ZN4Libc6Plugin8recvfromEPNS_15File_descriptorEPvjiP8sockaddrPj T -_ZN4Libc6Plugin8recvfromEPNS_15File_descriptorEPvmiP8sockaddrPj T -_ZN4Libc6Plugin8shutdownEPNS_15File_descriptorEi T -_ZN4Libc6Plugin9ftruncateEPNS_15File_descriptorEl T -_ZN4Libc6Plugin9ftruncateEPNS_15File_descriptorEx T -_ZN4Libc6Plugin10resume_allEv T -_ZN4Libc6PluginC1Ei T -_ZN4Libc6PluginC2Ei T -_ZN4Libc6PluginD0Ev T -_ZN4Libc6PluginD1Ev T -_ZN4Libc6PluginD2Ev T -_ZN4Libc9mem_allocEv T -_ZTIN4Libc6PluginE D 40 diff --git a/toolchain-overlay/libc/log2.patch b/toolchain-overlay/libc/log2.patch deleted file mode 100644 index 950e558..0000000 --- a/toolchain-overlay/libc/log2.patch +++ /dev/null @@ -1,20 +0,0 @@ -- add 'log2()' and 'log2f()' declarations -- this patch is only needed for FreeBSD libc versions < 9 - -+++ src/lib/libc/lib/msun/src/math.h -@@ -204,6 +204,7 @@ - double ldexp(double, int); - double log(double); - double log10(double); -+double log2(double); - double modf(double, double *); /* fundamentally !__pure2 */ - - double pow(double, double); -@@ -317,6 +318,7 @@ - int ilogbf(float) __pure2; - float ldexpf(float, int); - float log10f(float); -+float log2f(float); - float log1pf(float); - float logf(float); - float modff(float, float *); /* fundamentally !__pure2 */ diff --git a/toolchain-overlay/libc/mktime.patch b/toolchain-overlay/libc/mktime.patch deleted file mode 100644 index 0860f3e..0000000 --- a/toolchain-overlay/libc/mktime.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/src/lib/libc/contrib/tzcode/stdtime/localtime.c b/src/lib/libc/contrib/tzcode/stdtime/localtime.c -index 3c66924..05c01ae 100644 ---- src/lib/libc/contrib/tzcode/stdtime/localtime.c -+++ src/lib/libc/contrib/tzcode/stdtime/localtime.c -@@ -1935,6 +1935,10 @@ time2sub(struct tm *const tmp, - lo *= 2; - hi = -(lo + 1); - } -+ -+ lo = TIME_T_MIN; -+ hi = TIME_T_MAX; -+ - for ( ; ; ) { - t = lo / 2 + hi / 2; - if (t < lo) -diff --git a/src/lib/libc/contrib/tzcode/stdtime/private.h b/src/lib/libc/contrib/tzcode/stdtime/private.h -index 354a78b..8300ba0 100644 ---- src/lib/libc/contrib/tzcode/stdtime/private.h -+++ src/lib/libc/contrib/tzcode/stdtime/private.h -@@ -251,6 +251,24 @@ const char * scheck(const char * string, const char * format); - 1 + TYPE_SIGNED(type)) - #endif /* !defined INT_STRLEN_MAXIMUM */ - -+#define TWOS_COMPLEMENT(t) ((t) ~ (t) 0 < 0) -+ -+/* Max and min values of the integer type T, of which only the bottom -+ B bits are used, and where the highest-order used bit is considered -+ to be a sign bit if T is signed. */ -+#define MAXVAL(t, b) \ -+ ((t) (((t) 1 << ((b) - 1 - TYPE_SIGNED(t))) \ -+ - 1 + ((t) 1 << ((b) - 1 - TYPE_SIGNED(t))))) -+#define MINVAL(t, b) \ -+ ((t) (TYPE_SIGNED(t) ? - TWOS_COMPLEMENT(t) - MAXVAL(t, b) : 0)) -+ -+/* The extreme time values, assuming no padding. */ -+#define TIME_T_MIN_NO_PADDING MINVAL(time_t, TYPE_BIT(time_t)) -+#define TIME_T_MAX_NO_PADDING MAXVAL(time_t, TYPE_BIT(time_t)) -+ -+# define TIME_T_MIN TIME_T_MIN_NO_PADDING -+# define TIME_T_MAX TIME_T_MAX_NO_PADDING -+ - /* - ** INITIALIZE(x) - */ diff --git a/toolchain-overlay/libc/printfcommon.patch b/toolchain-overlay/libc/printfcommon.patch deleted file mode 100644 index 301d5af..0000000 --- a/toolchain-overlay/libc/printfcommon.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/lib/libc/lib/libc/stdio/printfcommon.h.orig 2019-04-16 12:35:21.549592905 +0200 -+++ src/lib/libc/lib/libc/stdio/printfcommon.h 2019-04-16 12:35:34.163738398 +0200 -@@ -47,9 +47,6 @@ - - #ifndef NO_FLOATING_POINT - --#define dtoa __dtoa --#define freedtoa __freedtoa -- - #include - #include - #include "floatio.h" diff --git a/toolchain-overlay/libc/rcmd.patch b/toolchain-overlay/libc/rcmd.patch deleted file mode 100644 index c69adf2..0000000 --- a/toolchain-overlay/libc/rcmd.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- src/lib/libc/include/unistd.h -+++ src/lib/libc/include/unistd.h -@@ -510,8 +510,6 @@ - int getresuid(uid_t *, uid_t *, uid_t *); - char *getusershell(void); - int initgroups(const char *, gid_t); --int iruserok(unsigned long, int, const char *, const char *); --int iruserok_sa(const void *, int, int, const char *, const char *); - int issetugid(void); - long lpathconf(const char *, int); - #ifndef _MKDTEMP_DECLARED -@@ -533,20 +531,12 @@ - #endif - int nfssvc(int, void *); - int profil(char *, size_t, vm_offset_t, int); --int rcmd(char **, int, const char *, const char *, const char *, int *); --int rcmd_af(char **, int, const char *, -- const char *, const char *, int *, int); --int rcmdsh(char **, int, const char *, -- const char *, const char *, const char *); - char *re_comp(const char *); - int re_exec(const char *); - int reboot(int); - int revoke(const char *); - pid_t rfork(int); - pid_t rfork_thread(int, void *, int (*)(void *), void *); --int rresvport(int *); --int rresvport_af(int *, int); --int ruserok(const char *, int, const char *, const char *); - #if __BSD_VISIBLE - #ifndef _SELECT_DECLARED - #define _SELECT_DECLARED diff --git a/toolchain-overlay/libc/res_init_c.patch b/toolchain-overlay/libc/res_init_c.patch deleted file mode 100644 index 4eb8d7b..0000000 --- a/toolchain-overlay/libc/res_init_c.patch +++ /dev/null @@ -1,125 +0,0 @@ ---- src/lib/libc/lib/libc/resolv/res_init.c.old 2019-05-07 11:26:07.854155106 +0200 -+++ src/lib/libc/lib/libc/resolv/res_init.c 2019-05-07 11:26:18.499341340 +0200 -@@ -93,18 +93,7 @@ - #include - #include - --#ifndef HAVE_MD5 --# include "../dst/md5.h" --#else --# ifdef SOLARIS2 --# include --# elif _LIBC --# include --# endif --#endif --#ifndef _MD5_H_ --# define _MD5_H_ 1 /*%< make sure we do not include rsaref md5.h file */ --#endif -+#include - - #include "un-namespace.h" - -@@ -169,6 +158,10 @@ - return (__res_vinit(statp, 0)); - } - -+ -+extern char const *libc_resolv_path; -+ -+ - /*% This function has to be reachable by res_data.c but not publicly. */ - int - __res_vinit(res_state statp, int preinit) { -@@ -325,7 +318,7 @@ - line[sizeof(name) - 1] == '\t')) - - nserv = 0; -- if ((fp = fopen(_PATH_RESCONF, "re")) != NULL) { -+ if ((fp = fopen(libc_resolv_path, "re")) != NULL) { - struct stat sb; - struct timespec now; - -@@ -339,6 +332,45 @@ - } - - /* read the config file */ -+#if 1 -+ if (fgets(buf, sizeof(buf), fp) != NULL) { -+ /* read nameservers to query */ -+ struct addrinfo hints, *ai; -+ char sbuf[NI_MAXSERV]; -+ const size_t minsiz = sizeof(statp->_u._ext.ext->nsaddrs[0]); -+ -+ cp = buf; -+ cp[strcspn(cp, "\n")] = '\0'; -+ -+ if ((*cp != '\0') && (*cp != '\n')) { -+ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_family = PF_UNSPEC; -+ hints.ai_socktype = SOCK_DGRAM; /*dummy*/ -+ hints.ai_flags = AI_NUMERICHOST; -+ sprintf(sbuf, "%u", NAMESERVER_PORT); -+ -+ if (getaddrinfo(cp, sbuf, &hints, &ai) == 0 && -+ ai->ai_addrlen <= minsiz) { -+ if (statp->_u._ext.ext != NULL) { -+ memcpy(&statp->_u._ext.ext->nsaddrs[nserv], -+ ai->ai_addr, ai->ai_addrlen); -+ } -+ -+ if (ai->ai_addrlen <= -+ sizeof(statp->nsaddr_list[nserv])) { -+ memcpy(&statp->nsaddr_list[nserv], -+ ai->ai_addr, ai->ai_addrlen); -+ } else { -+ statp->nsaddr_list[nserv].sin_family = 0; -+ } -+ -+ freeaddrinfo(ai); -+ nserv++; -+ } -+ } -+ } -+#else - while (fgets(buf, sizeof(buf), fp) != NULL) { - /* skip comments */ - if (*buf == ';' || *buf == '#') -@@ -536,6 +568,7 @@ - continue; - } - } -+#endif /* 1 */ - if (nserv > 0) - statp->nscount = nserv; - #ifdef RESOLVSORT -@@ -777,25 +810,9 @@ - - u_int - res_nrandomid(res_state statp) { -- struct timeval now; -- u_int16_t u16; -- MD5_CTX ctx; -- u_char *rnd = statp->_rnd == NULL ? srnd : statp->_rnd; -- -- gettimeofday(&now, NULL); -- u16 = (u_int16_t) (now.tv_sec ^ now.tv_usec); -- memcpy(rnd + 14, &u16, 2); --#ifndef HAVE_MD5 -- MD5_Init(&ctx); -- MD5_Update(&ctx, rnd, 16); -- MD5_Final(rnd, &ctx); --#else -- MD5Init(&ctx); -- MD5Update(&ctx, rnd, 16); -- MD5Final(rnd, &ctx); --#endif -- memcpy(&u16, rnd + 14, 2); -- return ((u_int) u16); -+ u_int val; -+ getrandom(&val, sizeof(val), 0); -+ return val; - } - - /*% diff --git a/toolchain-overlay/libc/runetype.patch b/toolchain-overlay/libc/runetype.patch deleted file mode 100644 index 1e8dbec..0000000 --- a/toolchain-overlay/libc/runetype.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/lib/libc/lib/libc/locale/runetype.c.orig 2019-04-18 15:12:08.961502991 +0200 -+++ src/lib/libc/lib/libc/locale/runetype.c 2019-04-18 15:13:44.287945177 +0200 -@@ -82,10 +82,9 @@ - - int ___mb_cur_max(void) - { -- return XLOCALE_CTYPE(__get_locale())->__mb_cur_max; -+ return MB_CUR_MAX; - } - int ___mb_cur_max_l(locale_t locale) - { -- FIX_LOCALE(locale); -- return XLOCALE_CTYPE(locale)->__mb_cur_max; -+ return MB_CUR_MAX; - } diff --git a/toolchain-overlay/libc/semaphore.patch b/toolchain-overlay/libc/semaphore.patch deleted file mode 100644 index 495f080..0000000 --- a/toolchain-overlay/libc/semaphore.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/libc/include/semaphore.h 2019-04-09 14:12:29.619185765 +0200 -+++ src/lib/libc/include/semaphore.h.new 2019-04-09 14:31:35.913650094 +0200 -@@ -46,7 +46,7 @@ - __uint32_t _padding; /* Preserve structure size */ - }; - --typedef struct _sem sem_t; -+typedef struct sem* sem_t; - - #define SEM_FAILED ((sem_t *)0) - #define SEM_VALUE_MAX __INT_MAX diff --git a/toolchain-overlay/libc/thread_local.patch b/toolchain-overlay/libc/thread_local.patch deleted file mode 100644 index 89fa01b..0000000 --- a/toolchain-overlay/libc/thread_local.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/lib/libc/sys/sys/cdefs.h.orig 2019-04-16 10:50:14.382883576 +0200 -+++ src/lib/libc/sys/sys/cdefs.h 2019-04-16 10:50:34.008444965 +0200 -@@ -298,20 +298,6 @@ - #endif - #endif - --#if !__has_extension(c_thread_local) --/* -- * XXX: Some compilers (Clang 3.3, GCC 4.7) falsely announce C++11 mode -- * without actually supporting the thread_local keyword. Don't check for -- * the presence of C++11 when defining _Thread_local. -- */ --#if /* (defined(__cplusplus) && __cplusplus >= 201103L) || */ \ -- __has_extension(cxx_thread_local) --#define _Thread_local thread_local --#else --#define _Thread_local __thread --#endif --#endif -- - #endif /* __STDC_VERSION__ || __STDC_VERSION__ < 201112L */ - - /* diff --git a/toolchain-overlay/libc/types.patch b/toolchain-overlay/libc/types.patch deleted file mode 100644 index e401f6e..0000000 --- a/toolchain-overlay/libc/types.patch +++ /dev/null @@ -1,52 +0,0 @@ -Use the unified size types provided by the Genode tool chain. - -diff --git src/lib/libc/sys/arm/include/_types.h src/lib/libc/sys/arm/include/_types.h -index 3012f97..3ec5a24 100644 ---- src/lib/libc/sys/arm/include/_types.h -+++ src/lib/libc/sys/arm/include/_types.h -@@ -85,11 +85,11 @@ typedef __int8_t __int_least8_t; - typedef __int16_t __int_least16_t; - typedef __int32_t __int_least32_t; - typedef __int64_t __int_least64_t; --typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */ -+typedef __PTRDIFF_TYPE__ __ptrdiff_t; /* ptr1 - ptr2 */ - typedef __int32_t __register_t; - typedef __int32_t __segsz_t; /* segment size (in pages) */ --typedef __uint32_t __size_t; /* sizeof() */ --typedef __int32_t __ssize_t; /* byte count or error */ -+typedef __SIZE_TYPE__ __size_t; /* sizeof() */ -+typedef __PTRDIFF_TYPE__ __ssize_t; /* byte count or error */ - typedef __int64_t __time_t; /* time()... */ - typedef __uint32_t __uintfptr_t; - typedef __uint64_t __uintmax_t; -diff --git src/lib/libc/sys/x86/include/_types.h src/lib/libc/sys/x86/include/_types.h -index 07893c6..abd2ea4 100644 ---- src/lib/libc/sys/x86/include/_types.h -+++ src/lib/libc/sys/x86/include/_types.h -@@ -100,20 +100,20 @@ typedef __int16_t __int_least16_t; - typedef __int32_t __int_least32_t; - typedef __int64_t __int_least64_t; - #ifdef __LP64__ --typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */ -+typedef __PTRDIFF_TYPE__ __ptrdiff_t; /* ptr1 - ptr2 */ - typedef __int64_t __register_t; - typedef __int64_t __segsz_t; /* segment size (in pages) */ --typedef __uint64_t __size_t; /* sizeof() */ --typedef __int64_t __ssize_t; /* byte count or error */ -+typedef __SIZE_TYPE__ __size_t; /* sizeof() */ -+typedef __PTRDIFF_TYPE__ __ssize_t; /* byte count or error */ - typedef __int64_t __time_t; /* time()... */ - typedef __uint64_t __uintfptr_t; - typedef __uint64_t __uintptr_t; - #else --typedef __int32_t __ptrdiff_t; -+typedef __PTRDIFF_TYPE__ __ptrdiff_t; - typedef __int32_t __register_t; - typedef __int32_t __segsz_t; --typedef __uint32_t __size_t; --typedef __int32_t __ssize_t; -+typedef __SIZE_TYPE__ __size_t; -+typedef __PTRDIFF_TYPE__ __ssize_t; - typedef __int32_t __time_t; - typedef __uint32_t __uintfptr_t; - typedef __uint32_t __uintptr_t; diff --git a/toolchain-overlay/libc/vfwprintf_c_warn.patch b/toolchain-overlay/libc/vfwprintf_c_warn.patch deleted file mode 100644 index 0fd446a..0000000 --- a/toolchain-overlay/libc/vfwprintf_c_warn.patch +++ /dev/null @@ -1,31 +0,0 @@ -+++ src/lib/libc/lib/libc/stdio/vfwprintf.c -@@ -838,10 +838,10 @@ - sign = '-'; - if (expt == INT_MAX) { /* inf or nan */ - if (*cp == 'N') { -- cp = (ch >= 'a') ? L"nan" : L"NAN"; -+ cp = (wchar_t *)((ch >= 'a') ? L"nan" : L"NAN"); - sign = '\0'; - } else -- cp = (ch >= 'a') ? L"inf" : L"INF"; -+ cp = (wchar_t *)((ch >= 'a') ? L"inf" : L"INF"); - size = 3; - flags &= ~ZEROPAD; - break; -@@ -953,14 +953,14 @@ - case 's': - if (flags & LONGINT) { - if ((cp = GETARG(wchar_t *)) == NULL) -- cp = L"(null)"; -+ cp = (wchar_t *)(L"(null)"); - } else { - char *mbp; - - if (convbuf != NULL) - free(convbuf); - if ((mbp = GETARG(char *)) == NULL) -- cp = L"(null)"; -+ cp = (wchar_t *)(L"(null)"); - else { - convbuf = __mbsconv(mbp, prec); - if (convbuf == NULL) { diff --git a/toolchain-overlay/libc/xlocale.patch b/toolchain-overlay/libc/xlocale.patch deleted file mode 100644 index 9753875..0000000 --- a/toolchain-overlay/libc/xlocale.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- src/lib/libc/lib/libc/locale/setrunelocale.c -+++ src/lib/libc/lib/libc/locale/setrunelocale.c -@@ -60,7 +60,7 @@ extern _RuneLocale const *_CurrentRuneLocale; - /* - * A cached version of the runes for this thread. Used by ctype.h - */ --_Thread_local const _RuneLocale *_ThreadRuneLocale; -+const _RuneLocale *_ThreadRuneLocale; - #endif - - extern int __mb_sb_limit; - ---- src/lib/libc/lib/libc/locale/xlocale.c -+++ src/lib/libc/lib/libc/locale/xlocale.c -@@ -59,7 +59,7 @@ extern struct xlocale_component __xlocale_C_ctype; - /* - * The locale for this thread. - */ --_Thread_local locale_t __thread_locale; -+locale_t __thread_locale; - #endif - /* - * Flag indicating that one or more per-thread locales exist. - ---- src/lib/libc/lib/libc/locale/xlocale_private.h -+++ src/lib/libc/lib/libc/locale/xlocale_private.h -@@ -213,7 +213,7 @@ extern int __has_thread_locale; - * The per-thread locale. Avoids the need to use pthread lookup functions when - * getting the per-thread locale. - */ --extern _Thread_local locale_t __thread_locale; -+extern locale_t __thread_locale; - - /** - * Returns the current locale for this thread, or the global locale if none is diff --git a/toolchain-overlay/libc/xlocale_private.patch b/toolchain-overlay/libc/xlocale_private.patch deleted file mode 100644 index b355704..0000000 --- a/toolchain-overlay/libc/xlocale_private.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- src/lib/libc/lib/libc/locale/xlocale_private.h.orig 2019-04-18 14:31:34.331373088 +0200 -+++ src/lib/libc/lib/libc/locale/xlocale_private.h 2019-04-18 14:31:57.418620988 +0200 -@@ -166,24 +166,16 @@ - __attribute__((unused)) static void* - xlocale_retain(void *val) - { -- struct xlocale_refcounted *obj = val; -- atomic_add_long(&(obj->retain_count), 1); - return (val); - } -+ - /** - * Decrements the reference count of a reference-counted structure, freeing it - * if this is the last reference, calling its destructor if it has one. - */ - __attribute__((unused)) static void - xlocale_release(void *val) --{ -- struct xlocale_refcounted *obj = val; -- long count; -- -- count = atomic_fetchadd_long(&(obj->retain_count), -1) - 1; -- if (count < 0 && obj->destructor != NULL) -- obj->destructor(obj); --} -+{ } - - /** - * Load functions. Each takes the name of a locale and a pointer to the data -@@ -223,27 +215,15 @@ - */ - static inline locale_t __get_locale(void) - { -- -- if (!__has_thread_locale) { -- return (&__xlocale_global_locale); -- } -- return (__thread_locale ? __thread_locale : &__xlocale_global_locale); -+ return (&__xlocale_global_locale); - } - #else - locale_t __get_locale(void); - #endif - --/** -- * Two magic values are allowed for locale_t objects. NULL and -1. This -- * function maps those to the real locales that they represent. -- */ - static inline locale_t get_real_locale(locale_t locale) - { -- switch ((intptr_t)locale) { -- case 0: return (&__xlocale_C_locale); -- case -1: return (&__xlocale_global_locale); -- default: return (locale); -- } -+ return &__xlocale_global_locale; - } - - /** diff --git a/toolchain-overlay/libc/xprintf_float.patch b/toolchain-overlay/libc/xprintf_float.patch deleted file mode 100644 index f44cb7a..0000000 --- a/toolchain-overlay/libc/xprintf_float.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/lib/libc/lib/libc/stdio/xprintf_float.c.orig 2019-04-16 12:34:20.167688219 +0200 -+++ src/lib/libc/lib/libc/stdio/xprintf_float.c 2019-04-16 12:34:01.986830677 +0200 -@@ -42,9 +42,6 @@ - #include - #include - --#define dtoa __dtoa --#define freedtoa __freedtoa -- - #include - #include - #include "gdtoa.h"