From 938c4b3563802abe8a913bab016ffeb29567790d Mon Sep 17 00:00:00 2001 From: Nandor Kracser Date: Mon, 9 Jul 2012 21:05:11 +0200 Subject: [PATCH 1/3] Changing LLD to 'lld' because it raises compile warnings in interpret.cc on Mac OS X (make process=interpret). --- src/common.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/common.h b/src/common.h index 494a39291e..1c45e2e855 100644 --- a/src/common.h +++ b/src/common.h @@ -145,7 +145,11 @@ typedef intptr_t __attribute__((__may_alias__)) intptr_alias_t; # define LLD "I64d" # define ULD "I64x" # else -# define LLD "ld" +# ifdef __APPLE__ +# define LLD "lld" +# else +# define LLD "ld" +# endif # define ULD "lu" # endif #else From 77f7d3eb44e0581425e36a19e44694c72fc38416 Mon Sep 17 00:00:00 2001 From: Nandor Kracser Date: Mon, 9 Jul 2012 21:10:53 +0200 Subject: [PATCH 2/3] Commenting-out unused returnCode() method because it raises compiler warning with 'make process=interpret use-clang=yes' on Mac OS X. The compiler warning later corrupted the compilation. --- src/interpret.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/interpret.cpp b/src/interpret.cpp index 10cfb2c33e..91f80d6ffb 100644 --- a/src/interpret.cpp +++ b/src/interpret.cpp @@ -2819,6 +2819,7 @@ pushArguments(Thread* t, object this_, const char* spec, object a) } } +/* inline unsigned returnCode(Thread* t, object method) { @@ -2827,6 +2828,7 @@ returnCode(Thread* t, object method) while (*s and *s != ')') ++ s; return fieldCode(t, s[1]); } +*/ object invoke(Thread* t, object method) From fdbb63e9d9e5ddddf48204b3c23c81259f2c1549 Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Mon, 9 Jul 2012 13:40:15 -0600 Subject: [PATCH 3/3] remove unused function returnCode --- src/interpret.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/interpret.cpp b/src/interpret.cpp index 91f80d6ffb..9f28a2f769 100644 --- a/src/interpret.cpp +++ b/src/interpret.cpp @@ -2819,17 +2819,6 @@ pushArguments(Thread* t, object this_, const char* spec, object a) } } -/* -inline unsigned -returnCode(Thread* t, object method) -{ - const char* s = reinterpret_cast - (&byteArrayBody(t, methodSpec(t, method), 0)); - while (*s and *s != ')') ++ s; - return fieldCode(t, s[1]); -} -*/ - object invoke(Thread* t, object method) {