Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2012-09-11 11:22:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes
2012-08-07 08:10:26.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes
2012-09-11 11:22:46.000000000 +0200
@@ -1,0 +2,91 @@
+Thu Sep 6 15:19:02 UTC 2012 - [email protected]
+
+- update directory ownership for i586
+
+-------------------------------------------------------------------
+Tue Sep 4 13:06:18 UTC 2012 - [email protected]
+
+- add Sources as full links, so that they can be verified
+- replace no-return-on-nonvoid patch with a more robust version
+ that annotates the nonreturning functions to avoid spurious
+ warnings that fail the build
+- fix build on ARM and i586
+- remove files that are no longer used
+
+-------------------------------------------------------------------
+Tue Sep 4 12:18:00 UTC 2012 - [email protected]
+
+- zero build can be enabled using rpmbuild (osc build) --with zero
+- add hotspot 2.1 needed for zero
+- fix filelist on %{ix86}
+
+-------------------------------------------------------------------
+Mon Sep 3 11:15:13 UTC 2012 - [email protected]
+
+- update to icedtea-2.3.2 / OpenJDK7 u6 (bnc#777499)
+* Security fixes
+ - S7162476, CVE-2012-1682: XMLDecoder security issue via ClassFinder
+ - S7194567, CVE-2012-3136: Improve long term persistence of java.beans
objects
+ - S7163201, CVE-2012-0547: Simplify toolkit internals references
+ - RH852051, CVE-2012-4681, S7162473: Reintroduce PackageAccessible checks
+ removed in 6788531.
+* OpenJDK
+ - Fix Zero FTBFS issues with 2.3
+ - S7180036: Build failure in Mac platform caused by fix # 7163201
+ - S7182135: Impossible to use some editors directly
+ - S7183701: [TEST] closed/java/beans/security/TestClassFinder.java –
compilation failed
+ - S7185678: java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java failed
with NPE
+* Bug fixes
+ - PR1149: Zero-specific patch files not being packaged
+- use icedtea tarball for build again, this led into following dropped files
+ because the are already in the tarball and simplified %prep and %build
+ - drop class-rewriter.tar.gz
+ - drop systemtap-tapset.tar.gz
+ - drop desktop-files.tar.gz
+ - drop nss.cfg
+ - drop pulseaudio.tar.gz
+ - drop remove-intree-libraries.sh
+ - add archives from icedtea7-forest-2.3 for openjdk, corba, jaxp, jaxws,
+ jdk, langtools and hotspot
+ - drop rhino.patch, pulse-soundproperties and systemtap patch
+- move gnome bridge patches before make as it's irritating to have the
+ patch fail after openjdk is built
+- use explicit file attributes in %files sections to prevent the file
+ permissions problems in a future (like bnc#770040)
+- changed version scheme, so it now matches Oracle Java
+ 1.7.0.6 == Java7 u 6
+
+-------------------------------------------------------------------
+Thu Aug 30 13:00:55 UTC 2012 - [email protected]
+
+- update to icedtea-2.3.1 / OpenJDK7 u6 (bnc#777499)
+* Security fixes
+ - RH852051, CVE-2012-4681: Reintroduce PackageAccessible checks
+ removed in 6788531.
+* Bug fixes
+ - PR902: PulseAudioClip getMicrosecondsLength() returns length in
+ milliseconds, not microseconds
+ - PR986: IcedTea7 fails to build with IcedTea6 CACAO due to low max heap
+ size
+ - PR1050: Stream objects not garbage collected
+ - PR1119: Only add classes to rt-source-files.txt if the class (or one or
+ more of its methods/fields) are actually missing from the boot JDK
+ - PR1137: Allow JARs to be optionally compressed by setting COMPRESS_JARS
+* OpenJDK
+ - Make dynamic support for GConf work again.
+ - PR1095: Add configure option for -Werror
+ - PR1101: Undefined symbols on GNU/Linux SPARC
+ - PR1140: Unnecessary diz files should not be installed
+ - S7192804, PR1138: Build should not install jvisualvm man page for OpenJDK
+* JamVM
+ - ARMv6 armhf: Changes for Raspbian (Raspberry Pi)
+ - PPC: Don't use lwsync if it isn't supported
+ - X86: Generate machine-dependent stubs for i386
+ - When suspending, ignore detached threads that have died, this prevents
+ a user caused deadlock when an external thread has been attached to the
+ VM via JNI and it has exited without detaching
+ - Add missing REF_TO_OBJs for references passed from JNI, this enable
+ JamVM to run Qt-Jambi
+- there are number of fixes in 2.3, see NEWS
+
+-------------------------------------------------------------------
Old:
----
class-rewriter.tar.gz
desktop-files.tar.gz
nss.cfg
openjdk-icedtea-2.2.1.tar.gz
pulse-soundproperties.patch
pulseaudio.tar.gz
remove-intree-libraries.sh
rhino.patch
systemtap-tapset.tar.gz
systemtap.patch
New:
----
47a867dd3005.tar.gz
7fae6a3a68c7.tar.gz
867d5041bee6.tar.gz
acba2d30209d.tar.gz
c89c6ac953e7.tar.gz
ea39d76b3bde.tar.gz
ee4bd94136ec.tar.gz
f78eb7e08ee1.tar.gz
icedtea-2.3.2.tar.gz
icedtea-2.3.2.tar.gz.sig
java-1_7_0-openjdk-add-memory-limit.patch
java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.4Ve4bg/_old 2012-09-11 11:22:50.000000000 +0200
+++ /var/tmp/diff_new_pack.4Ve4bg/_new 2012-09-11 11:22:50.000000000 +0200
@@ -28,6 +28,11 @@
%endif
%endif
+%ifnarch %{jit_arches}
+%define _with_zero 1
+%endif
+%bcond_with zero
+
# XXX: systemtap does not work with gcj
%if %{gcjbootstrap}
%define with_systemtap 0
@@ -38,11 +43,9 @@
# If runtests is 0 test suites will not be run.
%define runtests 0
-%define icedtea_version 2.2.1
+%define icedtea_version 2.3.2
%define hg_tag icedtea-{icedtea_version}-branchpoint
-%define openjdkver 147
-%define openjdkbuildver b%{openjdkver}
%define openjdkdate 27_jun_2011
%define accessmajorver 1.23
@@ -70,7 +73,7 @@
%define runtests 0
%endif
-%define buildoutputdir openjdk/build/linux-%{archbuild}
+%define buildoutputdir openjdk.build/
# Convert an absolute path to a relative path. Each symbolic link is
# specified relative to the directory in which it is installed so that
@@ -82,7 +85,7 @@
%define origin openjdk
%define priority 17147
%define javaver 1.7.0
-%define buildver 0
+%define buildver 6
# Standard JPackage directories and symbolic links.
%define sdklnk java-%{javaver}-%{origin}
@@ -116,28 +119,14 @@
%define cacerts %{_jvmdir}/%{jredir}/lib/security/cacerts
Name: java-1_7_0-openjdk
-Version: 1.7.0.0_%{openjdkver}
+Version: %{javaver}.%{buildver}
Release: 0
Summary: Java runtime environment based on OpenJDK 7 and IcedTea 7
License: GPL-2.0-with-classpath-exception
Group: Development/Languages/Java
Url: http://icedtea.classpath.org
-#XXX: Icedtea 2.2.1 does not build with zero - as a temporary workaround we
build older version
-# from package java-1_7_0-openjdk.zero for arm and power pc
-ExclusiveArch: %{jit_arches}
-
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/ openjdk -r
%{hg_tag}
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/corba/
openjdk/corba -r %{hg_tag}
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/hotspot/
openjdk/hotspot -r %{hg_tag}
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/jaxp/
openjdk/jaxp -r %{hg_tag}
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/jaxws/
openjdk/jaxws -r %{hg_tag}
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/jdk/
openjdk/jdk -r %{hg_tag}
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/langtools/
openjdk/langtools -r %{hg_tag}
-# find openjdk -name ".hg" -exec rm -rf '{}' \;
-# find openjdk -name ".hgtags" -exec rm -rf '{}' \;
-# tar czf openjdk-%{icedtea_version}.tar.gz openjdk
-Source0: openjdk-icedtea-%{icedtea_version}.tar.gz
+Source0: icedtea-%{icedtea_version}.tar.gz
# Gnome access bridge
#Source9:
%{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2
@@ -148,29 +137,21 @@
Source3: mauve-%{mauvedate}.tar.gz
Source4: mauve_tests
-# Class rewrite to rewrite rhino heirarchy
-Source7: class-rewriter.tar.gz
-
-# Systemtap tapsets. Zipped up to keep it small.
-Source8: systemtap-tapset.tar.gz
-
-# .desktop files. Zipped up to keep it small.
-Source9: desktop-files.tar.gz
-
-# nss configuration file
-Source10: nss.cfg
-
-# FIXME: Taken from IcedTea snapshot 877ad5f00f69, but needs to be moved out
-# hg clone -r 877ad5f00f69 http://icedtea.classpath.org/hg/icedtea7
-Source11: pulseaudio.tar.gz
-
-# Removed libraries that we link instead
-Source12: remove-intree-libraries.sh
+Source5:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/acba2d30209d.tar.gz
+Source6:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/7fae6a3a68c7.tar.gz
+Source7:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/ee4bd94136ec.tar.gz
+Source8:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/c89c6ac953e7.tar.gz
+Source9:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/f78eb7e08ee1.tar.gz
+Source10:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/867d5041bee6.tar.gz
+Source11:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/ea39d76b3bde.tar.gz
+Source12:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/47a867dd3005.tar.gz
#Source1000: java-1_7_0-openjdk-rpmlintrc
# those properties are for opeSUSE only
Source1001: fontconfig.SuSE.properties
+Source2000: icedtea-%{icedtea_version}.tar.gz.sig
+
# RPM/distribution specific patches
# Allow TCK to pass with access bridge wired in
@@ -195,8 +176,9 @@
# OpenJDK specific patches
#
+# DROP: included in icedtea tarball
# Add rhino support
-Patch100: rhino.patch
+# Patch100: rhino.patch
# Type fixing for s390
Patch101: java-1.7.0-openjdk-bitmap.patch
@@ -210,28 +192,20 @@
Patch106: java-1.7.0-openjdk-ppc-zero-hotspot.patch
#
-# Bootstrap patches (code with this is never shipped)
-#
-#XXX: skipped in openSUSE, as we will bootstrap using openjdk6
-
-#
# Optional component packages
#
-# Make the ALSA based mixer the default when building with the pulseaudio based
-# mixer
-Patch300: pulse-soundproperties.patch
-
-# SystemTap support
-# Workaround for RH613824
-Patch302: systemtap.patch
-
# SUSE patches - from java-1_6_0-openjdk package
Patch1000: java-1_7_0-openjdk-suse-desktop-files.patch
Patch1001: openjdk-7-src-b147-no-return-in-nonvoid.patch
Patch1002: openjdk-7-src-b147-stringcompare.patch
+# PATCH-FIX-OPENSUSE: limit the maximum heap size of a rewriter - it fails on
some servers
+Patch1003: java-1_7_0-openjdk-add-memory-limit.patch
+
+Patch1004: java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# special for hacking inside build dir
@@ -247,30 +221,23 @@
BuildRequires: libjpeg-devel
BuildRequires: liblcms2-devel
BuildRequires: libpng-devel
+BuildRequires: libxslt-tools
BuildRequires: rhino
BuildRequires: wget
BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel
BuildRequires: xorg-x11-proto-devel
+BuildRequires: xprop
#BuildRequires: xalan-j2
# make sure to use bootstrap requires of ant
#BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2 xml-commons-resolver xml-commons-apis xml-commons
BuildRequires: ant
BuildRequires: ant-nodeps
-BuildRequires: rhino
-%if %{gcjbootstrap}
-BuildRequires: ecj-bootstrap
-BuildRequires: java-1_5_0-gcj-compat-devel
-%else
BuildRequires: java-1_7_0-openjdk
BuildRequires: java-1_7_0-openjdk-devel
-#BuildRequires: java-devel-openjdk >= 1.6.0
-#BuildRequires: jre-openjdk >= 1.6.0
-%endif
-BuildRequires: zlib-devel
-
BuildRequires: mozilla-nss-devel
+BuildRequires: zlib-devel
# can be disabled using --disable-compile-against-syscalls
BuildRequires: libattr-devel
@@ -309,7 +276,7 @@
%endif
# Zero-assembler build requirement.
-%ifnarch %{jit_arches}
+%if %{with zero}
BuildRequires: libffi-devel
%endif
@@ -471,62 +438,16 @@
are provided by OpenJDK 7.
%prep
-%setup -q -c -n %{name}
-%setup -q -n %{name} -T -D -a 3
-%setup -q -n %{name} -T -D -a 1
+%setup -q -n icedtea-%{icedtea_version}
+%setup -q -n icedtea-%{icedtea_version} -T -D -a 3
+%setup -q -n icedtea-%{icedtea_version} -T -D -a 1
cp %{SOURCE4} .
-# OpenJDK patches
-%patch100
-
-# pulseaudio support
-%if %{with_pulseaudio}
-%patch300
-%endif
-
-# Add systemtap patches if enabled
-%if %{with_systemtap}
-%patch302
-%endif
-
-# Remove libraries that are linked
-sh %{SOURCE12}
+%patch1 -p1
-# Copy jaxp, jaf and jaxws drops
-mkdir drops/
-
-# Extract the generated files
-test -e %{SOURCE6} && tar xzf %{SOURCE6}
-
-# Extract the rewriter (to rewrite rhino classes)
-tar xzf %{SOURCE7}
-
-# Extract systemtap tapsets
-%if %{with_systemtap}
-
-tar xzf %{SOURCE8}
-
-for file in tapset/*.in; do
-
- OUTPUT_FILE=`echo $file | sed -e s:\.in$::g`
- sed -e
s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjvm.so:g
$file > $OUTPUT_FILE
- sed -i -e '/@ABS_CLIENT_LIBJVM_SO@/d' $OUTPUT_FILE
- sed -i -e s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir}:g $OUTPUT_FILE
- sed -i -e s:@INSTALL_ARCH_DIR@:%{archinstall}:g $OUTPUT_FILE
-
-done
-
-%endif
-
-# Pulseaudio
-%if %{with_pulseaudio}
-tar xzf %{SOURCE11}
-%endif
-
-# Extract desktop files
-tar xzf %{SOURCE9}
%patch1000 -p1
+%patch1003 -p1
%build
export LANG=C
@@ -536,9 +457,37 @@
export NUM_PROC=`/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :`
export NUM_PROC=${NUM_PROC:-1}
-%ifarch s390x sparc64 alpha ppc64
-export ARCH_DATA_MODEL=64
+%{configure} \
+ --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
+%ifnarch %{arm}
+ --with-parallel-jobs="${NUM_PROC}" \
+%endif
+ --with-pkgversion="suse-%{release}-%{_arch}" \
+ --disable-bootstrap \
+ --with-jdk-home="/etc/alternatives/java_sdk/" \
+%if %{with_pulseaudio}
+ --enable-pulse-java \
%endif
+%if %{with_systemtap}
+ --enable-systemtap \
+%endif
+ --enable-nss \
+%if %{with zero}
+ --enable-zero \
+%endif
+ --with-openjdk-src-zip=%{SOURCE5} \
+ --with-corba-src-zip=%{SOURCE6} \
+ --with-jaxp-src-zip=%{SOURCE7} \
+ --with-jaxws-src-zip=%{SOURCE8} \
+ --with-jdk-src-zip=%{SOURCE9} \
+ --with-langtools-src-zip=%{SOURCE10} \
+%if %{with zero}
+ --with-hotspot-src-zip=%{SOURCE12}
+%else
+ --with-hotspot-src-zip=%{SOURCE11}
+%endif
+
+make patch
# XXX: The quilt setup series fails with existing patches dir ... do not want
to
# export an another patches dir, as this will not be in chroot, which is the
@@ -548,6 +497,7 @@
quilt push
}
+qpatch -p0 %{PATCH2}
qpatch -p0 %{PATCH3}
qpatch -p0 %{PATCH4}
@@ -556,7 +506,7 @@
# qpatch -p0 %{PATCH6}
# % endif
-# Type fixes
+# Typo fixes
qpatch -p0 %{PATCH101}
#qpatch -p0 %{PATCH102}
@@ -570,87 +520,21 @@
%endif
#SUSE specific fixes
-qpatch -p1 %{PATCH1001}
qpatch -p1 %{PATCH1002}
-# Add a "-icedtea" tag to the version
-sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)-icedtea#"
openjdk/jdk/make/common/shared/Defs.gmk
-
-# Build the re-written rhino jar
-mkdir -p rhino/{old,new}
-
-# Compile the rewriter
-(cd rewriter
- javac com/redhat/rewriter/ClassRewriter.java
-)
-
-# Extract rhino.jar contents and rewrite
-(cd rhino/old
- jar xf /usr/share/java/rhino.jar
-)
-
-java -cp rewriter com.redhat.rewriter.ClassRewriter \
- $PWD/rhino/old \
- $PWD/rhino/new \
- org.mozilla \
- sun.org.mozilla
-
-(cd rhino/old
- for file in `find -type f -not -name '*.class'` ; do
- new_file=../new/`echo $file | sed -e 's#org#sun/org#'`
- mkdir -pv `dirname $new_file`
- cp -v $file $new_file
- sed -ie 's#org\.mozilla#sun.org.mozilla#g' $new_file
- done
-)
-
-(cd rhino/new
- jar cfm ../rhino.jar META-INF/MANIFEST.MF sun
-)
-
-export JDK_TO_BUILD_WITH=%{_libdir}/jvm/java-openjdk
-
-pushd openjdk >& /dev/null
+%if %{with zero}
+qpatch -p0 %{PATCH1004}
-export ALT_DROPS_DIR=$PWD/../drops
-export ALT_BOOTDIR="$JDK_TO_BUILD_WITH"
-
-# Set generic profile
-%ifnarch %{jit_arches}
-export ZERO_BUILD="true"
-%endif
-
-source jdk/make/jdk_generic_profile.sh
-
-make \
- ANT="/usr/bin/ant" \
- DISTRO_NAME="SUSE" \
- DISTRO_PACKAGE_VERSION="suse-%{release}-%{_arch}" \
- JDK_UPDATE_VERSION="%{openjdkbuildver}" \
- MILESTONE="fcs" \
- HOTSPOT_BUILD_JOBS="$NUM_PROC" \
- STATIC_CXX="false" \
- RHINO_JAR="$PWD/../rhino/rhino.jar" \
- GENSRCDIR="$PWD/generated.build" \
- FT2_CFLAGS="-I/usr/include/freetype2 " \
- FT2_LIBS="-lfreetype " \
- DEBUG_CLASSFILES="true" \
- DEBUG_BINARIES="true" \
- JNI_LOC="%{_jvmdir}/%{sdkdir}" \
-%ifnarch %{jit_arches}
- LIBFFI_CFLAGS="`pkg-config --cflags libffi` " \
- LIBFFI_LIBS="-lffi " \
-%ifarch ppc ppc64 s390 s390x
- ZERO_ENDIANNESS="big" \
+#XXX: there are many issues in hotspot 2.1, but I would say noone will fix them
+# so ignore all Werror like troubles we can find
+find . -name '*.gmk' -or -name '*.make' | xargs -L 1 \
+ sed -i 's/-Wno-unused//;s/WARNINGS_ARE_ERRORS = -Werror//;s/CFLAGS_WARN =
-Werror//;s/CFLAGS_WARN = -Werror//'
%else
- ZERO_ENDIANNESS="little" \
-%endif
+qpatch -p1 %{PATCH1001}
%endif
-popd >& /dev/null
-
+make %{_smp_mflags}
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
-
# cacerts are generated in runtime in openSUSE
if [ -f %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts ]; then
rm %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts
@@ -667,27 +551,15 @@
done
%endif
-# Build pulseaudio and install it to JDK build location
-%if %{with_pulseaudio}
-pushd pulseaudio
-make JAVA_HOME=$JAVA_HOME -f Makefile.pulseaudio
-cp -pPRf build/native/libpulse-java.so $JAVA_HOME/jre/lib/%{archinstall}/
-cp -pPRf build/pulse-java.jar $JAVA_HOME/jre/lib/ext/
-popd
-%endif
-
# ========== java access bridge ==========
pushd java-access-bridge-%{accessver}
- patch -l -p1 < %{PATCH1}
- patch -l -p1 < %{PATCH2}
OLD_PATH=$PATH
export PATH=$JAVA_HOME/bin:$OLD_PATH
%{configure}
make
export PATH=$OLD_PATH
- cp -a bridge/accessibility.properties $JAVA_HOME/jre/lib
- cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext
- chmod 0664 $JAVA_HOME/jre/lib/ext/gnome-java-bridge.jar
+ install -m 0644 bridge/accessibility.properties $JAVA_HOME/jre/lib
+ install -m 0644 gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext
popd
# Copy tz.properties
@@ -815,9 +687,6 @@
popd
-# Install nss.cfg
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/
-
# Install Javadoc documentation.
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{sdklnk}
@@ -1058,7 +927,7 @@
fi
%files
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
%doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
%doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README
@@ -1071,12 +940,33 @@
%{_jvmjardir}/%{sdkdir}/
%dir %{_jvmdir}/%{sdkdir}/jre/
+%dir %{_jvmdir}/%{sdkdir}/jre/bin
%dir %{_jvmdir}/%{sdkdir}/jre/lib
+%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}
+%ifarch %{ix86}
+%dir %{_jvmdir}/%{sdkdir}/jre/lib/i386/client/Xusage.txt
+%endif
+%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/headless
+%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jli
+%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server
+%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt
-%{_jvmdir}/%{sdkdir}/jre/bin/
-
+%attr(775,root,root) %{_jvmdir}/%{sdkdir}/jre/bin/*
# jre/lib
-%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/
+%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/*.so
+%ifarch %{ix86}
+%dir %{_jvmdir}/%{sdkdir}/jre/lib/i386/client
+%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/i386/client/libjsig.so
+%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/i386/client/libjvm.so
+%{_jvmdir}/%{sdkdir}/jre/lib/i386/client/Xusage.txt
+%endif
+%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jli/libjli.so
+%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/headless/libmawt.so
+%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjvm.*
+%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjsig.so
+%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so
+%config(noreplace) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jvm.cfg
+%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/Xusage.txt
%{_jvmdir}/%{sdkdir}/jre/lib/applet/
%{_jvmdir}/%{sdkdir}/jre/lib/cmm/
%{_jvmdir}/%{sdkdir}/jre/lib/ext/
@@ -1088,7 +978,7 @@
%{_jvmdir}/%{sdkdir}/jre/lib/*jar
%{_jvmdir}/%{sdkdir}/jre/lib/classlist
%{_jvmdir}/%{sdkdir}/jre/lib/currency.data
-%{_jvmdir}/%{sdkdir}/jre/lib/jexec
+%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/jexec
%{_jvmdir}/%{sdkdir}/jre/lib/jvm.hprof.txt
%{_jvmdir}/%{sdkdir}/jre/lib/meta-index
@@ -1121,7 +1011,7 @@
%{_mandir}/man1/tnameserv-%{sdklnk}.1*
%files devel
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
%dir %{_jvmdir}/%{sdkdir}
%dir %{_jvmdir}/%{sdkdir}/bin
@@ -1136,7 +1026,7 @@
%{_jvmdir}/%{sdkdir}/tapset/*
%endif
-%{_jvmdir}/%{sdkdir}/bin/*
+%attr(755,root,root) %{_jvmdir}/%{sdkdir}/bin/*
%{_jvmdir}/%{sdkdir}/include/*
%{_jvmdir}/%{sdkdir}/lib/*
%{_jvmjardir}/%{sdklnk}/
@@ -1178,16 +1068,26 @@
%{_mandir}/man1/xjc-%{sdklnk}.1*
%files demo
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
%{_jvmdir}/%{sdkdir}/demo
%{_jvmdir}/%{sdkdir}/sample
+%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
+%attr(755,root,root) %{_jvmdir}/%{sdkdir}/demo/jvmti/gctest/lib/libgctest.so
+%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/demo/jvmti/heapTracker/lib/libheapTracker.so
+%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/demo/jvmti/heapViewer/lib/libheapViewer.so
+%attr(755,root,root) %{_jvmdir}/%{sdkdir}/demo/jvmti/hprof/lib/libhprof.so
+%attr(755,root,root) %{_jvmdir}/%{sdkdir}/demo/jvmti/minst/lib/libminst.so
+%attr(755,root,root) %{_jvmdir}/%{sdkdir}/demo/jvmti/mtrace/lib/libmtrace.so
+%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/demo/jvmti/versionCheck/lib/libversionCheck.so
+%attr(755,root,root) %{_jvmdir}/%{sdkdir}/demo/jvmti/waiters/lib/libwaiters.so
+%attr(755,root,root) %{_jvmdir}/%{sdkdir}/sample/rmi/java-rmi.cgi
%files src
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
%{_jvmdir}/%{sdkdir}/src.zip
%files javadoc
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
%dir %{_javadocdir}/%{sdklnk}
%{_javadocdir}/%{sdklnk}/*
++++++ class-rewriter.tar.gz -> 47a867dd3005.tar.gz ++++++
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/class-rewriter.tar.gz
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/47a867dd3005.tar.gz differ:
char 5, line 1
++++++ class-rewriter.tar.gz -> 7fae6a3a68c7.tar.gz ++++++
++++ 249066 lines of diff (skipped)
++++++ class-rewriter.tar.gz -> 867d5041bee6.tar.gz ++++++
++++ 422591 lines of diff (skipped)
++++++ class-rewriter.tar.gz -> acba2d30209d.tar.gz ++++++
++++ 13807 lines of diff (skipped)
++++++ class-rewriter.tar.gz -> c89c6ac953e7.tar.gz ++++++
++++ 489827 lines of diff (skipped)
++++++ class-rewriter.tar.gz -> ea39d76b3bde.tar.gz ++++++
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/class-rewriter.tar.gz
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/ea39d76b3bde.tar.gz differ:
char 5, line 1
++++++ class-rewriter.tar.gz -> ee4bd94136ec.tar.gz ++++++
++++ 602094 lines of diff (skipped)
++++++ class-rewriter.tar.gz -> f78eb7e08ee1.tar.gz ++++++
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/class-rewriter.tar.gz
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/f78eb7e08ee1.tar.gz differ:
char 5, line 1
++++++ java-1.7.0-openjdk-java-access-bridge-idlj.patch ++++++
--- /var/tmp/diff_new_pack.4Ve4bg/_old 2012-09-11 11:22:54.000000000 +0200
+++ /var/tmp/diff_new_pack.4Ve4bg/_new 2012-09-11 11:22:54.000000000 +0200
@@ -1,5 +1,7 @@
---- oldjava-access-bridge-1.23.0/idlgen/Makefile.am 2008-06-03
02:47:29.000000000 -0400
-+++ java-access-bridge-1.23.0/idlgen/Makefile.am 2008-07-31
15:13:26.000000000 -0400
+Index: java-access-bridge-1.23.0/idlgen/Makefile.am
+===================================================================
+--- java-access-bridge-1.23.0/idlgen/Makefile.am.orig 2008-06-03
08:47:29.000000000 +0200
++++ java-access-bridge-1.23.0/idlgen/Makefile.am 2012-08-30
14:53:46.368752461 +0200
@@ -3,7 +3,7 @@
JARFILES=../gnome-java-bridge.jar ../$(EXTRA_JARFILES)
CLASSES=$(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class)
@@ -9,19 +11,10 @@
BONOBO_ACT_IDLFILES=$(wildcard $(BONOBO_ACT_IDLDIR)/*.idl)
BONOBO_IDLFILES=$(wildcard $(BONOBO_IDLDIR)/*.idl)
---- oldjava-access-bridge-1.23.0/idlgen/Makefile.in 2008-06-23
23:34:59.000000000 -0400
-+++ java-access-bridge-1.23.0/idlgen/Makefile.in 2008-07-31
15:13:45.000000000 -0400
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+Index: java-access-bridge-1.23.0/idlgen/Makefile.in
+===================================================================
+--- java-access-bridge-1.23.0/idlgen/Makefile.in.orig 2008-06-24
05:34:59.000000000 +0200
++++ java-access-bridge-1.23.0/idlgen/Makefile.in 2012-08-30
14:56:21.318370220 +0200
@@ -140,7 +140,7 @@
SUBDIRS = org
JARFILES = ../gnome-java-bridge.jar ../$(EXTRA_JARFILES)
@@ -37,8 +30,8 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; noempty = 1;} \
++ END { if (noempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -48,24 +41,19 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; noempty = 1;} \
++ END { if (noempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -290,13 +290,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -295,8 +295,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; noempty = 1;} \
++ END { if (noempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
++++++ java-1.7.0-openjdk-java-access-bridge-security.patch ++++++
--- /var/tmp/diff_new_pack.4Ve4bg/_old 2012-09-11 11:22:54.000000000 +0200
+++ /var/tmp/diff_new_pack.4Ve4bg/_new 2012-09-11 11:22:54.000000000 +0200
@@ -1,3 +1,5 @@
+Index:
java-1_7_0-openjdk/java-access-bridge-1.23.0/bridge/org/GNOME/Accessibility/JavaBridge.java
+===================================================================
--- openjdk/jdk/src/share/lib/security/java.security-src
+++ openjdk/jdk/src/share/lib/security/java.security
@@ -131,7 +131,7 @@
++++++ java-1.7.0-openjdk-java-access-bridge-tck.patch ++++++
--- /var/tmp/diff_new_pack.4Ve4bg/_old 2012-09-11 11:22:54.000000000 +0200
+++ /var/tmp/diff_new_pack.4Ve4bg/_new 2012-09-11 11:22:54.000000000 +0200
@@ -1,25 +1,29 @@
----
java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java.orig
2008-05-22 11:27:00.000000000 -0400
-+++ java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java
2008-05-22 11:28:02.000000000 -0400
+Index:
icedtea-2.3.1/java-access-bridge-1.23.0/bridge/org/GNOME/Accessibility/JavaBridge.java
+===================================================================
+---
icedtea-2.3.1/java-access-bridge-1.23.0/bridge/org/GNOME/Accessibility/JavaBridge.java.orig
2008-06-24 05:24:50.000000000 +0200
++++
icedtea-2.3.1/java-access-bridge-1.23.0/bridge/org/GNOME/Accessibility/JavaBridge.java
2012-08-30 14:52:17.068514546 +0200
@@ -34,6 +34,9 @@
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleText;
import javax.accessibility.AccessibleEditableText;
++
+import java.security.PrivilegedAction;
+import java.security.AccessController;
-+
public class JavaBridge {
-@@ -332,7 +335,11 @@
+@@ -347,8 +350,12 @@
+ if (debugFlag)
System.err.println ("Java Accessibility Bridge for
GNOME loaded.\n");
- // Not sure what kind of arguments should be sent to ORB
+- // Not sure what kind of arguments should be sent to ORB
- String vm_rev = System.getProperty("java.version");
-+ String vm_rev = (String) AccessController.doPrivileged(new
PrivilegedAction() {
-+ public java.lang.Object run() {
-+ return System.getProperty("java.version");
-+ }
-+ });
++ // Not sure what kind of arguments should be sent to ORB
++ String vm_rev = (String) AccessController.doPrivileged(new
PrivilegedAction() {
++ public java.lang.Object run() {
++ return System.getProperty("java.version");
++ }
++ });
if (vm_rev.compareTo("1.4.0") < 0) {
System.err.println("WARNING: Java Accessibility Bridge
" +
++++++ java-1_7_0-openjdk-add-memory-limit.patch ++++++
Index: icedtea-2.3.2/Makefile.am
===================================================================
--- icedtea-2.3.2.orig/Makefile.am 2012-08-31 16:12:45.117462371 +0200
+++ icedtea-2.3.2/Makefile.am 2012-09-04 10:43:29.052561796 +0200
@@ -1980,7 +1980,7 @@
if WITH_RHINO
mkdir -p rhino/rhino.{old,new} && \
(cd rhino/rhino.old && $(BOOT_DIR)/bin/jar xf $(RHINO_JAR)) && \
- $(BOOT_DIR)/bin/java -cp $(REWRITER_BUILD_DIR) \
+ $(BOOT_DIR)/bin/java -Xmx256m -Xms128m -cp $(REWRITER_BUILD_DIR) \
com.redhat.rewriter.ClassRewriter \
$(abs_top_builddir)/rhino/rhino.old
$(abs_top_builddir)/rhino/rhino.new \
org.mozilla sun.org.mozilla && \
Index: icedtea-2.3.2/Makefile.in
===================================================================
--- icedtea-2.3.2.orig/Makefile.in 2012-08-31 21:37:17.545573948 +0200
+++ icedtea-2.3.2/Makefile.in 2012-09-04 10:44:04.127811173 +0200
@@ -2388,7 +2388,7 @@
stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
@WITH_RHINO_TRUE@ mkdir -p rhino/rhino.{old,new} && \
@WITH_RHINO_TRUE@ (cd rhino/rhino.old && $(BOOT_DIR)/bin/jar xf
$(RHINO_JAR)) && \
-@WITH_RHINO_TRUE@ $(BOOT_DIR)/bin/java -cp $(REWRITER_BUILD_DIR) \
+@WITH_RHINO_TRUE@ $(BOOT_DIR)/bin/java -Xmx256m -Xms128m -cp
$(REWRITER_BUILD_DIR) \
@WITH_RHINO_TRUE@ com.redhat.rewriter.ClassRewriter \
@WITH_RHINO_TRUE@ $(abs_top_builddir)/rhino/rhino.old
$(abs_top_builddir)/rhino/rhino.new \
@WITH_RHINO_TRUE@ org.mozilla sun.org.mozilla && \
++++++ java-1_7_0-openjdk-suse-desktop-files.patch ++++++
--- /var/tmp/diff_new_pack.4Ve4bg/_old 2012-09-11 11:22:54.000000000 +0200
+++ /var/tmp/diff_new_pack.4Ve4bg/_new 2012-09-11 11:22:54.000000000 +0200
@@ -1,7 +1,7 @@
-Index: x/jconsole.desktop
+Index: icedtea-2.3.1/jconsole.desktop
===================================================================
---- x.orig/jconsole.desktop 2011-07-11 17:12:13.000000000 +0200
-+++ x/jconsole.desktop 2012-07-02 13:12:06.282354987 +0200
+--- icedtea-2.3.1.orig/jconsole.desktop
++++ icedtea-2.3.1/jconsole.desktop
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK Monitoring & Management Console
@@ -15,11 +15,11 @@
-Categories=Development;Monitor;Java;
+Categories=Development;Profiling;
Version=1.0
-Index: x/policytool.desktop
+Index: icedtea-2.3.1/policytool.desktop
===================================================================
---- x.orig/policytool.desktop 2011-07-11 17:12:13.000000000 +0200
-+++ x/policytool.desktop 2012-07-02 11:28:22.123649199 +0200
-@@ -1,10 +1,12 @@
+--- icedtea-2.3.1.orig/policytool.desktop
++++ icedtea-2.3.1/policytool.desktop
+@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK Policy Tool
+GenericName=OpenJDK Policy Tool
@@ -32,4 +32,3 @@
-Categories=Development;Java;
+Categories=Settings;DesktopSettings;Security;
Version=1.0
-+
++++++ java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch ++++++
--- openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp
+++ openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp
@@ -2742,7 +2742,7 @@
out_16x2(codebuf, T_DMB(0xe));
}
-int tbh(CodeBuf *codebuf, Reg base, Reg idx)
+void tbh(CodeBuf *codebuf, Reg base, Reg idx)
{
out_16x2(codebuf, T_TBH(base, idx));
}
@@ -3113,7 +3113,7 @@
J_Unimplemented();
}
-int chka(CodeBuf *codebuf, u32 size, u32 idx)
+void chka(CodeBuf *codebuf, u32 size, u32 idx)
{
cmp_reg(codebuf, idx, size);
it(codebuf, COND_CS, IT_MASK_T);
@@ -3437,6 +3437,7 @@
if ((mask & (1<<ARM_IP)) == 0) return ARM_IP;
if ((mask & (1<<ARM_LR)) == 0) return ARM_LR;
JASSERT(0, "failed to allocate a tmp reg");
+ return ARM_IP;
}
void Thumb2_Flush(Thumb2_Info *jinfo)
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
@@ -67,6 +67,7 @@
frame os::get_sender_for_C_frame(frame* fr) {
ShouldNotCallThis();
+ return frame();
}
frame os::current_frame() {
@@ -439,6 +440,7 @@
extern "C" {
int SpinPause() {
+ return 0;
}
int SafeFetch32(int *adr, int errValue) {
--- openjdk/hotspot/src/share/vm/utilities/debug.hpp
+++ openjdk/hotspot/src/share/vm/utilities/debug.hpp
@@ -166,14 +166,14 @@
// error reporting helper functions
void report_vm_error(const char* file, int line, const char* error_msg,
- const char* detail_msg = NULL);
-void report_fatal(const char* file, int line, const char* message);
+ const char* detail_msg = NULL) __attribute__((noreturn));
+void report_fatal(const char* file, int line, const char* message)
__attribute__((noreturn));
void report_vm_out_of_memory(const char* file, int line, size_t size,
- const char* message);
-void report_should_not_call(const char* file, int line);
-void report_should_not_reach_here(const char* file, int line);
-void report_unimplemented(const char* file, int line);
-void report_untested(const char* file, int line, const char* message);
+ const char* message) __attribute__((noreturn));
+void report_should_not_call(const char* file, int line)
__attribute__((noreturn));
+void report_should_not_reach_here(const char* file, int line)
__attribute__((noreturn));
+void report_unimplemented(const char* file, int line)
__attribute__((noreturn));
+void report_untested(const char* file, int line, const char* message)
__attribute__((noreturn));
void warning(const char* format, ...);
++++++ openjdk-7-src-b147-no-return-in-nonvoid.patch ++++++
--- /var/tmp/diff_new_pack.4Ve4bg/_old 2012-09-11 11:22:54.000000000 +0200
+++ /var/tmp/diff_new_pack.4Ve4bg/_new 2012-09-11 11:22:54.000000000 +0200
@@ -1,6 +1,4 @@
-Index:
java-1_7_0-openjdk/openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
-===================================================================
----
java-1_7_0-openjdk.orig/openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+---
java-1_7_0-openjdk/openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+++
java-1_7_0-openjdk/openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
@@ -142,6 +142,7 @@ jboolean XShared_initIDs(JNIEnv *env, jb
#endif /* MITSHM */
@@ -18,3 +16,38 @@
}
+--- icedtea-2.3.2/openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp.old
++++ icedtea-2.3.2/openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+@@ -528,6 +528,7 @@
+ err.report_and_die();
+
+ ShouldNotReachHere();
++ return 0; // to make gcc happy
+ }
+
+ void os::Linux::init_thread_fpu_state(void) {
+--- icedtea-2.3.2/openjdk/hotspot/src/share/vm/utilities/debug.hpp
2012-08-30 21:29:26.000000000 +0200
++++ icedtea-2.3.2/openjdk/hotspot/src/share/vm/utilities/debug.hpp
2012-09-06 00:27:08.074437225 +0200
+@@ -191,14 +191,14 @@
+
+ // error reporting helper functions
+ void report_vm_error(const char* file, int line, const char* error_msg,
+- const char* detail_msg = NULL);
+-void report_fatal(const char* file, int line, const char* message);
++ const char* detail_msg = NULL) __attribute__((noreturn));
++void report_fatal(const char* file, int line, const char* message)
__attribute__((noreturn));
+ void report_vm_out_of_memory(const char* file, int line, size_t size,
+- const char* message);
+-void report_should_not_call(const char* file, int line);
+-void report_should_not_reach_here(const char* file, int line);
+-void report_unimplemented(const char* file, int line);
+-void report_untested(const char* file, int line, const char* message);
++ const char* message) __attribute__((noreturn));
++void report_should_not_call(const char* file, int line)
__attribute__((noreturn));
++void report_should_not_reach_here(const char* file, int line)
__attribute__((noreturn));
++void report_unimplemented(const char* file, int line)
__attribute__((noreturn));
++void report_untested(const char* file, int line, const char* message)
__attribute__((noreturn));
+
+ void warning(const char* format, ...);
+
+
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
