--- a/jdk/make/lib/LibCommon.gmk	Thu Feb 11 16:24:55 2016 -0800
+++ b/jdk/make/lib/LibCommon.gmk	Fri Feb 12 11:07:54 2016 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,10 @@
 # elegant solution to this.
 WIN_JAVA_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib
 
+ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx windows), )
+  DISABLE_MAPFILES := true
+endif
+
 ################################################################################
 # Find the default set of src dirs for a native library.
 # Param 1 - module name