You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

52 lines
1.7 KiB

Index: erts/emulator/hipe/hipe_x86.c
--- erts/emulator/hipe/hipe_x86.c.orig 2014-01-23 17:47:46.000000000 +0100
+++ erts/emulator/hipe/hipe_x86.c 2014-01-25 10:13:28.081085867 +0100
@@ -130,7 +130,7 @@
abort();
map_start = mmap(map_hint, map_bytes,
PROT_EXEC|PROT_READ|PROT_WRITE,
- MAP_PRIVATE|MAP_ANONYMOUS
+ MAP_PRIVATE|MAP_ANON
#ifdef __x86_64__
|MAP_32BIT
#endif
Index: lib/erl_interface/src/connect/ei_resolve.c
--- lib/erl_interface/src/connect/ei_resolve.c.orig 2014-01-23 17:47:46.000000000 +0100
+++ lib/erl_interface/src/connect/ei_resolve.c 2014-01-25 10:13:28.081085867 +0100
@@ -54,6 +54,10 @@
#include "ei_resolve.h"
#include "ei_locking.h"
+#if defined(HAVE_GETHOSTBYNAME_R) && defined(__FreeBSD__)
+#undef HAVE_GETHOSTBYNAME_R
+#endif
+
#ifdef HAVE_GETHOSTBYNAME_R
void ei_init_resolve(void)
Index: lib/hipe/regalloc/Makefile
--- lib/hipe/regalloc/Makefile.orig 2014-01-23 17:47:46.000000000 +0100
+++ lib/hipe/regalloc/Makefile 2014-01-25 10:13:28.091074392 +0100
@@ -46,7 +46,6 @@
hipe_node_sets hipe_spillcost hipe_reg_worklists \
hipe_adj_list \
hipe_temp_map \
- hipe_optimistic_regalloc \
hipe_coalescing_regalloc \
hipe_graph_coloring_regalloc \
hipe_regalloc_loop \
Index: lib/wx/configure
--- lib/wx/configure.orig 2014-01-25 10:13:28.091074000 +0100
+++ lib/wx/configure 2014-01-25 10:45:06.311080179 +0100
@@ -4059,8 +4059,8 @@
CFLAGS="-g -Wall -fPIC $CFLAGS -fno-strict-aliasing"
;;
*)
- DEBUG_CFLAGS="-g -Wall -fPIC $CFLAGS -DDEBUG"
- CFLAGS="-g -Wall -O2 -fPIC $CFLAGS -fomit-frame-pointer -fno-strict-aliasing"
+ DEBUG_CFLAGS="-fPIC $CFLAGS -DDEBUG"
+ CFLAGS="-O2 -fPIC $CFLAGS -fomit-frame-pointer -fno-strict-aliasing"
;;
esac