# HG changeset patch
# User katleman
# Date 1367445595 25200
# Node ID 55c7b90fe57e45708d4463d83fda8dd574f6e362
# Parent  7c4eb715c5e8d4b205395cfc4c1bd6e8d3bb9f01# Parent  7a96ead5ea89cd3c432ea4d52f2200bd10dda901
Merge

diff -r 7c4eb715c5e8 -r 55c7b90fe57e makefiles/GensrcX11Wrappers.gmk
--- a/makefiles/GensrcX11Wrappers.gmk	Tue Apr 30 21:49:38 2013 -0700
+++ b/makefiles/GensrcX11Wrappers.gmk	Wed May 01 14:59:55 2013 -0700
@@ -86,10 +86,15 @@
 	$(MKDIR) -p $(@D)
 	$(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $*
 
+    # use -m32/-m64 only if the compiler supports it
+    ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG),true)
+    MEMORY_MODEL_FLAG="-m$*"
+    endif
+
     # Compile the C code into an executable.
     $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
 	$(MKDIR) -p $(@D)
-	(cd $(@D) && $(CC) -m$* -o $@ $< \
+	(cd $(@D) && $(CC) $(MEMORY_MODEL_FLAG) -o $@ $< \
               $(X_CFLAGS) \
               $(X_LIBS) \
               -I$(JDK_OUTPUTDIR)/include \