[java-1.7.0-openjdk] Revert more upstream arm32 changes

[Omair Majid]

commit 7ac909995ae1e9d0c8f941248e6de270c645a66c
Author: Omair Majid <omajid at redhat.com>
Date:   Thu Jul 25 23:49:22 2013 -0400

    Revert more upstream arm32 changes

 java-1.7.0-openjdk.spec |    3 +++
 remove_CC_COMP.patch    |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 0 deletions(-)
---
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 70539d5..4477f4a 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -258,6 +258,7 @@ Patch403: PStack-808293.patch
 Patch404: aarch64.patch
 
 Patch405: zeroCtmp.patch
+Patch406: remove_CC_COMP.patch
 # End of tmp patches
 
 BuildRequires: autoconf
@@ -519,6 +520,7 @@ tar xzf %{SOURCE7}
 %endif
 
 %patch405 -p1
+%patch406
 
 %build
 # How many cpu's do we have?
@@ -1278,6 +1280,7 @@ exit 0
 - removed patch 103 arm-fixes.patch
 - added ZERO_ARCHFLAG="-D_LITTLE_ENDIAN"  for zero (arm) builds
 - temporary added already upstreamed patch 405 zeroCtmp.patch
+- revert upstream changes: remove_CC_COMP.patch
 
 * Wed Jul 24 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.3.10.11.f20
 - added support for aarch64
diff --git a/remove_CC_COMP.patch b/remove_CC_COMP.patch
new file mode 100644
index 0000000..270b4b0
--- /dev/null
+++ b/remove_CC_COMP.patch
@@ -0,0 +1,40 @@
+diff --git a/make/linux/makefiles/rules.make b/make/linux/makefiles/rules.make
+--- openjdk/hotspot/make/linux/makefiles/rules.make
++++ openjdk/hotspot/make/linux/makefiles/rules.make
+@@ -31,10 +31,7 @@
+ DEMANGLE        = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@
+ 
+ # $(CC) is the c compiler (cc/gcc), $(CXX) is the c++ compiler (CC/g++).
+-# FIXME: $(CXXFLAGS) currently only includes preprocessor flags while
+-# $(CFLAGS) includes C and C++ flags.  Ideally, there should be three
+-# variables: $(CFLAGS), $(CXXFLAGS) and $(CPPFLAGS).
+-CC_COMPILE       = $(CC) $(CXXFLAGS)
++CC_COMPILE       = $(CC) $(CXXFLAGS) $(CFLAGS)
+ CXX_COMPILE      = $(CXX) $(CXXFLAGS) $(CFLAGS)
+ 
+ AS.S            = $(AS) $(ASFLAGS)
+diff --git a/make/linux/makefiles/zeroshark.make b/make/linux/makefiles/zeroshark.make
+--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -41,17 +41,17 @@
+ 	./mkoffsets > $@
+ 
+ bytecodes_arm.s: bytecodes_arm.def mkbc
+-	@echo Generating ARM assembler bytecode sequences
+-	$(CXX_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
++	@echo Generatine ARM assembler bytecode sequences
++	$(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
+ 
+ mkbc:	$(GAMMADIR)/tools/mkbc.c
+ 	@echo Compiling mkbc tool
+-	$(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
++	$(CC) -o $@ $< $(COMPILE_DONE)
+ 
+ mkoffsets:	asm_helper.cpp
+ 	@echo Compiling offset generator
+ 	$(QUIETLY) $(REMOVE_TARGET)
+-	$(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
++	$(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
+ 
+ endif
+