# HG changeset patch # User andrew # Date 1331215484 0 # Node ID 1f93da3840f72ffd8a54c9926a4570a7342801b5 # Parent e070119aa56ee4dc5506c19d2c4d2eecab8ad429 7150392: Linux build breaks with GCC 4.7 due to unrecognized option Summary: Remove -mimpure-text option. Reviewed-by: ohair, dholmes, phh, andrew Contributed-by: Deepak Bhole diff -r e070119aa56e -r 1f93da3840f7 jdk/make/common/shared/Compiler-gcc.gmk --- a/jdk/make/common/shared/Compiler-gcc.gmk Wed Jul 05 18:04:46 2017 +0200 +++ b/jdk/make/common/shared/Compiler-gcc.gmk Thu Mar 08 14:04:44 2012 +0000 @@ -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 -r e070119aa56e -r 1f93da3840f7 jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt --- a/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt Wed Jul 05 18:04:46 2017 +0200 +++ b/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt Thu Mar 08 14:04:44 2012 +0000 @@ -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 -r e070119aa56e -r 1f93da3840f7 jdk/src/share/demo/jvmti/gctest/sample.makefile.txt --- a/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt Wed Jul 05 18:04:46 2017 +0200 +++ b/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt Thu Mar 08 14:04:44 2012 +0000 @@ -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 -r e070119aa56e -r 1f93da3840f7 jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt --- a/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt Wed Jul 05 18:04:46 2017 +0200 +++ b/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt Thu Mar 08 14:04:44 2012 +0000 @@ -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 -r e070119aa56e -r 1f93da3840f7 jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt --- a/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt Wed Jul 05 18:04:46 2017 +0200 +++ b/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt Thu Mar 08 14:04:44 2012 +0000 @@ -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 -r e070119aa56e -r 1f93da3840f7 jdk/src/share/demo/jvmti/hprof/sample.makefile.txt --- a/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt Wed Jul 05 18:04:46 2017 +0200 +++ b/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt Thu Mar 08 14:04:44 2012 +0000 @@ -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 -r e070119aa56e -r 1f93da3840f7 jdk/src/share/demo/jvmti/index.html --- a/jdk/src/share/demo/jvmti/index.html Wed Jul 05 18:04:46 2017 +0200 +++ b/jdk/src/share/demo/jvmti/index.html Thu Mar 08 14:04:44 2012 +0000 @@ -308,7 +308,7 @@
For AMD64: @@ -316,7 +316,7 @@
@@ -339,7 +339,7 @@
  • -Library: Use -static-libgcc -mimpure-text. +Library: Use -static-libgcc.
    When building the shared library (-shared option), this option allows for maximum portability of the library between different diff -r e070119aa56e -r 1f93da3840f7 jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt --- a/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt Wed Jul 05 18:04:46 2017 +0200 +++ b/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt Thu Mar 08 14:04:44 2012 +0000 @@ -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 -r e070119aa56e -r 1f93da3840f7 jdk/src/share/demo/jvmti/minst/sample.makefile.txt --- a/jdk/src/share/demo/jvmti/minst/sample.makefile.txt Wed Jul 05 18:04:46 2017 +0200 +++ b/jdk/src/share/demo/jvmti/minst/sample.makefile.txt Thu Mar 08 14:04:44 2012 +0000 @@ -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 -r e070119aa56e -r 1f93da3840f7 jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt --- a/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt Wed Jul 05 18:04:46 2017 +0200 +++ b/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt Thu Mar 08 14:04:44 2012 +0000 @@ -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 -r e070119aa56e -r 1f93da3840f7 jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt --- a/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt Wed Jul 05 18:04:46 2017 +0200 +++ b/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt Thu Mar 08 14:04:44 2012 +0000 @@ -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 -r e070119aa56e -r 1f93da3840f7 jdk/src/share/demo/jvmti/waiters/sample.makefile.txt --- a/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt Wed Jul 05 18:04:46 2017 +0200 +++ b/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt Thu Mar 08 14:04:44 2012 +0000 @@ -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