diff --git a/.gitignore b/.gitignore index db57e0b6..44f99e70 100644 --- a/.gitignore +++ b/.gitignore @@ -47,41 +47,6 @@ /libc/include/Makefile.in /tests/Makefile.in -######################## -# To build out of root # -######################## - -/build/dev-native/* -!/build/dev-native/config -/build/dev-cross-i386/* -!/build/dev-cross-i386/config -/build/dev-cross-riscv64/* -!/build/dev-cross-riscv64/config -/build/dev-cross-x86_64/* -!/build/dev-cross-x86_64/config - -/build/root-native/* -!/build/root-native/config -/build/root-cross-i386-linux/* -!/build/root-cross-i386-linux/config -/build/root-cross-riscv64-linux/* -!/build/root-cross-riscv64-linux/config -/build/root-cross-x86_64-linux/* -!/build/root-cross-x86_64-linux/config - -########################## -# To install out of root # -########################## - -/dest/dev-native/* -!/dest/dev-native/.keep -/dest/dev-cross-i386/* -!/dest/dev-cross-i386/.keep -/dest/dev-cross-riscv64/* -!/dest/dev-cross-riscv64/.keep -/dest/dev-cross-x86_64/* -!/dest/dev-cross-x86_64/.keep - ########################################### # Only generated when configuring in root # ########################################### diff --git a/.gitmodules b/.gitmodules index 1bbbb8cc..0f7ea813 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "vendor/cross"] - path = vendor/cross - url = https://github.com/tailix/cross.git - ignore = dirty [submodule "vendor/mruby"] path = vendor/mruby url = https://github.com/mruby/mruby.git diff --git a/build/dev-cross-i386/config b/build/dev-cross-i386/config deleted file mode 120000 index 0e9b48d8..00000000 --- a/build/dev-cross-i386/config +++ /dev/null @@ -1 +0,0 @@ -../../config/dev-cross-i386 \ No newline at end of file diff --git a/build/dev-cross-riscv64/config b/build/dev-cross-riscv64/config deleted file mode 120000 index c91bd524..00000000 --- a/build/dev-cross-riscv64/config +++ /dev/null @@ -1 +0,0 @@ -../../config/dev-cross-riscv64 \ No newline at end of file diff --git a/build/dev-cross-x86_64/config b/build/dev-cross-x86_64/config deleted file mode 120000 index 0f9e3c20..00000000 --- a/build/dev-cross-x86_64/config +++ /dev/null @@ -1 +0,0 @@ -../../config/dev-cross-x86_64 \ No newline at end of file diff --git a/build/dev-native/config b/build/dev-native/config deleted file mode 120000 index fa742258..00000000 --- a/build/dev-native/config +++ /dev/null @@ -1 +0,0 @@ -../../config/dev-native \ No newline at end of file diff --git a/build/root-cross-i386-linux/config b/build/root-cross-i386-linux/config deleted file mode 120000 index a1856e14..00000000 --- a/build/root-cross-i386-linux/config +++ /dev/null @@ -1 +0,0 @@ -../../config/root-cross-i386-linux \ No newline at end of file diff --git a/build/root-cross-riscv64-linux/config b/build/root-cross-riscv64-linux/config deleted file mode 120000 index 1c9350e9..00000000 --- a/build/root-cross-riscv64-linux/config +++ /dev/null @@ -1 +0,0 @@ -../../config/root-cross-riscv64-linux \ No newline at end of file diff --git a/build/root-cross-x86_64-linux/config b/build/root-cross-x86_64-linux/config deleted file mode 120000 index 91b51791..00000000 --- a/build/root-cross-x86_64-linux/config +++ /dev/null @@ -1 +0,0 @@ -../../config/root-cross-x86_64-linux \ No newline at end of file diff --git a/build/root-native/config b/build/root-native/config deleted file mode 120000 index ff85f848..00000000 --- a/build/root-native/config +++ /dev/null @@ -1 +0,0 @@ -../../config/root-native \ No newline at end of file diff --git a/config/dev-cross-i386 b/config/dev-cross-i386 deleted file mode 100755 index 70ecef7c..00000000 --- a/config/dev-cross-i386 +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -set -eux - -REPO="$(realpath "$(dirname "$(realpath "$0")")/..")" -if [ -f "$REPO/Makefile" ]; then make -C "$REPO" distclean; fi - -ARCH='i386' -HOST="$ARCH-elf" -PREFIX="$REPO/dest/dev-cross-$ARCH" -CROSS="$REPO/vendor/cross/root/bin/$HOST" - -export AR="$CROSS-ar" -export CC="$CROSS-gcc" -export RANLIB="$CROSS-ranlib" - -"$REPO/configure" --host="$HOST" --prefix="$PREFIX" --enable-freestanding --with-libc diff --git a/config/dev-cross-riscv64 b/config/dev-cross-riscv64 deleted file mode 100755 index 57b29fff..00000000 --- a/config/dev-cross-riscv64 +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -set -eux - -REPO="$(realpath "$(dirname "$(realpath "$0")")/..")" -if [ -f "$REPO/Makefile" ]; then make -C "$REPO" distclean; fi - -ARCH='riscv64' -HOST="$ARCH-elf" -PREFIX="$REPO/dest/dev-cross-$ARCH" -CROSS="$REPO/vendor/cross/root/bin/$HOST" - -export AR="$CROSS-ar" -export CC="$CROSS-gcc" -export RANLIB="$CROSS-ranlib" - -"$REPO/configure" --host="$HOST" --prefix="$PREFIX" --enable-freestanding --with-libc diff --git a/config/dev-cross-x86_64 b/config/dev-cross-x86_64 deleted file mode 100755 index 4a900b6d..00000000 --- a/config/dev-cross-x86_64 +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -set -eux - -REPO="$(realpath "$(dirname "$(realpath "$0")")/..")" -if [ -f "$REPO/Makefile" ]; then make -C "$REPO" distclean; fi - -ARCH='x86_64' -HOST="$ARCH-elf" -PREFIX="$REPO/dest/dev-cross-$ARCH" -CROSS="$REPO/vendor/cross/root/bin/$HOST" - -export AR="$CROSS-ar" -export CC="$CROSS-gcc" -export RANLIB="$CROSS-ranlib" - -export CFLAGS='-mabi=sysv -mcmodel=kernel -mno-80387 -mno-red-zone' - -"$REPO/configure" --host="$HOST" --prefix="$PREFIX" --enable-freestanding --with-libc diff --git a/config/dev-native b/config/dev-native deleted file mode 100755 index effcd78a..00000000 --- a/config/dev-native +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -eux - -REPO="$(realpath "$(dirname "$(realpath "$0")")/..")" -if [ -f "$REPO/Makefile" ]; then make -C "$REPO" distclean; fi - -PREFIX="$REPO/dest/dev-native" - -"$REPO/configure" --prefix="$PREFIX" --enable-checks-all diff --git a/config/root-cross-i386-linux b/config/root-cross-i386-linux deleted file mode 100755 index 1b780e3e..00000000 --- a/config/root-cross-i386-linux +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -set -eux - -REPO="$(realpath "$(dirname "$(realpath "$0")")/..")" -if [ -f "$REPO/Makefile" ]; then make -C "$REPO" distclean; fi - -ARCH='i386' -HOST="$ARCH-elf" -TARGET='i686-linux-gnu' -PREFIX="/opt/tailix/libkernaux/$ARCH" - -export AR="$TARGET-ar" -export CC="$TARGET-gcc" -export RANLIB="$TARGET-ranlib" - -"$REPO/configure" --host="$HOST" --prefix="$PREFIX" --enable-freestanding --with-libc diff --git a/config/root-cross-riscv64-linux b/config/root-cross-riscv64-linux deleted file mode 100755 index 4abd582b..00000000 --- a/config/root-cross-riscv64-linux +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -set -eux - -REPO="$(realpath "$(dirname "$(realpath "$0")")/..")" -if [ -f "$REPO/Makefile" ]; then make -C "$REPO" distclean; fi - -ARCH='riscv64' -HOST="$ARCH-elf" -TARGET='riscv64-linux-gnu' -PREFIX="/opt/tailix/libkernaux/$ARCH" - -export AR="$TARGET-ar" -export CC="$TARGET-gcc" -export RANLIB="$TARGET-ranlib" - -"$REPO/configure" --host="$HOST" --prefix="$PREFIX" --enable-freestanding --with-libc diff --git a/config/root-cross-x86_64-linux b/config/root-cross-x86_64-linux deleted file mode 100755 index 480d7984..00000000 --- a/config/root-cross-x86_64-linux +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -set -eux - -REPO="$(realpath "$(dirname "$(realpath "$0")")/..")" -if [ -f "$REPO/Makefile" ]; then make -C "$REPO" distclean; fi - -ARCH='x86_64' -HOST="$ARCH-elf" -TARGET='x86_64-linux-gnu' -PREFIX="/opt/tailix/libkernaux/$ARCH" - -export AR="$TARGET-ar" -export CC="$TARGET-gcc" -export RANLIB="$TARGET-ranlib" - -export CFLAGS='-mabi=sysv -mcmodel=kernel -mno-80387 -mno-red-zone' - -"$REPO/configure" --host="$HOST" --prefix="$PREFIX" --enable-freestanding --with-libc diff --git a/config/root-native b/config/root-native deleted file mode 100755 index 06b42c74..00000000 --- a/config/root-native +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -eux - -REPO="$(realpath "$(dirname "$(realpath "$0")")/..")" -if [ -f "$REPO/Makefile" ]; then make -C "$REPO" distclean; fi - -"$REPO/configure" --enable-checks diff --git a/dest/dev-cross-i386/.keep b/dest/dev-cross-i386/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/dest/dev-cross-riscv64/.keep b/dest/dev-cross-riscv64/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/dest/dev-cross-x86_64/.keep b/dest/dev-cross-x86_64/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/dest/dev-native/.keep b/dest/dev-native/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/cross b/vendor/cross deleted file mode 160000 index 5dc1bf89..00000000 --- a/vendor/cross +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5dc1bf89b00d3d73f7a1ed5d9b1e7268768ea9e8