Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8013480: fix zero build on arm
authoromajid
Mon, 29 Apr 2013 12:34:53 -0400
changeset 17046 72254abdba83
parent 16981 5ebf6c63714d
child 17047 ef3b89e2b4e0
8013480: fix zero build on arm Reviewed-by: erikj
jdk/makefiles/GensrcX11Wrappers.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/makefiles/GensrcX11Wrappers.gmk	Wed Jul 05 18:52:11 2017 +0200
+++ b/jdk/makefiles/GensrcX11Wrappers.gmk	Mon Apr 29 12:34:53 2013 -0400
@@ -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 \
jdk-sandbox