From 300ac159593cffd0377dfadfeb5a6671f39b900f Mon Sep 17 00:00:00 2001 From: Philipp Ammann Date: Mon, 21 Mar 2016 21:25:36 +0100 Subject: [PATCH] dev-java/jamvm: apply fenv patch unconditionally --- dev-java/jamvm/Manifest | 4 +- dev-java/jamvm/files/jamvm-2.0.0-fenv.patch | 62 +++++++++++++++++++++++++++++ dev-java/jamvm/files/jamvm-2.0.0-musl.patch | 62 ----------------------------- dev-java/jamvm/jamvm-2.0.0-r99.ebuild | 6 +-- 4 files changed, 65 insertions(+), 69 deletions(-) create mode 100644 dev-java/jamvm/files/jamvm-2.0.0-fenv.patch delete mode 100644 dev-java/jamvm/files/jamvm-2.0.0-musl.patch diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest index 7960953..e66a471 100644 --- a/dev-java/jamvm/Manifest +++ b/dev-java/jamvm/Manifest @@ -1,8 +1,8 @@ AUX jamvm-2.0.0-classes-location.patch 1276 SHA256 98ecad3eeb0623b3dc01155c9cbd9aacf31e5d5854b183a7be11b64bfdd838a6 SHA512 c399cb8ebce0556a778a1511fec43eeedc2e8d4b1ca732ebd201faf49d6a607baef914fb54e34f2c5b494ace6f5c072d296fb30c65038461e97a518c9e1924bd WHIRLPOOL 91d9c75a260f6f5943d1221bfba77032fc1ce1f8d85217ec4a80aa50b826f36816aa4fe0e1a2ae7cb27c171ec029d8ee3ad512a506c1d31e02276a02b1858e42 AUX jamvm-2.0.0-env.file 551 SHA256 27bda0e9663dba5ca099d2f26234d3fde1a14f1897edce65c2c421d15ad6dca9 SHA512 7d3aaf511d798bd9e9a56cce2b1e476b364f392e8b5062642054b335110d25a6e1e4e484e74743ffc945b29f92d31991942e3b06762232c3e7e624d7151655c2 WHIRLPOOL 9c71959c4be6c8d13110f0a18964ee5804e1a803cba82af71f8ac74924b2aa7651df5fc19fcb6301ea606ea85f461a471dbfbc5c4f0de1d4b7616933600523cc +AUX jamvm-2.0.0-fenv.patch 1733 SHA256 76fe550d2f376a29dd0a740adc3f9b5f6aa6ec2c16e1c843a83764d3ba4e2375 SHA512 d6a1f87f4546d9a9849672d970d401472d6c79a1fa87b193728df4c2ad6e9a1f3f1f4f48de045472e1288dea1b0a79c4fa016c99819b0f6e45f63cd3ead62747 WHIRLPOOL 50418776aa49dc52fa9c1c71de569613d70558156595dd4266a3a0ee843a2300d010eca10a0574e4c98444bb3b55b86fbae93ac4c54e3d391907bd36e1a908a1 AUX jamvm-2.0.0-javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb WHIRLPOOL 2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8 -AUX jamvm-2.0.0-musl.patch 1733 SHA256 76fe550d2f376a29dd0a740adc3f9b5f6aa6ec2c16e1c843a83764d3ba4e2375 SHA512 d6a1f87f4546d9a9849672d970d401472d6c79a1fa87b193728df4c2ad6e9a1f3f1f4f48de045472e1288dea1b0a79c4fa016c99819b0f6e45f63cd3ead62747 WHIRLPOOL 50418776aa49dc52fa9c1c71de569613d70558156595dd4266a3a0ee843a2300d010eca10a0574e4c98444bb3b55b86fbae93ac4c54e3d391907bd36e1a908a1 AUX jamvm-2.0.0-noexecstack.patch 1387 SHA256 6a6028e55532ba3debf1f170790cc609b0bbd0cfe7fd7b5a14f4513e6b46873b SHA512 17c38ad0017e5659295dea7ed57f263eb0eee673bbc1f5d1e44e0c8fe588f4172a8a05c832a1fd41f3dc094779fade66aa710c8ce48c754412b0b6afdea6551a WHIRLPOOL e06573fa48c98c29ae1f53ce19b511f21ee594d32c840a4649d3a6df7754e594e729551429610c4d04d5dc97aa42678a35e68fb17709125e60ae2c53c51c9fd4 DIST jamvm-2.0.0.tar.gz 741459 SHA256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d WHIRLPOOL 7e80be683fafb444cd417502b96089ce4f6879a049ca49e33691b4d5d6755814654ab4ed7626b666dd48f9d6101567b2a12de43b916055ea1d067c5d4df06443 -EBUILD jamvm-2.0.0-r99.ebuild 3781 SHA256 9bd66bb52decce0eaff3f6d55dfd6e4d837a56910e3260a6c4c6dc83f5d9aef9 SHA512 ffa2dd87f16b2afb83f87af635ec1833a1eb15b9bb252f625520a387fae799fbe44fff30fcb8bf4cc63f8b15f337cc6132244bb8a3de03a5a4b79e839c2338e4 WHIRLPOOL 076c52c6c6b0f86e17f8525689f17921a096f46c7b065e560128e90558fe4b03b9e06b12ed22bec01b309de2b07f1be832a2305a2632cd62e69fc5852f794274 +EBUILD jamvm-2.0.0-r99.ebuild 3741 SHA256 f9ece6be1670fdd0574abb6724a373bf5f4ab3ee2b362eefd6741255dfc9a819 SHA512 d5b48f3c1c08548f15421139991db84b69444362667130827ddc54bb94e31dbec13bacf60f24b724de12c1ec9648d4654572526e97d8394c3a2d81c600f97125 WHIRLPOOL 3851bf061bc721c755473c5ac40c3db53633a1717e4bf762b826f3154f03118ccba1ca0b16bd2b63b255371bc6c093fdc8b8c5258b4f7f8d25e34ec0a5946f5e MISC metadata.xml 311 SHA256 d1c61c433be3de320b6ad194940b3e86de437e2f004bf7eb69d718b1267c69cf SHA512 3c73e7134e8adf35e0a1418dfcb0215082b5cfc7e3baabc11d89fb1044996a382c551309e5c04dbc54257a65173384b690ad951ceaec2b8569d89bb8a5e757ee WHIRLPOOL 7fa252078e65cf175004917b0bb6abfa85212e0d77084378a696562c80a93f02f60fffcf899cf85c873a21dcdb77515100d8198e0d3e3075dfcea44f28850edd diff --git a/dev-java/jamvm/files/jamvm-2.0.0-fenv.patch b/dev-java/jamvm/files/jamvm-2.0.0-fenv.patch new file mode 100644 index 0000000..6872a6e --- /dev/null +++ b/dev-java/jamvm/files/jamvm-2.0.0-fenv.patch @@ -0,0 +1,62 @@ +diff -rupN a/src/os/linux/i386/init.c b/src/os/linux/i386/init.c +--- a/src/os/linux/i386/init.c 2012-05-17 21:01:47.000000000 +0000 ++++ b/src/os/linux/i386/init.c 2016-03-18 16:41:12.578719722 +0000 +@@ -19,18 +19,18 @@ + * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +-#include ++#include + + /* Change floating point precision to double (64-bit) from + * the extended (80-bit) Linux default. */ + + void setDoublePrecision() { +- fpu_control_t cw; ++ fenv_t fenv; + +- _FPU_GETCW(cw); +- cw &= ~_FPU_EXTENDED; +- cw |= _FPU_DOUBLE; +- _FPU_SETCW(cw); ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + } + + void initialisePlatform() { +diff -rupN a/src/os/linux/x86_64/init.c b/src/os/linux/x86_64/init.c +--- a/src/os/linux/x86_64/init.c 2012-05-17 21:01:47.000000000 +0000 ++++ b/src/os/linux/x86_64/init.c 2016-03-18 16:42:41.498722575 +0000 +@@ -19,9 +19,7 @@ + * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +-#ifdef __linux__ +-#include +-#endif ++#include + + /* Change the x87 FPU precision to double (64-bit) from the extended + (80-bit) Linux default. Note, unlike on i386, my testcases pass +@@ -30,14 +28,12 @@ + */ + + void setDoublePrecision() { +-#ifdef __linux__ +- fpu_control_t cw; ++ fenv_t fenv; + +- _FPU_GETCW(cw); +- cw &= ~_FPU_EXTENDED; +- cw |= _FPU_DOUBLE; +- _FPU_SETCW(cw); +-#endif ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /*_FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /*_FPU_DOUBLE */ ++ fesetenv(&fenv); + } + + void initialisePlatform() { diff --git a/dev-java/jamvm/files/jamvm-2.0.0-musl.patch b/dev-java/jamvm/files/jamvm-2.0.0-musl.patch deleted file mode 100644 index 6872a6e..0000000 --- a/dev-java/jamvm/files/jamvm-2.0.0-musl.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -rupN a/src/os/linux/i386/init.c b/src/os/linux/i386/init.c ---- a/src/os/linux/i386/init.c 2012-05-17 21:01:47.000000000 +0000 -+++ b/src/os/linux/i386/init.c 2016-03-18 16:41:12.578719722 +0000 -@@ -19,18 +19,18 @@ - * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - --#include -+#include - - /* Change floating point precision to double (64-bit) from - * the extended (80-bit) Linux default. */ - - void setDoublePrecision() { -- fpu_control_t cw; -+ fenv_t fenv; - -- _FPU_GETCW(cw); -- cw &= ~_FPU_EXTENDED; -- cw |= _FPU_DOUBLE; -- _FPU_SETCW(cw); -+ fegetenv(&fenv); -+ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ -+ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ -+ fesetenv(&fenv); - } - - void initialisePlatform() { -diff -rupN a/src/os/linux/x86_64/init.c b/src/os/linux/x86_64/init.c ---- a/src/os/linux/x86_64/init.c 2012-05-17 21:01:47.000000000 +0000 -+++ b/src/os/linux/x86_64/init.c 2016-03-18 16:42:41.498722575 +0000 -@@ -19,9 +19,7 @@ - * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - --#ifdef __linux__ --#include --#endif -+#include - - /* Change the x87 FPU precision to double (64-bit) from the extended - (80-bit) Linux default. Note, unlike on i386, my testcases pass -@@ -30,14 +28,12 @@ - */ - - void setDoublePrecision() { --#ifdef __linux__ -- fpu_control_t cw; -+ fenv_t fenv; - -- _FPU_GETCW(cw); -- cw &= ~_FPU_EXTENDED; -- cw |= _FPU_DOUBLE; -- _FPU_SETCW(cw); --#endif -+ fegetenv(&fenv); -+ fenv.__control_word &= ~0x300; /*_FPU_EXTENDED */ -+ fenv.__control_word |= 0x200; /*_FPU_DOUBLE */ -+ fesetenv(&fenv); - } - - void initialisePlatform() { diff --git a/dev-java/jamvm/jamvm-2.0.0-r99.ebuild b/dev-java/jamvm/jamvm-2.0.0-r99.ebuild index af734a6..cbec9df 100644 --- a/dev-java/jamvm/jamvm-2.0.0-r99.ebuild +++ b/dev-java/jamvm/jamvm-2.0.0-r99.ebuild @@ -25,16 +25,12 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/"${P}-classes-location.patch" "${FILESDIR}"/"${P}-noexecstack.patch" + "${FILESDIR}"/"${P}-fenv.patch" ) src_prepare() { # without this patch, classes.zip is not found at runtime epatch "${PATCHES[@]}" - - if use elibc_musl ; then - epatch "${FILESDIR}"/"${P}-musl.patch" - fi - eautoreconf # These come precompiled. -- 2.7.3