--- a/open-src/common/Makefile.init Tue Dec 22 14:11:11 2009 -0800
+++ b/open-src/common/Makefile.init Wed Dec 23 10:36:24 2009 -0800
@@ -29,7 +29,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)Makefile.init 1.16 09/12/11 SMI"
+# ident "@(#)Makefile.init 1.17 09/12/22 SMI"
#
# Use ksh93 for shell commands in Makefiles so that builds are the same
@@ -167,8 +167,7 @@
# Linker mapfiles to link with for better performance & security
# SPARC architecture requires PLT section in .data be executable, so
# we can only make .bss, not all of .data no-exec on SPARC
-MAPFILE_DIR = $(TOP)/common/mapfiles
-MAPFILE_NOEXBSS = $(MAPFILE_DIR)/map.noexbss
+MAPFILE_NOEXBSS = /usr/lib/ld/map.noexbss
MAPFILE_NOEXDATA_sparc = $(MAPFILE_NOEXBSS)
MAPFILE_NOEXDATA_i386 = /usr/lib/ld/map.noexdata
MAPFILE_NOEXDATA = $(MAPFILE_NOEXDATA_$(MACH))
--- a/open-src/common/mapfiles/map.noexbss Tue Dec 22 14:11:11 2009 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#ident "@(#)map.noexbss 1.5 05/09/02 SMI"
-#
-# Copyright 2005 by Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-############################################################################
-#
-# Make bss section non-executable for further buffer overflow protection
-# (can't make whole data section non-exec on SPARC since that includes PLT
-# which must be executable on SPARC).
-bss = ?RW;