Merge branch 'master' into v2.1

2014-10-07 16:18:46 +02:00
parent 0de431e3f7 4846a714a9
commit be64823d95
4 changed files with 8 additions and 5 deletions
--- a/src/lj_gdbjit.c
+++ b/src/lj_gdbjit.c
@@ -358,6 +358,8 @@ static const ELFheader elfhdr_template = {
  .eosabi = 2,
 #elif defined(__OpenBSD__)
  .eosabi = 12,
+#elif defined(__DragonFly__)
+  .eosabi = 0,
 #elif (defined(__sun__) && defined(__svr4__))
  .eosabi = 6,
 #else