diff options
| author |   Alexey Neyman <stilor@att.net> | 2018-10-06 15:52:11 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-10-06 15:52:11 (GMT) |
| commit | a18778d024d55e747dc58b0d7fbeeaba260d8b85 (patch) | |
| tree | 9f7c1cd38e01f4e49787d75d03d8925a1e785379 | |
| parent | 68be6c2268dfee7c988a4e8d24a2d8caa8c32eda (diff) | |
| parent | 5c10c92ed41f9beea56a4f7b6d7a6c2b907347e3 (diff) | |
Merge pull request #1051 from stilor/fix-glibc-2.15-i386
Fix glibc 2.15 i386
| -rw-r--r-- | packages/glibc/2.15/0050-fdivp-order.patch | 27 | ||||
| -rw-r--r-- | testing/docker/archlinux/Dockerfile | 2 |
2 files changed, 28 insertions, 1 deletions
diff --git a/packages/glibc/2.15/0050-fdivp-order.patch b/packages/glibc/2.15/0050-fdivp-order.patch new file mode 100644 index 0000000..159c9c4 --- /dev/null +++ b/packages/glibc/2.15/0050-fdivp-order.patch @@ -0,0 +1,27 @@ +commit 751728a1f10cdaf35c499c1d508a3a28ccfddc92 +Author: Marek Polacek <polacek@redhat.com> +Date: Mon Apr 16 11:03:41 2012 +0200 + + Reverse arguments of fdivp in i386 code. + +--- + sysdeps/i386/fpu/bits/fenv.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sysdeps/i386/fpu/bits/fenv.h ++++ b/sysdeps/i386/fpu/bits/fenv.h +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1997, 1998, 1999, 2000, 2011 Free Software Foundation, Inc. ++/* Copyright (C) 1997-2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -122,7 +122,7 @@ + # ifdef __SSE_MATH__ + __asm__ __volatile__ ("divss %1, %0" : : "x" (__f), "x" (__g)); + # else +- __asm__ __volatile__ ("fdivp %%st(1), %%st; fwait" ++ __asm__ __volatile__ ("fdivp %%st, %%st(1); fwait" + : "=t" (__f) : "0" (__f), "u" (__g) : "st(1)"); + # endif + (void) &__f; diff --git a/testing/docker/archlinux/Dockerfile b/testing/docker/archlinux/Dockerfile index a717088..773cffd 100644 --- a/testing/docker/archlinux/Dockerfile +++ b/testing/docker/archlinux/Dockerfile @@ -4,7 +4,7 @@ ARG CTNG_GID RUN groupadd -g $CTNG_GID ctng RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng RUN pacman -Syu --noconfirm -RUN pacman -S --noconfirm base-devel git help2man python unzip +RUN pacman -S --noconfirm base-devel git help2man python unzip wget RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 RUN chmod a+x /sbin/dumb-init ENTRYPOINT [ "/sbin/dumb-init", "--" ] |