summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-03-04 20:42:22 +0000
committer Eric Hameleers <alien@slackware.com>2019-03-04 20:42:22 +0000
commit10de5b3c4df8b803abacedc21f606eede175b299 (patch)
tree7b9ef05700c9a9896fda1c34a1b6b417f751a614
parentd44bd32ce4a5f38f875ab1dd913684f4a03ad817 (diff)
downloadmultilib-10de5b3c4df8b803abacedc21f606eede175b299.tar.gz
multilib-10de5b3c4df8b803abacedc21f606eede175b299.tar.xz
gcc-multilib: Revert inline asm backport causing compile failures for "asm volatile"
-rwxr-xr-xsource/current/gcc/gcc-multilib.SlackBuild12
1 files changed, 11 insertions, 1 deletions
diff --git a/source/current/gcc/gcc-multilib.SlackBuild b/source/current/gcc/gcc-multilib.SlackBuild
index 47b7594..801b251 100755
--- a/source/current/gcc/gcc-multilib.SlackBuild
+++ b/source/current/gcc/gcc-multilib.SlackBuild
@@ -62,7 +62,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gcc
SRCVER=${SRCVER:-"8.3.0"}
VERSION=$(echo $SRCVER | cut -f 1 -d _)
-BUILD=${BUILD:-1alien}
+BUILD=${BUILD:-2alien}
# How many jobs to run in parallel:
NUMJOBS=${NUMJOBS:-"$(nproc)"}
@@ -184,6 +184,16 @@ tar xf $CWD/gcc-$SRCVER.tar.?z || exit 1
# Smite the fixincludes:
zcat $CWD/gcc-no_fixincludes.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+ # Revert inline asm backport causing compile failures for "asm volatile":
+ zcat $CWD/patches/revert-asm-inline/8-8-c-Don-t-error-for-const-or-restrict-as-asm-qualifier.patch.gz | patch -p1 -R --verbose || exit 1
+ zcat $CWD/patches/revert-asm-inline/7-8-c-asm-Do-not-handle-any-asm-qualifiers-in-top-level-asm.patch.gz | patch -p1 -R --verbose || exit 1
+ zcat $CWD/patches/revert-asm-inline/6-8-c-c-asm-Use-nicer-error-for-const-and-restrict.patch.gz | patch -p1 -R --verbose || exit 1
+ zcat $CWD/patches/revert-asm-inline/5-8-c-c-asm-Use-nicer-error-for-duplicate-asm-qualifiers.patch.gz | patch -p1 -R --verbose || exit 1
+ zcat $CWD/patches/revert-asm-inline/4-8-c-c-asm-Write-the-asm-qualifier-loop-without-done-boolean.patch.gz | patch -p1 -R --verbose || exit 1
+ zcat $CWD/patches/revert-asm-inline/3-8-c-Delete-a-stray-line-in-asm-inline.patch.gz | patch -p1 -R --verbose || exit 1
+ zcat $CWD/patches/revert-asm-inline/2-8-asm-inline.patch.gz | patch -p1 -R --verbose || exit 1
+ zcat $CWD/patches/revert-asm-inline/1-8-asm-qualifiers-PR55681.patch.gz | patch -p1 -R --verbose || exit 1
+
# Fix perms/owners:
chown -R root:root .
find . -perm 777 -exec chmod 755 {} \;