Drop support for i586

This patch removes support for i586 according to the decision being
taken over a year ago.

It removes the architecture from the build system and removes all
required hacks and other quirks that have been necessary before.

There is no need to ship any changed files to the remaining
architectures as the removed code branches have not been used.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2021-12-02 15:40:01 +00:00
committed by Peter Müller
parent dbfd639292
commit 6cf219c427
65 changed files with 26 additions and 62770 deletions

View File

@@ -26,9 +26,8 @@ case "${1}" in
fi
arch=`uname -m`
case "${arch}" in
i?86 ) arch="i586";
;;
armv*) arch="armv6l":
armv*)
arch="armv6l":
;;
esac
if [ -f "/etc/sysctl-${arch}.conf" ]; then

View File

@@ -104,9 +104,6 @@ function grub_install() {
aarch64)
arches="arm64-efi"
;;
i?86)
arches="i386-pc"
;;
x86_64)
arches="i386-pc x86_64-efi"
;;

View File

@@ -977,10 +977,6 @@ sub get_arch() {
# We only support armv6l for 32 bit arm
if ($machine =~ m/armv[67]/) {
return "armv6l";
# We only support i586 for 32 bit x86
} elsif ($machine =~ m/i[0-9]86/) {
return "i586";
}
return $machine;
@@ -1015,10 +1011,7 @@ sub make_version() {
}
# Append architecture
my $arch = &get_arch();
if ($arch ne "i586") {
$version .= "-${arch}";
}
$version .= "-" . &get_arch();
return $version;
}

View File

@@ -1,12 +0,0 @@
diff --git a/src/perl/Makefile.PL b/src/perl/Makefile.PL
index 38d5390..62016ca 100644
--- a/src/perl/Makefile.PL
+++ b/src/perl/Makefile.PL
@@ -11,6 +11,7 @@ WriteMakefile(
LIBS => ['-lloc'],
DEFINE => '', # e.g., '-DHAVE_SOMETHING'
INC => '-I. -I../../',
+ CCFLAGS => '-D_REENTRANT -D_GNU_SOURCE -O2 -pipe -Wall -fexceptions -fPIC -march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector -fwrapv -fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64',
# Un-comment this if you add C files to link with later:
# OBJECT => '$(O_FILES)', # link all the C files too
);

View File

@@ -1,35 +0,0 @@
From 1f023b49959aa58246e6bb7091ba7710116f6915 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 9 Sep 2018 17:29:15 +0100
Subject: [PATCH] Enable RDRAND for i586, too
IPFire is being compiled for i586 omitting some instructions
for i686. However, RDRAND is available on some systems and
can of course be used.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Pull request sent: https://github.com/nhorman/rng-tools/pull/31
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index faba7cc9857e..716175328ff6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,8 +53,8 @@ AC_CHECK_TOOLS([AR], [ar gar], :)
AX_PTHREAD
-AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686])
-AS_IF([test $target_cpu = x86_64 -o $target_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
+AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686 -o $target_cpu = i586])
+AS_IF([test $target_cpu = x86_64 -o $target_cpu = i686 -o $target_cpu = i586], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
AM_CONDITIONAL([DARN], [test $target_cpu = powerpc64le])
AS_IF([test $target_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
--
2.17.1

View File

@@ -9,9 +9,6 @@ arch=$(uname -m)
case "${arch}" in
aarch64|x86_64)
;;
i?86)
arch="i586"
;;
*)
echo "Arch is not supported" >&2
exit 1