remove msvc90 dependency, spurious '-g' flags in libffi, fix compiler…

… warnings against dlmalloc.c
java-native-access · Sep 23, 2012 · 1f1972b · 1f1972b
1 parent e91fbd3
commit 1f1972b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/native/cc.sh b/native/cc.sh
@@ -7,7 +7,7 @@
 
 nowarn="/wd4127 /wd4820 /wd4706 /wd4100 /wd4255 /wd4668"
 args="/nologo /EHac /W3 $nowarn" # /WX
-md="/MD"
+#md="/MD"
 
 cl="cl"
 ml="ml"
@@ -66,7 +66,7 @@ do
     -g)
       # using /RTC1 instead of /GZ
       args="$args /Od /D_DEBUG /RTC1 /Zi"
-      md=/MDd
+#      md=/MDd
       shift 1
     ;;
     -c)

diff --git a/native/libffi/Makefile.am b/native/libffi/Makefile.am
@@ -191,7 +191,7 @@ endif
 libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
 nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
 
-AM_CFLAGS = -g
+AM_CFLAGS = 
 if FFI_DEBUG
 # Build debug. Define FFI_DEBUG on the commandline so that, when building with
 # MSVC, it can link against the debug CRT.
@@ -201,7 +201,7 @@ endif
 libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
 
 AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src -DFFI_BUILDING
-AM_CCASFLAGS = $(AM_CPPFLAGS) -g
+AM_CCASFLAGS = $(AM_CPPFLAGS) 
 
 # No install-html or install-pdf support in automake yet
 .PHONY: install-html install-pdf

diff --git a/native/libffi/Makefile.in b/native/libffi/Makefile.in
@@ -504,10 +504,10 @@ nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) \
 	$(am__append_27) $(am__append_28) $(am__append_29)
 libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
 nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
-AM_CFLAGS = -g $(am__append_30)
+AM_CFLAGS = $(am__append_30)
 libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
 AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src -DFFI_BUILDING
-AM_CCASFLAGS = $(AM_CPPFLAGS) -g
+AM_CCASFLAGS = $(AM_CPPFLAGS) 
 all: fficonfig.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 

diff --git a/native/libffi/src/dlmalloc.c b/native/libffi/src/dlmalloc.c
@@ -2282,7 +2282,7 @@ static size_t traverse_and_check(mstate m);
 /* ---------------------------- Indexing Bins ---------------------------- */
 
 #define is_small(s)         (((s) >> SMALLBIN_SHIFT) < NSMALLBINS)
-#define small_index(s)      ((s)  >> SMALLBIN_SHIFT)
+#define small_index(s)      (bindex_t)((s)  >> SMALLBIN_SHIFT)
 #define small_index2size(i) ((i)  << SMALLBIN_SHIFT)
 #define MIN_SMALL_INDEX     (small_index(MIN_CHUNK_SIZE))
 
@@ -2320,7 +2320,7 @@ static size_t traverse_and_check(mstate m);
     N += K;\
     N += K = (((Y <<= K) - 0x4000) >> 16) & 2;\
     K = 14 - N + ((Y <<= K) >> 15);\
-    I = (K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1));\
+    I = (bindex_t)(K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1));\
   }\
 }
 #endif /* GNUC */