← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/70m68k.diff

  • Committer: Bazaar Package Importer
  • Author(s): Luca Falavigna
  • Date: 2008-11-04 22:26:12 UTC
  • mfrom: (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20081104222612-1uwzavuet6ar35fw
Tags: 1:12.b.3-dfsg-4ubuntu1
* Merge from Debian unstable, remaining Ubuntu changes:
  + debian/patches/glibc2.8_compatibility.patch:
    - Fix FTBFS with new glibc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/70m68k.diff
1
 
70m68k.diff by Sergei Golovan <sgolovan@nes.ru>
2
 
 
3
 
This patch fixes 2 issues on m68k architecture:
4
 
 
5
 
1) FTBFS because of insufficiently aligned variable (thanks to Aleksey Shchepin
6
 
   for help in debugging it).
7
 
 
8
 
2) Non-working networking besause of blind conversion of long to a pointer.
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 @@
13
 
 #include "erl_binary.h"
14
 
 #include "erl_bits.h"
15
 
 
16
 
-erts_atomic_t erts_allocated_binaries;
17
 
+erts_atomic_t erts_allocated_binaries __attribute__ ((aligned (4)));
18
 
 
19
 
 #ifdef DEBUG
20
 
 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
23
 
@@ -510,7 +510,7 @@
24
 
 EXTERN ErlDrvTermData driver_caller(ErlDrvPort);
25
 
 extern const ErlDrvTermData driver_term_nil;
26
 
 EXTERN ErlDrvTermData driver_mk_term_nil(void);
27
 
-EXTERN ErlDrvPort driver_create_port(ErlDrvPort creator_port, 
28
 
+EXTERN long driver_create_port(long creator_port, 
29
 
                                     ErlDrvTermData connected, /* pid */
30
 
                                     char* name, /* driver name */
31
 
                                     ErlDrvData drv_data);