i686: merge completely with the core repository, and remove from default KISS_PATH

10 files changed, 1 insertions, 118 deletions

diff --git a/core/kiss/files/kiss_path.sh b/core/kiss/files/kiss_path.sh
index b88ab4fc..95cf8fac 100644
--- a/core/kiss/files/kiss_path.sh
+++ b/core/kiss/files/kiss_path.sh
@@ -1,2 +1 @@
 export KISS_PATH=/var/db/kiss/repo/core:/var/db/kiss/repo/extra:/var/db/kiss/repo/xorg
-case "$(uname -m)" in i*86) export KISS_PATH=/var/db/kiss/repo/i686:$KISS_PATH; esac
diff --git a/core/kiss/version b/core/kiss/version
index ef862396..628fcdee 100644
--- a/core/kiss/version
+++ b/core/kiss/version
@@ -1 +1 @@
-2.1.0 1
+2.1.0 2
diff --git a/i686/gcc/build b/i686/gcc/build
deleted file mode 100755
index 35780a0c..00000000
--- a/i686/gcc/build
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh -e
-
-(
-    cd gcc
-    patch -Np1 < ../musl-libssp.patch
-)
-
-# Make sure gmp is built with generic options.
-cp gcc/gmp/configfsf.guess gcc/gmp/config.guess
-cp gcc/gmp/configfsf.sub   gcc/gmp/config.sub
-
-# Build must happen outside of gcc source.
-mkdir -p gcc-build
-cd gcc-build
-
-export libat_cv_have_ifunc=no
-
-../gcc/configure \
-    --prefix=/usr \
-    --disable-multilib \
-    --disable-symvers \
-    --disable-libmpx \
-    --disable-libmudflap \
-    --disable-libsanitizer \
-    --disable-werror \
-    --disable-fixed-point \
-    --disable-libstdcxx-pch \
-    --disable-nls \
-    --without-included-gettext \
-    --enable-checking=release \
-    --mandir=/usr/share/man \
-    --infodir=/usr/share/info \
-    --with-system-zlib \
-    --enable-__cxa_atexit \
-    --enable-default-pie \
-    --enable-default-ssp \
-    --enable-shared \
-    --enable-threads \
-    --enable-tls \
-    --enable-languages=c,c++ \
-    --build=i686-pc-linux-musl \
-    --disable-libssp \
-    --disable-bootstrap
-
-make
-make DESTDIR="$1" install
-
-# Save 35MB.
-find "$1" -name libgtkpeer.a  -exec rm -f {} +
-find "$1" -name libgjsmalsa.a -exec rm -f {} +
-find "$1" -name libgij.a      -exec rm -f {} +
-
-# Some legacy programs will expect cc
-ln -s gcc "$1/usr/bin/cc"
-
-# POSIX compliance.
-install -Dm755 ../c99 "$1/usr/bin/c99"
-
-# Symlink for LTO.
-{
-    mkdir -p "$1/usr/lib/bfd-plugins"
-
-    ln -s /usr/libexec/gcc/i686-pc-linux-musl/9.2.0/liblto_plugin.so \
-        "$1/usr/lib/bfd-plugins/liblto_plugin.so"
-}
-
diff --git a/i686/gcc/checksums b/i686/gcc/checksums
deleted file mode 100644
index ebe22b10..00000000
--- a/i686/gcc/checksums
+++ /dev/null
@@ -1,6 +0,0 @@
-b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2  gcc-10.1.0.tar.xz
-258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526  gmp-6.2.0.tar.xz
-1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a  mpfr-4.0.2.tar.xz
-6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e  mpc-1.1.0.tar.gz
-765614b3396d70bca3fa0ae4a813632486c6dca320e2bd13c8c39dca52be4a4c  c99
-4ece19529edb8e681e1778e977e2ba1d47984ccfcb82505e8b898bb29d659625  musl-libssp.patch
diff --git a/i686/gcc/depends b/i686/gcc/depends
deleted file mode 100644
index ca8b7e57..00000000
--- a/i686/gcc/depends
+++ /dev/null
@@ -1,4 +0,0 @@
-binutils
-bison  make
-flex   make
-zlib
diff --git a/i686/gcc/files/c99 b/i686/gcc/files/c99
deleted file mode 100755
index 692f0924..00000000
--- a/i686/gcc/files/c99
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec cc -std=c99 "$@"
diff --git a/i686/gcc/message b/i686/gcc/message
deleted file mode 100644
index 75c12d01..00000000
--- a/i686/gcc/message
+++ /dev/null
@@ -1,11 +0,0 @@
-CRITICAL
-
-A bug in GCC 10.1.0 causes kernels built with GCC 10 to
-kernel panic in the second boot stage. This issue can be
-resolved by applying the following patch.
-
-https://dl.carbslinux.org/distfiles/linux-gcc-10-bootfix.patch
-
-You can also visit https://carbslinux.org for a link to the
-patch.
-
diff --git a/i686/gcc/patches/musl-libssp.patch b/i686/gcc/patches/musl-libssp.patch
deleted file mode 100644
index fe5c6143..00000000
--- a/i686/gcc/patches/musl-libssp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Timo Teräs <timo.teras@iki.fi>
-
-Alpine musl package provides libssp_nonshared.a. We link to it unconditionally,
-as otherwise we get link failures if some objects are -fstack-protector built
-and final link happens with -fno-stack-protector. This seems to be the common
-case when bootstrapping gcc, the piepatches do not seem to fully fix the
-crosstoolchain and  bootstrap sequence wrt. stack-protector flag usage.
-
---- gcc-6.1.0/gcc/gcc.c.orig
-+++ gcc-6.1.0/gcc/gcc.c
-@@ -870,8 +870,7 @@
- 
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
--#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
--		       "|fstack-protector-strong|fstack-protector-explicit:}"
-+#define LINK_SSP_SPEC "-lssp_nonshared"
- #else
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
- 		       "|fstack-protector-strong|fstack-protector-explicit" \
diff --git a/i686/gcc/sources b/i686/gcc/sources
deleted file mode 100644
index 8a68dca5..00000000
--- a/i686/gcc/sources
+++ /dev/null
@@ -1,6 +0,0 @@
-https://gcc.gnu.org/pub/gcc/releases/gcc-10.1.0/gcc-10.1.0.tar.xz gcc
-https://gmplib.org/download/gmp/gmp-6.2.0.tar.xz gcc/gmp
-https://ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz gcc/mpfr
-https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz gcc/mpc
-files/c99
-patches/musl-libssp.patch
diff --git a/i686/gcc/version b/i686/gcc/version
deleted file mode 100644
index 3d0f48ce..00000000
--- a/i686/gcc/version
+++ /dev/null
@@ -1 +0,0 @@
-10.1.0 1