/hg/release/icedtea7-forest-2.1/jdk: 7150392: Linux build breaks...

[adinn at icedtea.classpath.org]

changeset 7ceda3124828 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=7ceda3124828
author: andrew
date: Wed Apr 11 14:58:50 2012 +0100

	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 <dbhole at redhat.com>


diffstat:

 make/common/shared/Compiler-gcc.gmk                         |  2 +-
 src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt |  2 +-
 src/share/demo/jvmti/gctest/sample.makefile.txt             |  2 +-
 src/share/demo/jvmti/heapTracker/sample.makefile.txt        |  2 +-
 src/share/demo/jvmti/heapViewer/sample.makefile.txt         |  2 +-
 src/share/demo/jvmti/hprof/sample.makefile.txt              |  2 +-
 src/share/demo/jvmti/index.html                             |  6 +++---
 src/share/demo/jvmti/java_crw_demo/sample.makefile.txt      |  2 +-
 src/share/demo/jvmti/minst/sample.makefile.txt              |  2 +-
 src/share/demo/jvmti/mtrace/sample.makefile.txt             |  2 +-
 src/share/demo/jvmti/versionCheck/sample.makefile.txt       |  2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diffs (150 lines):

diff -r 2d8ad70a2243 -r 7ceda3124828 make/common/shared/Compiler-gcc.gmk
--- a/make/common/shared/Compiler-gcc.gmk	Fri Mar 02 10:18:25 2012 -0500
+++ b/make/common/shared/Compiler-gcc.gmk	Wed Apr 11 14:58:50 2012 +0100
@@ -133,7 +133,7 @@
     REQUIRED_GCC_VER = 4.0.*
   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 2d8ad70a2243 -r 7ceda3124828 src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt
--- a/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Fri Mar 02 10:18:25 2012 -0500
+++ b/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Wed Apr 11 14:58:50 2012 +0100
@@ -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 2d8ad70a2243 -r 7ceda3124828 src/share/demo/jvmti/gctest/sample.makefile.txt
--- a/src/share/demo/jvmti/gctest/sample.makefile.txt	Fri Mar 02 10:18:25 2012 -0500
+++ b/src/share/demo/jvmti/gctest/sample.makefile.txt	Wed Apr 11 14:58:50 2012 +0100
@@ -90,7 +90,7 @@
     OBJECTS=$(SOURCES:%.c=%.o)
     # Library name and options needed to build it
     LIBRARY=../lib/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 2d8ad70a2243 -r 7ceda3124828 src/share/demo/jvmti/heapTracker/sample.makefile.txt
--- a/src/share/demo/jvmti/heapTracker/sample.makefile.txt	Fri Mar 02 10:18:25 2012 -0500
+++ b/src/share/demo/jvmti/heapTracker/sample.makefile.txt	Wed Apr 11 14:58:50 2012 +0100
@@ -96,7 +96,7 @@
     OBJECTS=$(SOURCES:%.c=%.o)
     # Library name and options needed to build it
     LIBRARY=../lib/lib$(LIBNAME).so
-    LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+    LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
     # Libraries we are dependent on
     LIBRARIES=-L../../java_crw_demo/src/ -ljava_crw_demo -lc
     # Building a shared library
diff -r 2d8ad70a2243 -r 7ceda3124828 src/share/demo/jvmti/heapViewer/sample.makefile.txt
--- a/src/share/demo/jvmti/heapViewer/sample.makefile.txt	Fri Mar 02 10:18:25 2012 -0500
+++ b/src/share/demo/jvmti/heapViewer/sample.makefile.txt	Wed Apr 11 14:58:50 2012 +0100
@@ -90,7 +90,7 @@
     OBJECTS=$(SOURCES:%.c=%.o)
     # Library name and options needed to build it
     LIBRARY=../lib/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 2d8ad70a2243 -r 7ceda3124828 src/share/demo/jvmti/hprof/sample.makefile.txt
--- a/src/share/demo/jvmti/hprof/sample.makefile.txt	Fri Mar 02 10:18:25 2012 -0500
+++ b/src/share/demo/jvmti/hprof/sample.makefile.txt	Wed Apr 11 14:58:50 2012 +0100
@@ -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 2d8ad70a2243 -r 7ceda3124828 src/share/demo/jvmti/index.html
--- a/src/share/demo/jvmti/index.html	Fri Mar 02 10:18:25 2012 -0500
+++ b/src/share/demo/jvmti/index.html	Wed Apr 11 14:58:50 2012 +0100
@@ -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 -r 2d8ad70a2243 -r 7ceda3124828 src/share/demo/jvmti/java_crw_demo/sample.makefile.txt
--- a/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt	Fri Mar 02 10:18:25 2012 -0500
+++ b/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt	Wed Apr 11 14:58:50 2012 +0100
@@ -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 2d8ad70a2243 -r 7ceda3124828 src/share/demo/jvmti/minst/sample.makefile.txt
--- a/src/share/demo/jvmti/minst/sample.makefile.txt	Fri Mar 02 10:18:25 2012 -0500
+++ b/src/share/demo/jvmti/minst/sample.makefile.txt	Wed Apr 11 14:58:50 2012 +0100
@@ -96,7 +96,7 @@
     OBJECTS=$(SOURCES:%.c=%.o)
     # Library name and options needed to build it
     LIBRARY=../lib/lib$(LIBNAME).so
-    LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+    LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
     # Libraries we are dependent on
     LIBRARIES=-L../../java_crw_demo/src/ -ljava_crw_demo -lc
     # Building a shared library
diff -r 2d8ad70a2243 -r 7ceda3124828 src/share/demo/jvmti/mtrace/sample.makefile.txt
--- a/src/share/demo/jvmti/mtrace/sample.makefile.txt	Fri Mar 02 10:18:25 2012 -0500
+++ b/src/share/demo/jvmti/mtrace/sample.makefile.txt	Wed Apr 11 14:58:50 2012 +0100
@@ -96,7 +96,7 @@
     OBJECTS=$(SOURCES:%.c=%.o)
     # Library name and options needed to build it
     LIBRARY=../lib/lib$(LIBNAME).so
-    LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+    LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
     # Libraries we are dependent on
     LIBRARIES=-L../../java_crw_demo/src -ljava_crw_demo -lc
 
diff -r 2d8ad70a2243 -r 7ceda3124828 src/share/demo/jvmti/versionCheck/sample.makefile.txt
--- a/src/share/demo/jvmti/versionCheck/sample.makefile.txt	Fri Mar 02 10:18:25 2012 -0500
+++ b/src/share/demo/jvmti/versionCheck/sample.makefile.txt	Wed Apr 11 14:58:50 2012 +0100
@@ -90,7 +90,7 @@
     OBJECTS=$(SOURCES:%.c=%.o)
     # Library name and options needed to build it
     LIBRARY=../lib/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