Merge
diff --git a/.hgtags b/.hgtags
index d73a2f1..4935ca8 100644
--- a/.hgtags
+++ b/.hgtags
@@ -151,3 +151,4 @@
c68342532e2e7deb3a25fc04ed3e4c142278f747 jdk8-b27
1e1d41daaded291ab3a370ca6a27f7325701978e jdk8-b28
c5b882dce0fe27e05dc64debc92b1fb9ebf880ec jdk8-b29
+cdbb33303ea344d5e9013e2dd642e7a6e7768db6 jdk8-b30
diff --git a/make/common/shared/Compiler-gcc.gmk b/make/common/shared/Compiler-gcc.gmk
index 092ec16..9dde0ba 100644
--- a/make/common/shared/Compiler-gcc.gmk
+++ b/make/common/shared/Compiler-gcc.gmk
@@ -67,7 +67,7 @@
CXX = $(COMPILER_PATH)g++
endif
# Option used to create a shared library
- SHARED_LIBRARY_FLAG = -shared -mimpure-text
+ SHARED_LIBRARY_FLAG = -shared
SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
endif
diff --git a/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt b/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt
index 22e2cec..e214792 100644
--- a/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt
+++ b/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt
@@ -90,7 +90,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff --git a/src/share/demo/jvmti/gctest/sample.makefile.txt b/src/share/demo/jvmti/gctest/sample.makefile.txt
index b14ea70..99fa399 100644
--- a/src/share/demo/jvmti/gctest/sample.makefile.txt
+++ b/src/share/demo/jvmti/gctest/sample.makefile.txt
@@ -90,7 +90,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff --git a/src/share/demo/jvmti/heapTracker/sample.makefile.txt b/src/share/demo/jvmti/heapTracker/sample.makefile.txt
index 83e7d79..a58f710 100644
--- a/src/share/demo/jvmti/heapTracker/sample.makefile.txt
+++ b/src/share/demo/jvmti/heapTracker/sample.makefile.txt
@@ -94,7 +94,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
# Building a shared library
diff --git a/src/share/demo/jvmti/heapViewer/sample.makefile.txt b/src/share/demo/jvmti/heapViewer/sample.makefile.txt
index a4e3d71..9f76046 100644
--- a/src/share/demo/jvmti/heapViewer/sample.makefile.txt
+++ b/src/share/demo/jvmti/heapViewer/sample.makefile.txt
@@ -90,7 +90,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff --git a/src/share/demo/jvmti/hprof/sample.makefile.txt b/src/share/demo/jvmti/hprof/sample.makefile.txt
index 8028cd8..8da8100 100644
--- a/src/share/demo/jvmti/hprof/sample.makefile.txt
+++ b/src/share/demo/jvmti/hprof/sample.makefile.txt
@@ -130,7 +130,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES= -ldl -lc
# Building a shared library
diff --git a/src/share/demo/jvmti/index.html b/src/share/demo/jvmti/index.html
index 6ef96bb..b66ac8d 100644
--- a/src/share/demo/jvmti/index.html
+++ b/src/share/demo/jvmti/index.html
@@ -308,7 +308,7 @@
<code><ul>
gcc -O2 -fPIC -pthread -DLINUX -c <i>*.c</i>
<br>
-gcc -z defs -static-libgcc -shared -mimpure-text -o <i>libXXX.so *.o</i> -lc
+gcc -z defs -static-libgcc -shared -o <i>libXXX.so *.o</i> -lc
</code></ul>
<br>
For AMD64:
@@ -316,7 +316,7 @@
<code><ul>
gcc -O2 -fPIC -pthread -DLINUX -D_LP64=1 -c <i>*.c</i>
<br>
-gcc -z defs -static-libgcc -shared -mimpure-text -o <i>libXXX.so *.o</i> -lc
+gcc -z defs -static-libgcc -shared -o <i>libXXX.so *.o</i> -lc
</code></ul>
<br>
</li>
@@ -339,7 +339,7 @@
</li>
<li>
-Library: Use -static-libgcc -mimpure-text.
+Library: Use -static-libgcc.
<br>
When building the shared library (-shared option), this option
allows for maximum portability of the library between different
diff --git a/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt b/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt
index 51f0796..a2ec685 100644
--- a/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt
+++ b/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt
@@ -90,7 +90,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff --git a/src/share/demo/jvmti/minst/sample.makefile.txt b/src/share/demo/jvmti/minst/sample.makefile.txt
index be8910b..42da35b 100644
--- a/src/share/demo/jvmti/minst/sample.makefile.txt
+++ b/src/share/demo/jvmti/minst/sample.makefile.txt
@@ -94,7 +94,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
# Building a shared library
diff --git a/src/share/demo/jvmti/mtrace/sample.makefile.txt b/src/share/demo/jvmti/mtrace/sample.makefile.txt
index c75a5e8..b103282 100644
--- a/src/share/demo/jvmti/mtrace/sample.makefile.txt
+++ b/src/share/demo/jvmti/mtrace/sample.makefile.txt
@@ -94,7 +94,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
# Building a shared library
diff --git a/src/share/demo/jvmti/versionCheck/sample.makefile.txt b/src/share/demo/jvmti/versionCheck/sample.makefile.txt
index 3028a85..9b7abd4 100644
--- a/src/share/demo/jvmti/versionCheck/sample.makefile.txt
+++ b/src/share/demo/jvmti/versionCheck/sample.makefile.txt
@@ -90,7 +90,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff --git a/src/share/demo/jvmti/waiters/sample.makefile.txt b/src/share/demo/jvmti/waiters/sample.makefile.txt
index 70d66bd..68ac497 100644
--- a/src/share/demo/jvmti/waiters/sample.makefile.txt
+++ b/src/share/demo/jvmti/waiters/sample.makefile.txt
@@ -91,7 +91,7 @@
OBJECTS=$(SOURCES:%.cpp=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=
# Building a shared library