[libsereal-decoder-perl] 03/06: Drop patches which were taken from upstream git.
gregor herrmann
gregoa at debian.org
Fri Jun 6 11:16:27 UTC 2014
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libsereal-decoder-perl.
commit 65cfc5395958fbd71937de247b3ca5b32b93c35d
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Jun 6 12:50:51 2014 +0200
Drop patches which were taken from upstream git.
---
debian/patches/fix_arm_arch_stuff.patch | 69 -----------------
debian/patches/series | 2 -
...RM_to_ensure_alignment_for_floating_point.patch | 88 ----------------------
3 files changed, 159 deletions(-)
diff --git a/debian/patches/fix_arm_arch_stuff.patch b/debian/patches/fix_arm_arch_stuff.patch
deleted file mode 100644
index 323ae93..0000000
--- a/debian/patches/fix_arm_arch_stuff.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From fde30528dfa634032cb94bab42457477786de711 Mon Sep 17 00:00:00 2001
-From: Yves Orton <yves.orton at booking.com>
-Date: Fri, 16 May 2014 15:36:00 +0200
-Subject: [PATCH] fix ARM_ARCH stuff
-
-I was so tired when I pushed that last patch I did not notice it was totally
-half baked. This is a much better, and actualy tested version.
----
- Perl/Decoder/srl_decoder.c | 22 ++++++++++++----------
- 1 file changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/Perl/Decoder/srl_decoder.c b/Perl/Decoder/srl_decoder.c
-index 71ce384..923a858 100644
---- a/srl_decoder.c
-+++ b/srl_decoder.c
-@@ -852,14 +852,20 @@ union myfloat {
- long double ld;
- };
-
-+/*
-+#define TEST_ARM_ARCH
-+*/
-+#if (defined(TEST_ARM_ARCH) || defined(__ARM_ARCH))
-+#define SRL_ARM_ARCH 1
-+#endif
-+
- SRL_STATIC_INLINE void
- srl_read_float(pTHX_ srl_decoder_t *dec, SV* into)
- {
- union myfloat val;
--#ifdef __ARM_ARCH
-+#ifdef SRL_ARM_ARCH
- ASSERT_BUF_SPACE(dec, sizeof(float), " while reading FLOAT");
-- Copy(dec->pos,v.c,sizeof(float),U8);
-- val.f= *((float *)tmp);
-+ Copy(dec->pos,val.c,sizeof(float),U8);
- #else
- ASSERT_BUF_SPACE(dec, sizeof(float), " while reading FLOAT");
- val.f= *((float *)dec->pos);
-@@ -873,11 +879,9 @@ SRL_STATIC_INLINE void
- srl_read_double(pTHX_ srl_decoder_t *dec, SV* into)
- {
- union myfloat val;
--#ifdef __ARM_ARCH
-- U8 tmp[sizeof(double)];
-+#ifdef SRL_ARM_ARCH
- ASSERT_BUF_SPACE(dec, sizeof(double), " while reading DOUBLE");
- Copy(dec->pos,val.c,sizeof(double),U8);
-- val.d= *((double *)tmp);
- #else
- ASSERT_BUF_SPACE(dec, sizeof(double), " while reading DOUBLE");
- val.d= *((double *)dec->pos);
-@@ -891,11 +895,9 @@ SRL_STATIC_INLINE void
- srl_read_long_double(pTHX_ srl_decoder_t *dec, SV* into)
- {
- union myfloat val;
--#ifdef __ARM_ARCH
-- U8 tmp[sizeof(long double)];
-+#ifdef SRL_ARM_ARCH
- ASSERT_BUF_SPACE(dec, sizeof(long double), " while reading LONG_DOUBLE");
-- Copy(dec->pos,v.c,sizeof(long double),U8);
-- val.ld= *((long double *)tmp);
-+ Copy(dec->pos,val.c,sizeof(long double),U8);
- #else
- ASSERT_BUF_SPACE(dec, sizeof(long double), " while reading LONG_DOUBLE");
- val.ld= *((long double *)dec->pos);
---
-1.9.3
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2496fe5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-use_a_union_on_ARM_to_ensure_alignment_for_floating_point.patch
-fix_arm_arch_stuff.patch
diff --git a/debian/patches/use_a_union_on_ARM_to_ensure_alignment_for_floating_point.patch b/debian/patches/use_a_union_on_ARM_to_ensure_alignment_for_floating_point.patch
deleted file mode 100644
index 19426fc..0000000
--- a/debian/patches/use_a_union_on_ARM_to_ensure_alignment_for_floating_point.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 925053456efc71380537cb70a7d2735283924a8e Mon Sep 17 00:00:00 2001
-From: Yves Orton <yves.orton at booking.com>
-Date: Thu, 15 May 2014 00:40:56 +0200
-Subject: [PATCH] Use a union on ARM to ensure alignment for floating point
- loads
-
-I hope this fixes ARM. I have no way to test.
----
- Perl/Decoder/srl_decoder.c | 44 +++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 39 insertions(+), 5 deletions(-)
-
-diff --git a/Perl/Decoder/srl_decoder.c b/Perl/Decoder/srl_decoder.c
-index fd4929b..71ce384 100644
---- a/srl_decoder.c
-+++ b/srl_decoder.c
-@@ -843,12 +843,28 @@ srl_read_string(pTHX_ srl_decoder_t *dec, int is_utf8, SV* into)
- dec->pos+= len;
- }
-
-+/* declare a union so that we are guaranteed the right alignment
-+ * rules - this is required for ARM */
-+union myfloat {
-+ U8 c[sizeof(long double)];
-+ float f;
-+ double d;
-+ long double ld;
-+};
-
- SRL_STATIC_INLINE void
- srl_read_float(pTHX_ srl_decoder_t *dec, SV* into)
- {
-+ union myfloat val;
-+#ifdef __ARM_ARCH
- ASSERT_BUF_SPACE(dec, sizeof(float), " while reading FLOAT");
-- sv_setnv(into, (NV)*((float *)dec->pos));
-+ Copy(dec->pos,v.c,sizeof(float),U8);
-+ val.f= *((float *)tmp);
-+#else
-+ ASSERT_BUF_SPACE(dec, sizeof(float), " while reading FLOAT");
-+ val.f= *((float *)dec->pos);
-+#endif
-+ sv_setnv(into, (NV)val.f);
- dec->pos+= sizeof(float);
- }
-
-@@ -856,8 +872,17 @@ srl_read_float(pTHX_ srl_decoder_t *dec, SV* into)
- SRL_STATIC_INLINE void
- srl_read_double(pTHX_ srl_decoder_t *dec, SV* into)
- {
-- ASSERT_BUF_SPACE(dec, sizeof(double)," while reading DOUBLE");
-- sv_setnv(into, (NV)*((double *)dec->pos));
-+ union myfloat val;
-+#ifdef __ARM_ARCH
-+ U8 tmp[sizeof(double)];
-+ ASSERT_BUF_SPACE(dec, sizeof(double), " while reading DOUBLE");
-+ Copy(dec->pos,val.c,sizeof(double),U8);
-+ val.d= *((double *)tmp);
-+#else
-+ ASSERT_BUF_SPACE(dec, sizeof(double), " while reading DOUBLE");
-+ val.d= *((double *)dec->pos);
-+#endif
-+ sv_setnv(into, (NV)val.d);
- dec->pos+= sizeof(double);
- }
-
-@@ -865,8 +890,17 @@ srl_read_double(pTHX_ srl_decoder_t *dec, SV* into)
- SRL_STATIC_INLINE void
- srl_read_long_double(pTHX_ srl_decoder_t *dec, SV* into)
- {
-- ASSERT_BUF_SPACE(dec, sizeof(long double)," while reading LONG_DOUBLE");
-- sv_setnv(into, (NV)*((long double *)dec->pos));
-+ union myfloat val;
-+#ifdef __ARM_ARCH
-+ U8 tmp[sizeof(long double)];
-+ ASSERT_BUF_SPACE(dec, sizeof(long double), " while reading LONG_DOUBLE");
-+ Copy(dec->pos,v.c,sizeof(long double),U8);
-+ val.ld= *((long double *)tmp);
-+#else
-+ ASSERT_BUF_SPACE(dec, sizeof(long double), " while reading LONG_DOUBLE");
-+ val.ld= *((long double *)dec->pos);
-+#endif
-+ sv_setnv(into, (NV)val.ld);
- dec->pos+= sizeof(long double);
- }
-
---
-1.9.3
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libsereal-decoder-perl.git
More information about the Pkg-perl-cvs-commits
mailing list