~rdoering/ubuntu/karmic/erlang/fix-535090

« back to all changes in this revision

Viewing changes to debian/patches/m68k.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sergei Golovan
  • Date: 2009-02-15 16:42:52 UTC
  • mfrom: (3.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090215164252-q5x4rcf8a5pbesb1
Tags: 1:12.b.5-dfsg-2
Upload to unstable after lenny is released.

Show diffs side-by-side

added added

removed removed

Lines of Context:
7
7
 
8
8
(2) Non-working networking besause of blind conversion of long to a pointer.
9
9
 
10
 
--- erlang-12.b.3-dfsg.orig/erts/emulator/beam/binary.c
11
 
+++ erlang-12.b.3-dfsg/erts/emulator/beam/binary.c
12
 
@@ -30,7 +30,7 @@
 
10
--- erlang-12.b.5-dfsg.orig/erts/emulator/beam/binary.c
 
11
+++ erlang-12.b.5-dfsg/erts/emulator/beam/binary.c
 
12
@@ -30,6 +30,8 @@
13
13
 #include "erl_binary.h"
14
14
 #include "erl_bits.h"
15
15
 
16
 
-erts_atomic_t erts_allocated_binaries;
17
16
+erts_atomic_t erts_allocated_binaries __attribute__ ((aligned (4)));
18
 
 
 
17
+
19
18
 #ifdef DEBUG
20
19
 static int list_to_bitstr_buf(Eterm obj, char* buf, int len);
21
 
--- erlang-12.b.3-dfsg.orig/erts/emulator/beam/erl_driver.h
22
 
+++ erlang-12.b.3-dfsg/erts/emulator/beam/erl_driver.h
 
20
 #else
 
21
--- erlang-12.b.5-dfsg.orig/erts/emulator/beam/erl_driver.h
 
22
+++ erlang-12.b.5-dfsg/erts/emulator/beam/erl_driver.h
23
23
@@ -510,7 +510,7 @@
24
24
 EXTERN ErlDrvTermData driver_caller(ErlDrvPort);
25
25
 extern const ErlDrvTermData driver_term_nil;