From 1ee1acb94fbefa01a7f31e64a1c731d53dd6c308 Mon Sep 17 00:00:00 2001
From: Deepak Bhole <dbhole@redhat.com>
Date: Thu, 8 Mar 2012 14:04:44 +0000
Subject: [PATCH] 7150392: Linux build breaks with GCC 4.7 due to unrecognized
 option

Remove -mimpure-text option.

Reviewed-by: ohair, dholmes, phh, andrew
---
 jdk/make/common/shared/Compiler-gcc.gmk                     | 2 +-
 .../share/demo/jvmti/compiledMethodLoad/sample.makefile.txt | 2 +-
 jdk/src/share/demo/jvmti/gctest/sample.makefile.txt         | 2 +-
 jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt    | 2 +-
 jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt     | 2 +-
 jdk/src/share/demo/jvmti/hprof/sample.makefile.txt          | 2 +-
 jdk/src/share/demo/jvmti/index.html                         | 6 +++---
 jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt  | 2 +-
 jdk/src/share/demo/jvmti/minst/sample.makefile.txt          | 2 +-
 jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt         | 2 +-
 jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt   | 2 +-
 jdk/src/share/demo/jvmti/waiters/sample.makefile.txt        | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/jdk/make/common/shared/Compiler-gcc.gmk b/jdk/make/common/shared/Compiler-gcc.gmk
index 092ec168346..9dde0bae387 100644
--- a/jdk/make/common/shared/Compiler-gcc.gmk
+++ b/jdk/make/common/shared/Compiler-gcc.gmk
@@ -67,7 +67,7 @@ ifeq ($(PLATFORM), linux)
     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/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt b/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt
index 22e2cec9ffc..e214792396f 100644
--- a/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt
@@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
     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/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt b/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt
index b14ea70d9e8..99fa39907ae 100644
--- a/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt
@@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
     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/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt b/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt
index 83e7d79595a..a58f7101693 100644
--- a/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt
@@ -94,7 +94,7 @@ ifeq ($(OSNAME), linux)
     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/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt b/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt
index a4e3d7171b7..9f7604668a2 100644
--- a/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt
@@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
     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/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt b/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt
index 8028cd86f01..8da8100a720 100644
--- a/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt
@@ -130,7 +130,7 @@ ifeq ($(OSNAME), linux)
     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/jdk/src/share/demo/jvmti/index.html b/jdk/src/share/demo/jvmti/index.html
index 6ef96bb64b8..b66ac8d9bfa 100644
--- a/jdk/src/share/demo/jvmti/index.html
+++ b/jdk/src/share/demo/jvmti/index.html
@@ -308,7 +308,7 @@ For X86:
 <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 @@ For AMD64:
 <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 @@ option.
 </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/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt b/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt
index 51f07963584..a2ec685554e 100644
--- a/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt
@@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
     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/jdk/src/share/demo/jvmti/minst/sample.makefile.txt b/jdk/src/share/demo/jvmti/minst/sample.makefile.txt
index be8910bbfe5..42da35be3ab 100644
--- a/jdk/src/share/demo/jvmti/minst/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/minst/sample.makefile.txt
@@ -94,7 +94,7 @@ ifeq ($(OSNAME), linux)
     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/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt b/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt
index c75a5e899df..b1032825e7b 100644
--- a/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt
@@ -94,7 +94,7 @@ ifeq ($(OSNAME), linux)
     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/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt b/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt
index 3028a85bcd4..9b7abd4c014 100644
--- a/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt
@@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
     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/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt b/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt
index 70d66bd822f..68ac497e7a1 100644
--- a/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt
@@ -91,7 +91,7 @@ ifeq ($(OSNAME), linux)
     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