1.1 --- a/make/common/shared/Compiler-gcc.gmk Fri Mar 09 11:58:08 2012 -0800
1.2 +++ b/make/common/shared/Compiler-gcc.gmk Wed Mar 14 13:50:37 2012 -0700
1.3 @@ -67,7 +67,7 @@
1.4 CXX = $(COMPILER_PATH)g++
1.5 endif
1.6 # Option used to create a shared library
1.7 - SHARED_LIBRARY_FLAG = -shared -mimpure-text
1.8 + SHARED_LIBRARY_FLAG = -shared
1.9 SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
1.10
1.11 endif
2.1 --- a/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800
2.2 +++ b/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700
2.3 @@ -90,7 +90,7 @@
2.4 OBJECTS=$(SOURCES:%.c=%.o)
2.5 # Library name and options needed to build it
2.6 LIBRARY=lib$(LIBNAME).so
2.7 - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
2.8 + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
2.9 # Libraries we are dependent on
2.10 LIBRARIES=-lc
2.11 # Building a shared library
3.1 --- a/src/share/demo/jvmti/gctest/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800
3.2 +++ b/src/share/demo/jvmti/gctest/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700
3.3 @@ -90,7 +90,7 @@
3.4 OBJECTS=$(SOURCES:%.c=%.o)
3.5 # Library name and options needed to build it
3.6 LIBRARY=lib$(LIBNAME).so
3.7 - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
3.8 + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
3.9 # Libraries we are dependent on
3.10 LIBRARIES=-lc
3.11 # Building a shared library
4.1 --- a/src/share/demo/jvmti/heapTracker/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800
4.2 +++ b/src/share/demo/jvmti/heapTracker/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700
4.3 @@ -94,7 +94,7 @@
4.4 OBJECTS=$(SOURCES:%.c=%.o)
4.5 # Library name and options needed to build it
4.6 LIBRARY=lib$(LIBNAME).so
4.7 - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
4.8 + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
4.9 # Libraries we are dependent on
4.10 LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
4.11 # Building a shared library
5.1 --- a/src/share/demo/jvmti/heapViewer/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800
5.2 +++ b/src/share/demo/jvmti/heapViewer/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700
5.3 @@ -90,7 +90,7 @@
5.4 OBJECTS=$(SOURCES:%.c=%.o)
5.5 # Library name and options needed to build it
5.6 LIBRARY=lib$(LIBNAME).so
5.7 - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
5.8 + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
5.9 # Libraries we are dependent on
5.10 LIBRARIES=-lc
5.11 # Building a shared library
6.1 --- a/src/share/demo/jvmti/hprof/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800
6.2 +++ b/src/share/demo/jvmti/hprof/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700
6.3 @@ -130,7 +130,7 @@
6.4 OBJECTS=$(SOURCES:%.c=%.o)
6.5 # Library name and options needed to build it
6.6 LIBRARY=lib$(LIBNAME).so
6.7 - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
6.8 + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
6.9 # Libraries we are dependent on
6.10 LIBRARIES= -ldl -lc
6.11 # Building a shared library
7.1 --- a/src/share/demo/jvmti/index.html Fri Mar 09 11:58:08 2012 -0800
7.2 +++ b/src/share/demo/jvmti/index.html Wed Mar 14 13:50:37 2012 -0700
7.3 @@ -308,7 +308,7 @@
7.4 <code><ul>
7.5 gcc -O2 -fPIC -pthread -DLINUX -c <i>*.c</i>
7.6 <br>
7.7 -gcc -z defs -static-libgcc -shared -mimpure-text -o <i>libXXX.so *.o</i> -lc
7.8 +gcc -z defs -static-libgcc -shared -o <i>libXXX.so *.o</i> -lc
7.9 </code></ul>
7.10 <br>
7.11 For AMD64:
7.12 @@ -316,7 +316,7 @@
7.13 <code><ul>
7.14 gcc -O2 -fPIC -pthread -DLINUX -D_LP64=1 -c <i>*.c</i>
7.15 <br>
7.16 -gcc -z defs -static-libgcc -shared -mimpure-text -o <i>libXXX.so *.o</i> -lc
7.17 +gcc -z defs -static-libgcc -shared -o <i>libXXX.so *.o</i> -lc
7.18 </code></ul>
7.19 <br>
7.20 </li>
7.21 @@ -339,7 +339,7 @@
7.22 </li>
7.23
7.24 <li>
7.25 -Library: Use -static-libgcc -mimpure-text.
7.26 +Library: Use -static-libgcc.
7.27 <br>
7.28 When building the shared library (-shared option), this option
7.29 allows for maximum portability of the library between different
8.1 --- a/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800
8.2 +++ b/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700
8.3 @@ -90,7 +90,7 @@
8.4 OBJECTS=$(SOURCES:%.c=%.o)
8.5 # Library name and options needed to build it
8.6 LIBRARY=lib$(LIBNAME).so
8.7 - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
8.8 + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
8.9 # Libraries we are dependent on
8.10 LIBRARIES=-lc
8.11 # Building a shared library
9.1 --- a/src/share/demo/jvmti/minst/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800
9.2 +++ b/src/share/demo/jvmti/minst/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700
9.3 @@ -94,7 +94,7 @@
9.4 OBJECTS=$(SOURCES:%.c=%.o)
9.5 # Library name and options needed to build it
9.6 LIBRARY=lib$(LIBNAME).so
9.7 - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
9.8 + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
9.9 # Libraries we are dependent on
9.10 LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
9.11 # Building a shared library
10.1 --- a/src/share/demo/jvmti/mtrace/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800
10.2 +++ b/src/share/demo/jvmti/mtrace/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700
10.3 @@ -94,7 +94,7 @@
10.4 OBJECTS=$(SOURCES:%.c=%.o)
10.5 # Library name and options needed to build it
10.6 LIBRARY=lib$(LIBNAME).so
10.7 - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
10.8 + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
10.9 # Libraries we are dependent on
10.10 LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
10.11 # Building a shared library
11.1 --- a/src/share/demo/jvmti/versionCheck/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800
11.2 +++ b/src/share/demo/jvmti/versionCheck/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700
11.3 @@ -90,7 +90,7 @@
11.4 OBJECTS=$(SOURCES:%.c=%.o)
11.5 # Library name and options needed to build it
11.6 LIBRARY=lib$(LIBNAME).so
11.7 - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
11.8 + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
11.9 # Libraries we are dependent on
11.10 LIBRARIES=-lc
11.11 # Building a shared library
12.1 --- a/src/share/demo/jvmti/waiters/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800
12.2 +++ b/src/share/demo/jvmti/waiters/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700
12.3 @@ -91,7 +91,7 @@
12.4 OBJECTS=$(SOURCES:%.cpp=%.o)
12.5 # Library name and options needed to build it
12.6 LIBRARY=lib$(LIBNAME).so
12.7 - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
12.8 + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
12.9 # Libraries we are dependent on
12.10 LIBRARIES=
12.11 # Building a shared library