--- openjdk/hotspot/make/linux/makefiles/gcc.make.orig	2014-01-27 11:43:44.000000000 +0000
+++ openjdk/hotspot/make/linux/makefiles/gcc.make	2014-01-30 15:51:23.507418895 +0000
@@ -295,6 +295,7 @@
 
 # Enable linker optimization
 LFLAGS += -Xlinker -O1
+LFLAGS += -Wl,-Bsymbolic-functions
 
 ifeq ($(USE_CLANG),)
   # If this is a --hash-style=gnu system, use --hash-style=both
--- openjdk/hotspot/agent/src/os/linux/Makefile.orig	2014-01-30 15:51:23.507418895 +0000
+++ openjdk/hotspot/agent/src/os/linux/Makefile	2014-01-30 15:52:15.307790918 +0000
@@ -77,7 +77,7 @@
 LFLAGS_LIBSA += $(LDFLAGS_HASH_STYLE)
 
 $(LIBSA): $(ARCH) $(OBJS) mapfile
-        $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS)
+        $(GCC) -shared -Wl,-Bsymbolic-functions $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS)
 
 test.o: test.c
 	$(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c
--- openjdk/jdk/make/common/Defs-linux.gmk.orig	2014-01-30 15:50:28.335021361 +0000
+++ openjdk/jdk/make/common/Defs-linux.gmk	2014-01-30 15:51:23.507418895 +0000
@@ -351,7 +351,7 @@
 
 EXTRA_LIBS += -lc
 
-LDFLAGS_DEFS_OPTION  = -Xlinker -z -Xlinker defs
+LDFLAGS_DEFS_OPTION  = -Xlinker -z -Xlinker defs -Wl,-Bsymbolic-functions
 LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
 
 #