File java-1.6.0-openjdk-optflags.patch of Package java-1_6_0-openjdk
--- openjdkold/icedtea6/patches/icedtea-optflags.patch 1969-12-31 19:00:00.000000000 -0500
+++ patches/icedtea-optflags.patch 2008-04-01 08:41:47.000000000 -0400
@@ -0,0 +1,59 @@
+--- oldopenjdk/hotspot/src/share/vm/libadt/port.hpp 2008-02-28 05:02:37.000000000 -0500
++++ openjdk/hotspot/src/share/vm/libadt/port.hpp 2008-03-14 16:21:10.000000000 -0400
+@@ -39,8 +39,8 @@
+ #include <string.h>
+ #undef bzero
+ inline void bzero(void *b, int len) { memset(b,0,len); }
+-#undef bcopy
+-inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
++//#undef bcopy
++//inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
+ #undef bcmp
+ inline int bcmp(const void *s,const void *t,int len) { return memcmp(s,t,len);}
+ extern "C" unsigned long strtoul(const char *s, char **end, int base);
+--- oldopenjdk/hotspot/build/linux/makefiles/rules.make 2008-03-19 01:02:55.000000000 -0400
++++ openjdk/hotspot/build/linux/makefiles/rules.make 2008-03-19 10:47:33.000000000 -0400
+@@ -37,8 +37,8 @@
+ DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@
+
+ # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++).
+-C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
+-CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS)
++C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(ALT_OPT_CFLAGS)
++CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS) $(ALT_OPT_CFLAGS)
+
+ AS.S = $(AS) $(ASFLAGS)
+
+--- oldopenjdk/hotspot/agent/src/os/linux/Makefile 2008-03-19 01:02:55.000000000 -0400
++++ openjdk/hotspot/agent/src/os/linux/Makefile 2008-03-19 10:58:51.000000000 -0400
+@@ -40,7 +40,7 @@
+
+ LIBS = -lthread_db
+
+-CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES)
++CFLAGS = -c $(ALT_OPT_CFLAGS) -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES)
+
+ LIBSA = $(ARCH)/libsaproc.so
+
+--- oldopenjdk/corba/make/common/Defs.gmk 2008-02-28 05:04:22.000000000 -0500
++++ openjdk/corba/make/common/Defs.gmk 2008-03-19 11:37:33.000000000 -0400
+@@ -444,7 +444,7 @@
+ # Tool flags
+ #
+ ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS)
+-CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS)
++CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(ALT_OPT_CFLAGS)
+ CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
+ CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
+ $(DEFINES) $(OPTIONS:%=-D%)
+--- oldopenjdk/jdk/make/common/Defs.gmk 2008-03-19 01:02:55.000000000 -0400
++++ openjdk/jdk/make/common/Defs.gmk 2008-03-19 11:38:19.000000000 -0400
+@@ -664,7 +664,7 @@
+ # Tool flags
+ #
+ ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS)
+-CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS)
++CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(ALT_OPT_CFLAGS)
+ CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
+ CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
+ $(DEFINES) $(OPTIONS:%=-D%)
--- Makefile.am.orig 2008-04-18 10:06:32.000000000 -0400
+++ Makefile.am 2008-04-18 10:09:54.000000000 -0400
@@ -98,6 +98,7 @@
"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" \
+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
@@ -155,6 +156,7 @@
"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" \
+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
@@ -298,6 +300,7 @@
patches/icedtea-ia64-fdlibm.patch \
patches/icedtea-LCMS-setTagData.patch \
patches/icedtea-color-createcontext.patch \
+ patches/icedtea-optflags.patch \
$(GCC_PATCH) \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
--- Makefile.in.orig 2008-04-18 10:06:37.000000000 -0400
+++ Makefile.in 2008-04-18 10:10:43.000000000 -0400
@@ -79,6 +79,7 @@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
+ALT_OPT_CFLAGS = @ALT_OPT_CFLAGS@
AMTAR = @AMTAR@
ANT = @ANT@
AUTOCONF = @AUTOCONF@
@@ -299,7 +300,7 @@
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \
$(am__append_2)
@@ -339,7 +340,7 @@
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_3) \
$(am__append_4)
@@ -405,7 +406,8 @@
patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
patches/icedtea-ia64-fdlibm.patch \
patches/icedtea-LCMS-setTagData.patch \
- patches/icedtea-color-createcontext.patch $(GCC_PATCH) \
+ patches/icedtea-color-createcontext.patch \
+ patches/icedtea-optflags.patch $(GCC_PATCH) \
$(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_5)
# Patch OpenJDK for plug replacements and ecj.
--- configure.orig 2008-04-18 10:06:54.000000000 -0400
+++ configure 2008-04-18 10:10:32.000000000 -0400
@@ -720,6 +720,7 @@
FASTJAR
ac_ct_FASTJAR
GAWK
+ALT_OPT_CFLAGS
SYSTEM_GCJ_DIR
SYSTEM_OPENJDK_DIR
SYSTEM_ICEDTEA_DIR
@@ -5790,6 +5791,9 @@
+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
+
+
# Check whether --with-gcj-home was given.
if test "${with_gcj_home+set}" = set; then
@@ -12948,6 +12952,7 @@
FASTJAR!$FASTJAR$ac_delim
ac_ct_FASTJAR!$ac_ct_FASTJAR$ac_delim
GAWK!$GAWK$ac_delim
+ALT_OPT_CFLAGS!$ALT_OPT_CFLAGS$ac_delim
SYSTEM_GCJ_DIR!$SYSTEM_GCJ_DIR$ac_delim
SYSTEM_OPENJDK_DIR!$SYSTEM_OPENJDK_DIR$ac_delim
SYSTEM_ICEDTEA_DIR!$SYSTEM_ICEDTEA_DIR$ac_delim
@@ -13031,7 +13036,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- configure.ac.orig 2008-04-18 10:06:46.000000000 -0400
+++ configure.ac 2008-04-18 10:10:28.000000000 -0400
@@ -31,6 +31,9 @@
dnl check for it explicitly rather than using AC_PROG_AWK.
FIND_TOOL([GAWK], [gawk])
+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1;s/$/ -fomit-frame-pointer/')"
+AC_SUBST(ALT_OPT_CFLAGS)
+
AC_ARG_WITH([gcj-home],
[AS_HELP_STRING([--with-gcj-home],
[gcj home directory \
