← Back to branch summary

~ubuntu-branches/debian/squeeze/erlang/squeeze

« back to all changes in this revision

Viewing changes to debian/patches/m68k.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sergei Golovan
  • Date: 2009-08-05 20:54:29 UTC
  • mfrom: (6.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090805205429-pm4pnwew8axraosl
Tags: 1:13.b.1-dfsg-5
http://bugs.debian.org/536891
* Fixed parentheses in Emacs mode (closes: #536891).
* Removed unnecessary conflicts with erlang-manpages package.
* Added workaround for #475459: disabled threads on sparc architecture.
  This breaks wxErlang, so it's only a temporary solution.

Show diffs side-by-side

added added

removed removed

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