Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 5127:cdbb33303ea3 jdk8-b30
Merge
author | katleman |
---|---|
date | Wed, 14 Mar 2012 13:50:37 -0700 |
parents | 71f12f70251a (current diff) d8e197124943 (diff) |
children | c373b5baa1e9 f7dedbbb52eb |
files | |
diffstat | 12 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Compiler-gcc.gmk Fri Mar 09 11:58:08 2012 -0800 +++ b/make/common/shared/Compiler-gcc.gmk Wed Mar 14 13:50:37 2012 -0700 @@ -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
--- a/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800 +++ b/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700 @@ -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
--- a/src/share/demo/jvmti/gctest/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800 +++ b/src/share/demo/jvmti/gctest/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700 @@ -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
--- a/src/share/demo/jvmti/heapTracker/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800 +++ b/src/share/demo/jvmti/heapTracker/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700 @@ -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
--- a/src/share/demo/jvmti/heapViewer/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800 +++ b/src/share/demo/jvmti/heapViewer/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700 @@ -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
--- a/src/share/demo/jvmti/hprof/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800 +++ b/src/share/demo/jvmti/hprof/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700 @@ -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
--- a/src/share/demo/jvmti/index.html Fri Mar 09 11:58:08 2012 -0800 +++ b/src/share/demo/jvmti/index.html Wed Mar 14 13:50:37 2012 -0700 @@ -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
--- a/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800 +++ b/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700 @@ -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
--- a/src/share/demo/jvmti/minst/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800 +++ b/src/share/demo/jvmti/minst/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700 @@ -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
--- a/src/share/demo/jvmti/mtrace/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800 +++ b/src/share/demo/jvmti/mtrace/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700 @@ -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
--- a/src/share/demo/jvmti/versionCheck/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800 +++ b/src/share/demo/jvmti/versionCheck/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700 @@ -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
--- a/src/share/demo/jvmti/waiters/sample.makefile.txt Fri Mar 09 11:58:08 2012 -0800 +++ b/src/share/demo/jvmti/waiters/sample.makefile.txt Wed Mar 14 13:50:37 2012 -0700 @@ -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