From 175a1b543b78912a29dd86f2a79a77ae56f0d163 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 14 Aug 2017 19:25:35 +0200 Subject: [PATCH] - up to 7.2.0; java is gone --- branch.sh | 4 +- gcc-enable-java-awt-qt.patch | 82 ------- gcc-info.patch | 219 ----------------- gcc-libjava-multilib.patch | 47 ---- gcc-moresparcs.patch | 6 +- gcc-nodebug.patch | 83 +------ gcc.spec | 444 +++-------------------------------- 7 files changed, 42 insertions(+), 843 deletions(-) delete mode 100644 gcc-enable-java-awt-qt.patch delete mode 100644 gcc-libjava-multilib.patch diff --git a/branch.sh b/branch.sh index 274d741..83ff9ac 100755 --- a/branch.sh +++ b/branch.sh @@ -2,8 +2,8 @@ set -e package=gcc svn=svn://gcc.gnu.org/svn/$package -branch=branches/$package-6-branch -tag=tags/${package}_6_4_0_release +branch=branches/$package-7-branch +tag=tags/${package}_7_2_0_release out=$package-branch.diff # use filterdiff, etc to exclude bad chunks from diff diff --git a/gcc-enable-java-awt-qt.patch b/gcc-enable-java-awt-qt.patch deleted file mode 100644 index d5bfb65..0000000 --- a/gcc-enable-java-awt-qt.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- trunk/libjava/classpath/configure.ac 2006-07-02 15:32:04.000000000 +0200 -+++ trunk/libjava/classpath/configure.ac 2006-07-02 19:18:28.913906000 +0200 -@@ -502,7 +502,8 @@ - AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget], - QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR", - AC_MSG_WARN([QWidget not found]))) -- AC_CHECK_PROG(MOC, [moc], [moc]) -+ QT4DIR=`$PKG_CONFIG --variable=prefix QtGui` -+ AC_CHECK_PROG(MOC, [moc], [$QT4DIR/bin/moc], [], $QT4DIR/bin) - AC_CHECK_PROG(MOC, [moc-qt4], [moc-qt4]) - fi - if test "x$HAVE_QT4" = "xno"; then ---- trunk/libjava/classpath/native/jni/qt-peer/Makefile.am 2007-06-04 01:18:43.000000000 +0200 -+++ trunk/libjava/classpath/native/jni/qt-peer/Makefile.am 2008-03-06 16:32:36.000000000 +0100 -@@ -1,8 +1,7 @@ - # Qt AWT backend for Classpath - # - --## GCJ LOCAL: don't install this library --noinst_LTLIBRARIES = libqtpeer.la -+nativeexeclib_LTLIBRARIES = libqtpeer.la - - AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@ - AM_CPPFLAGS = @CLASSPATH_INCLUDES@ ---- trunk/libjava/classpath/native/jni/qt-peer/Makefile.in 2007-08-04 12:53:49.000000000 +0200 -+++ trunk/libjava/classpath/native/jni/qt-peer/Makefile.in 2008-03-06 15:24:38.000000000 +0100 -@@ -64,7 +64,8 @@ - mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs - CONFIG_HEADER = $(top_builddir)/include/config.h - CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) -+nativeexeclibLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(nativeexeclib_LTLIBRARIES) - libqtpeer_la_LIBADD = - am_libqtpeer_la_OBJECTS = componentevent.lo keybindings.lo \ - mainqtthread.lo mainthreadinterface.lo nativewrapper.lo \ -@@ -357,7 +358,7 @@ - target_vendor = @target_vendor@ - toolexeclibdir = @toolexeclibdir@ - vm_classes = @vm_classes@ --noinst_LTLIBRARIES = libqtpeer.la -+nativeexeclib_LTLIBRARIES = libqtpeer.la - AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@ - AM_CPPFLAGS = @CLASSPATH_INCLUDES@ - AM_CXXFLAGS = @QT_CFLAGS@ \ -@@ -475,7 +476,7 @@ - rm -f "$${dir}/so_locations"; \ - done - libqtpeer.la: $(libqtpeer_la_OBJECTS) $(libqtpeer_la_DEPENDENCIES) -- $(CXXLINK) $(libqtpeer_la_LDFLAGS) $(libqtpeer_la_OBJECTS) $(libqtpeer_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(nativeexeclibdir) $(libqtpeer_la_LDFLAGS) $(libqtpeer_la_OBJECTS) $(libqtpeer_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -686,7 +687,18 @@ - - install-data-am: - --install-exec-am: -+install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) -+ @$(NORMAL_INSTALL) -+ test -z "$(nativeexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(nativeexeclibdir)" -+ @list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \ -+ if test -f $$p; then \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativeexeclibdir)/$$f'"; \ -+ $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativeexeclibdir)/$$f"; \ -+ else :; fi; \ -+ done -+ -+install-exec-am: install-nativeexeclibLTLIBRARIES - - install-info: install-info-am - -@@ -720,6 +732,7 @@ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ -+ install-nativeexeclibLTLIBRARIES \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ diff --git a/gcc-info.patch b/gcc-info.patch index abde4e4..ff0f985 100644 --- a/gcc-info.patch +++ b/gcc-info.patch @@ -101,183 +101,6 @@ @end direntry This file documents the use and the internals of the GNU Fortran compiler, (@command{gfortran}). ---- gcc-4.9.2/gcc/java/gcj.texi.orig 2014-01-02 22:25:41.000000000 +0100 -+++ gcc-4.9.2/gcc/java/gcj.texi 2015-01-13 20:25:09.094821767 +0100 -@@ -53,29 +53,21 @@ - - @ifinfo - @format --@dircategory Software development -+@dircategory Programming Languages: - @direntry --* Gcj: (gcj). Ahead-of-time compiler for the Java language -+* Gcj: (gcj). Ahead-of-time compiler for the Java language - @end direntry - --@dircategory Individual utilities -+@dircategory Programming tools: - @direntry --* jcf-dump: (gcj)Invoking jcf-dump. -- Print information about Java class files --* gij: (gcj)Invoking gij. GNU interpreter for Java bytecode --* gcj-dbtool: (gcj)Invoking gcj-dbtool. -- Tool for manipulating class file databases. --* jv-convert: (gcj)Invoking jv-convert. -- Convert file from one encoding to another --* grmic: (gcj)Invoking grmic. -- Generate stubs for Remote Method Invocation. --* gc-analyze: (gcj)Invoking gc-analyze. -- Analyze Garbage Collector (GC) memory dumps. --* aot-compile: (gcj)Invoking aot-compile. -- Compile bytecode to native and generate databases. --* rebuild-gcj-db: (gcj)Invoking rebuild-gcj-db. -- Merge the per-solib databases made by aot-compile -- into one system-wide database. -+* jcf-dump: (gcj)jcf-dump. Print information about Java class files -+* gij: (gcj)gij. GNU interpreter for Java bytecode -+* jv-convert: (gcj)jv-convert. Convert file from one encoding to another -+* gcj-dbtool: (gcj)gcj-dbtool. Db tool -+* grmic: (gcj)grmic. Generate stubs for Remote Method Invocation -+* gc-analyze: (gcj)gc-analyze. Analyze Garbage Collector (GC) memory dumps -+* aot-compile: (gcj)aot-compile. Compile bytecode to native and generate databases -+* rebuild-gcj-db: (gcj)rebuild-gcj-db. Merge the per-solib databases made by aot-compile into one system-wide database - @end direntry - @end format - -@@ -108,33 +100,31 @@ - @file{.class} files. - - @menu --* Copying:: The GNU General Public License -+* Copying:: The GNU General Public License - * GNU Free Documentation License:: -- How you can share and copy this manual --* Invoking gcj:: Compiler options supported by @command{gcj} --* Compatibility:: Compatibility between gcj and other tools for Java --* Invoking jcf-dump:: Print information about class files --* Invoking gij:: Interpreting Java bytecodes --* Invoking gcj-dbtool:: Tool for manipulating class file databases. --* Invoking jv-convert:: Converting from one encoding to another --* Invoking grmic:: Generate stubs for Remote Method Invocation. --* Invoking gc-analyze:: Analyze Garbage Collector (GC) memory dumps. --* Invoking aot-compile:: Compile bytecode to native and generate databases. --* Invoking rebuild-gcj-db:: Merge the per-solib databases made by aot-compile -- into one system-wide database. --* About CNI:: Description of the Compiled Native Interface --* System properties:: Modifying runtime behavior of the libgcj library --* Resources:: Where to look for more information --* Index:: Index. -+ How you can share and copy this manual -+* gcj:: Compiler options supported by @command{gcj} -+* Compatibility:: Compatibility between gcj and other tools for Java -+* jcf-dump:: Print information about class files -+* gij:: Interpreting Java bytecodes -+* gcj-dbtool:: Tool for manipulating class file databases. -+* jv-convert:: Converting from one encoding to another -+* grmic:: Generate stubs for Remote Method Invocation. -+* gc-analyze:: Analyze Garbage Collector (GC) memory dumps. -+* aot-compile:: Compile bytecode to native and generate databases. -+* rebuild-gcj-db:: Merge the per-solib databases made by aot-compile into one system-wide database. -+* About CNI:: Description of the Compiled Native Interface -+* System properties:: Modifying runtime behavior of the libgcj library -+* Resources:: Where to look for more information -+* Index:: Index. - @end menu - -- - @include gpl_v3.texi - - @include fdl.texi - - --@node Invoking gcj -+@node gcj - @chapter Invoking gcj - - @c man title gcj Ahead-of-time compiler for the Java language -@@ -685,8 +675,8 @@ - @code{-findirect-dispatch} then add them to the system-wide - classmap.db file using @code{gcj-dbtool}, they will be automatically - loaded by the @code{libgcj} system classloader. This is the new, --preferred classname-to-library resolution mechanism. @xref{Invoking --gcj-dbtool}, for more information on using the classmap database. -+preferred classname-to-library resolution mechanism. @xref{gcj-dbtool}, -+for more information on using the classmap database. - - @item - The old classname-to-library lookup mechanism is still supported -@@ -733,7 +723,7 @@ - @end itemize - - --@node Invoking jcf-dump -+@node jcf-dump - @chapter Invoking jcf-dump - - @c man title jcf-dump print information about Java class files -@@ -793,7 +783,7 @@ - - @c man end - --@node Invoking gij -+@node gij - @chapter Invoking gij - - @c man title gij GNU interpreter for Java bytecode -@@ -922,7 +912,7 @@ - - @c man end - --@node Invoking gcj-dbtool -+@node gcj-dbtool - @chapter Invoking gcj-dbtool. - - @c man title gcj-dbtool Manipulate class file mapping databases for libgcj -@@ -1013,7 +1003,7 @@ - - @c man end - --@node Invoking jv-convert -+@node jv-convert - @chapter Invoking jv-convert - - @c man title jv-convert Convert file from one encoding to another -@@ -1072,7 +1062,7 @@ - - @c man end - --@node Invoking grmic -+@node grmic - @chapter Invoking grmic - - @c man title grmic Generate stubs for Remote Method Invocation -@@ -1151,7 +1141,7 @@ - @c man end - - --@node Invoking gc-analyze -+@node gc-analyze - @chapter Invoking gc-analyze - - @c man title gc-analyze Analyze Garbage Collector (GC) memory dumps -@@ -1234,7 +1224,7 @@ - - @c man end - --@node Invoking aot-compile -+@node aot-compile - @chapter Invoking aot-compile - - @c man title aot-compile Compile bytecode to native and generate databases -@@ -1292,7 +1282,7 @@ - - @c man end - --@node Invoking rebuild-gcj-db -+@node rebuild-gcj-db - @chapter Invoking rebuild-gcj-db - - @c man title rebuild-gcj-db Merge the per-solib databases made by aot-compile into one system-wide database. --- a/gcc/ada/gnat_rm.texi 2005-11-30 12:12:06.000000000 +0100 +++ b/gcc/ada/gnat_rm.texi 2005-12-11 02:36:14.863426736 +0100 @@ -26,7 +26,7 @@ @@ -317,20 +140,6 @@ @end direntry @end format ---- gcc-4.8.2/libjava/classpath/doc/cp-tools.texinfo.orig 2013-02-21 10:40:44.000000000 +0100 -+++ gcc-4.8.2/libjava/classpath/doc/cp-tools.texinfo 2014-04-21 08:05:30.116078643 +0200 -@@ -35,9 +35,9 @@ - @ifnotplaintext - @setchapternewpage on - --@dircategory GNU Libraries -+@dircategory Libraries: - @direntry --* Classpath Tools: (cp-tools). GNU Classpath Tools Guide -+* Classpath Tools: (cp-tools). GNU Classpath Tools Guide - @end direntry - @end ifnotplaintext - @end ifinfo --- gcc-4.8.2/libgomp/libgomp.texi.orig 2013-01-14 19:18:49.000000000 +0100 +++ gcc-4.8.2/libgomp/libgomp.texi 2014-04-21 08:06:10.259411139 +0200 @@ -29,9 +29,9 @@ @@ -387,34 +196,6 @@ @end direntry @titlepage ---- gcc-4.9.2/libjava/classpath/doc/cp-hacking.texinfo.orig 2010-10-12 17:55:12.000000000 +0200 -+++ gcc-4.9.2/libjava/classpath/doc/cp-hacking.texinfo 2015-01-13 20:20:39.751499738 +0100 -@@ -14,9 +14,9 @@ - Copyright (C) 1998,1999,2000,2001,2002,2003,2004,2005,2007,2009 Free Software Foundation, Inc. - - @ifnotplaintext --@dircategory GNU Libraries -+@dircategory Libraries: - @direntry --* Classpath Hacking: (cp-hacking). GNU Classpath Hacker's Guide -+* Classpath Hacking: (cp-hacking). GNU Classpath Hacker's Guide - @end direntry - @end ifnotplaintext - @end ifinfo ---- gcc-4.9.2/libjava/classpath/doc/cp-vmintegration.texinfo.orig 2008-06-28 15:29:13.000000000 +0200 -+++ gcc-4.9.2/libjava/classpath/doc/cp-vmintegration.texinfo 2015-01-13 20:21:24.928164508 +0100 -@@ -15,9 +15,9 @@ - Copyright (C) 1998-2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. - - @ifnotplaintext --@dircategory GNU Libraries -+@dircategory Libraries: - @direntry --* VM Integration: (cp-vmintegration). GNU Classpath VM Integration Guide -+* VM Integration: (cp-vmintegration). GNU Classpath VM Integration Guide - @end direntry - @end ifnotplaintext - @end ifinfo --- gcc-4.9.2/libiberty/libiberty.texi.orig 2015-01-13 20:22:23.151495398 +0100 +++ gcc-4.9.2/libiberty/libiberty.texi 2015-01-13 20:22:25.921495282 +0100 @@ -11,10 +11,9 @@ diff --git a/gcc-libjava-multilib.patch b/gcc-libjava-multilib.patch deleted file mode 100644 index 0ae37c1..0000000 --- a/gcc-libjava-multilib.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- libjava/configure.ac.jj 2007-12-07 17:55:50.000000000 +0100 -+++ libjava/configure.ac 2007-12-07 18:36:56.000000000 +0100 -@@ -82,6 +82,13 @@ AC_ARG_ENABLE(java-maintainer-mode, - [allow rebuilding of .class and .h files])) - AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes) - -+AC_ARG_ENABLE(libjava-multilib, -+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib])) -+if test "$enable_libjava_multilib" = no; then -+ multilib=no -+ ac_configure_args="$ac_configure_args --disable-multilib" -+fi -+ - # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. - GCC_NO_EXECUTABLES - ---- libjava/configure.jj 2007-12-07 17:55:50.000000000 +0100 -+++ libjava/configure 2007-12-07 18:39:58.000000000 +0100 -@@ -1018,6 +1018,8 @@ Optional Features: - --enable-gconf-peer compile GConf native peers for util.preferences - --enable-java-maintainer-mode - allow rebuilding of .class and .h files -+ --enable-libjava-multilib -+ build libjava as multilib - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --enable-maintainer-mode enable make rules and dependencies not useful -@@ -1848,6 +1850,16 @@ else - fi - - -+# Check whether --enable-libjava-multilib was given. -+if test "${enable_libjava_multilib+set}" = set; then -+ enableval=$enable_libjava_multilib; -+fi -+ -+if test "$enable_libjava_multilib" = no; then -+ multilib=no -+ ac_configure_args="$ac_configure_args --disable-multilib" -+fi -+ - # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. - - - - Jakub - diff --git a/gcc-moresparcs.patch b/gcc-moresparcs.patch index 9d62700..0a243b5 100644 --- a/gcc-moresparcs.patch +++ b/gcc-moresparcs.patch @@ -9,13 +9,13 @@ tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h" extra_options="${extra_options} sparc/long-double-switch.opt" case ${target} in -@@ -2454,7 +2454,7 @@ +@@ -2878,7 +2878,7 @@ sparc64-*-rtems*) extra_options="${extra_options}" - tmake_file="${tmake_file} sparc/t-sparc t-rtems" + tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems-64" ;; -sparc64-*-linux*) +sparc64*-*-linux*) - tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/default-64.h sparc/linux64.h sparc/tso.h" + tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/default64.h sparc/linux64.h sparc/tso.h" extra_options="${extra_options} sparc/long-double-switch.opt" tmake_file="${tmake_file} sparc/t-sparc sparc/t-linux64" --- gcc-4.7.1/libgcc/config.host.orig 2012-04-30 19:39:57.000000000 +0200 diff --git a/gcc-nodebug.patch b/gcc-nodebug.patch index 4707f5b..a269592 100644 --- a/gcc-nodebug.patch +++ b/gcc-nodebug.patch @@ -9,13 +9,14 @@ BOOT_CFLAGS = -O $(CFLAGS) # These exists to be overridden by the t-* files, respectively. T_CFLAGS = -@@ -105,12 +105,12 @@ TEXI2PDF = texi2pdf +@@ -105,13 +105,13 @@ TEXI2PDF = texi2pdf GNATBIND_FLAGS = -static -x ADA_CFLAGS = ADAFLAGS = -W -Wall -gnatpg -gnata -FORCE_DEBUG_ADAFLAGS = -g +FORCE_DEBUG_ADAFLAGS = NO_INLINE_ADAFLAGS = -fno-inline + NO_OMIT_ADAFLAGS = -fno-omit-frame-pointer NO_SIBLING_ADAFLAGS = -fno-optimize-sibling-calls NO_REORDER_ADAFLAGS = -fno-toplevel-reorder GNATLIBFLAGS = -W -Wall -gnatpg -nostdinc @@ -68,86 +69,6 @@ LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \ $(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \ -fbuilding-libgcc -fno-stack-protector \ ---- gcc-4.7.1/libjava/classpath/tools/Makefile.am.orig 2011-09-29 13:37:47.000000000 +0200 -+++ gcc-4.7.1/libjava/classpath/tools/Makefile.am 2012-07-12 18:29:33.452403949 +0200 -@@ -355,8 +355,8 @@ - if JAVA_MAINTAINER_MODE - ## Compile ASM separately as it is latin-1 encoded. - AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ -- $$AC -g -w -d $(srcdir)/asm @asm.lst -- $(JCOMPILER) $(USE_JAVAC_FLAGS) -g -d $(srcdir)/classes @classes.lst @vm-tools.lst -+ $$AC -w -d $(srcdir)/asm @asm.lst -+ $(JCOMPILER) $(USE_JAVAC_FLAGS) -d $(srcdir)/classes @classes.lst @vm-tools.lst - endif - ## END GCJ LOCAL - ## Copy over tools resource files. ---- gcc-4.7.1/libjava/classpath/tools/Makefile.in.orig 2011-09-29 13:37:47.000000000 +0200 -+++ gcc-4.7.1/libjava/classpath/tools/Makefile.in 2012-07-12 18:29:52.035736502 +0200 -@@ -1413,8 +1413,8 @@ - fi - cat classes.lst asm.lst vm-tools.lst > all-classes.lst - @JAVA_MAINTAINER_MODE_TRUE@ AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ --@JAVA_MAINTAINER_MODE_TRUE@ $$AC -g -w -d $(srcdir)/asm @asm.lst --@JAVA_MAINTAINER_MODE_TRUE@ $(JCOMPILER) $(USE_JAVAC_FLAGS) -g -d $(srcdir)/classes @classes.lst @vm-tools.lst -+@JAVA_MAINTAINER_MODE_TRUE@ $$AC -w -d $(srcdir)/asm @asm.lst -+@JAVA_MAINTAINER_MODE_TRUE@ $(JCOMPILER) $(USE_JAVAC_FLAGS) -d $(srcdir)/classes @classes.lst @vm-tools.lst - @list=`cd $(srcdir)/resource && find gnu/classpath/tools com/sun/tools/javac \ - sun/rmi/rmic $(GJDOC_EX) -name \*.properties -print -o -name \*.jav -print`; \ - for p in $$list; do \ ---- gcc-4.7.1/libjava/Makefile.am.orig 2011-08-05 16:37:48.000000000 +0200 -+++ gcc-4.7.1/libjava/Makefile.am 2012-07-12 18:30:07.649069180 +0200 -@@ -399,7 +399,7 @@ - ## Extra CFLAGS used for JNI C sources shared with GNU Classpath. - PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long - --JCFLAGS = -g -+JCFLAGS = - JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) - - LIBFFIINCS = @LIBFFIINCS@ ---- gcc-4.7.1/libjava/Makefile.in.orig 2012-06-14 10:48:08.000000000 +0200 -+++ gcc-4.7.1/libjava/Makefile.in 2012-07-12 18:30:20.642401968 +0200 -@@ -1032,7 +1032,7 @@ - @BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE@LIBGCJ_REDUCED_REFLECTION_FLAGS = - @BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE@LIBGCJ_REDUCED_REFLECTION_FLAGS = -freduced-reflection - PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long --JCFLAGS = -g -+JCFLAGS = - JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) - AM_CPPFLAGS = -I$(top_srcdir) \ - -Iinclude -I$(top_srcdir)/include \ ---- gcc-4.7.1/libjava/testsuite/Makefile.am.orig 2010-05-04 00:37:50.000000000 +0200 -+++ gcc-4.7.1/libjava/testsuite/Makefile.am 2012-07-12 18:30:54.965733863 +0200 -@@ -83,11 +83,11 @@ - testtmpdir=`echo $$test | sed -e 's,/,_,g'`T; \ - rm -rf $$testtmpdir; $(mkdir_p) $$testtmpdir; \ - if test -n "$$testdep"; then \ -- $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \ -+ $(GCJ) -C -w --encoding=UTF-8 -bootclasspath \ - $(top_builddir)/libgcj-$(gcc_version).jar::$$testtmpdir \ - -d $$testtmpdir $(srcdir)/$$testdep || exit; \ - fi; \ -- $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \ -+ $(GCJ) -C -w --encoding=UTF-8 -bootclasspath \ - $(top_builddir)/libgcj-$(gcc_version).jar:$$testtmpdir \ - -d $$testtmpdir $(srcdir)/$$test || exit; \ - case "$$test" in \ ---- gcc-4.7.1/libjava/testsuite/Makefile.in.orig 2012-05-21 20:14:01.000000000 +0200 -+++ gcc-4.7.1/libjava/testsuite/Makefile.in 2012-07-12 18:31:09.359066590 +0200 -@@ -569,11 +569,11 @@ - @JAVA_MAINTAINER_MODE_TRUE@ testtmpdir=`echo $$test | sed -e 's,/,_,g'`T; \ - @JAVA_MAINTAINER_MODE_TRUE@ rm -rf $$testtmpdir; $(mkdir_p) $$testtmpdir; \ - @JAVA_MAINTAINER_MODE_TRUE@ if test -n "$$testdep"; then \ --@JAVA_MAINTAINER_MODE_TRUE@ $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \ -+@JAVA_MAINTAINER_MODE_TRUE@ $(GCJ) -C -w --encoding=UTF-8 -bootclasspath \ - @JAVA_MAINTAINER_MODE_TRUE@ $(top_builddir)/libgcj-$(gcc_version).jar::$$testtmpdir \ - @JAVA_MAINTAINER_MODE_TRUE@ -d $$testtmpdir $(srcdir)/$$testdep || exit; \ - @JAVA_MAINTAINER_MODE_TRUE@ fi; \ --@JAVA_MAINTAINER_MODE_TRUE@ $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \ -+@JAVA_MAINTAINER_MODE_TRUE@ $(GCJ) -C -w --encoding=UTF-8 -bootclasspath \ - @JAVA_MAINTAINER_MODE_TRUE@ $(top_builddir)/libgcj-$(gcc_version).jar:$$testtmpdir \ - @JAVA_MAINTAINER_MODE_TRUE@ -d $$testtmpdir $(srcdir)/$$test || exit; \ - @JAVA_MAINTAINER_MODE_TRUE@ case "$$test" in \ --- gcc-4.7.1/libstdc++-v3/include/Makefile.am.orig 2012-03-23 12:00:54.000000000 +0100 +++ gcc-4.7.1/libstdc++-v3/include/Makefile.am 2012-07-12 18:31:29.102399096 +0200 @@ -1154,22 +1154,22 @@ diff --git a/gcc.spec b/gcc.spec index bd17e5a..5d88a9e 100644 --- a/gcc.spec +++ b/gcc.spec @@ -5,12 +5,6 @@ # or having own Version, do not use epoch 6 there, reset them to 0! # # TODO: -# - gconf peer? (BR: GConf2-devel >= 2.6.0) (but libgcj needs split anyway) -# - gstreamer peer? (BR: gstreamer-devel, gstreamer-plugins-base-devel >= 0.10.10) -# - restore qt peer? -# - package? -# /usr/bin/gjdoc [BR: antlr.jar] (but see gjdoc package, there are some additional jars?) -# /usr/share/man/man1/gjdoc.1.gz # - revise obsoletes for new libmpx packages! # # Conditional build: @@ -19,7 +13,6 @@ %bcond_without cxx # build without C++ support %bcond_without fortran # build without Fortran support %bcond_without go # build without Go support -%bcond_without java # build without Java support %bcond_without objc # build without Objective-C support %bcond_without objcxx # build without Objective-C++ support # - features: @@ -27,17 +20,8 @@ %bcond_without multilib # build without multilib support (which needs glibc[32&64]-devel) %bcond_without multilibx32 # build with x32 multilib support on x86_64 (needs x32 glibc-devel) %bcond_without profiling # build without profiling -%bcond_without python # build without libstdc++ printers for gdb and aot-compile for java +%bcond_without python # build without libstdc++ printers for gdb %bcond_with gcc_libffi # packaging gcc libffi for system usage - # note: libgcj and libgo always have convenience gcc libffi linked in -# - libgcj options: -%bcond_without alsa # don't build libgcj ALSA MIDI interface -%bcond_without dssi # don't build libgcj DSSI MIDI interface -%bcond_without gtk # don't build libgcj GTK peer -%bcond_without apidocs # do not build and package API docs -%bcond_with mozilla # build libgcjwebplugin (needs fix for new xulrunner) -%bcond_with qt # build libgcj Qt peer (currently doesn't build with libtool-2.x) -%bcond_without x # don't build libgcj Xlib-dependent AWTs (incl. GTK/Qt) # - other: %bcond_without bootstrap # omit 3-stage bootstrap %bcond_with tests # torture gcc @@ -49,10 +33,9 @@ %define cxx_sover 6 %endif -# go, java and objcxx require C++ +# go and objcxx require C++ %if %{without cxx} %undefine with_go -%undefine with_java %undefine with_objcxx %endif # objcxx requires objc @@ -64,11 +47,6 @@ %undefine with_profiling %endif -%if %{without x} -%undefine with_gtk -%undefine with_qt -%endif - %ifarch sparc64 x32 # used to be broken on sparc64 (to be verified if needed) # broken since 5.x on x32 (to be verified if needed) @@ -116,8 +94,10 @@ %define with_vtv 1 %endif -%define major_ver 6 -%define minor_ver 4.0 +# Stable is: any major_ver and minor_ver >= 1.0 +# For PLD we usually use gcc when minor_ver >= 2.0 (first bugfix release or later) +%define major_ver 7 +%define minor_ver 2.0 %define ecj_ver 4.9 # class data version seen with file(1) that this jvm is able to load %define _classdataversion 50.0 @@ -134,21 +114,19 @@ Epoch: 6 License: GPL v3+ Group: Development/Languages Source0: https://ftp.gnu.org/pub/gnu/gcc/gcc-%{version}/%{name}-%{version}.tar.xz -# Source0-md5: 11ba51a0cfb8471927f387c8895fe232 +# Source0-md5: ff370482573133a7fcdd96cd2f552292 Source1: %{name}-optimize-la.pl # check libffi version with libffi/configure.ac Source3: libffi.pc.in Source4: branch.sh # use branch.sh to update glibc-branch.diff Patch100: %{name}-branch.diff -# Patch100-md5: 15e56f8d7ba9be17cd5d1595c5b3dde5 +# Patch100-md5: d7963ef23d8b759940dc91797b3f53d5 Patch0: %{name}-info.patch Patch2: %{name}-nodebug.patch Patch3: %{name}-ada-link.patch Patch4: %{name}-ada-x32.patch -Patch7: %{name}-libjava-multilib.patch -Patch8: %{name}-enable-java-awt-qt.patch Patch10: %{name}-moresparcs.patch Patch11: %{name}-install-libffi.patch URL: http://gcc.gnu.org/ @@ -200,7 +178,6 @@ BuildRequires: glibc-devel(sparcv9) BuildRequires: gmp-c++-devel >= 4.3.2 BuildRequires: gmp-devel >= 4.3.2 BuildRequires: isl-devel >= 0.15 -BuildRequires: java-ecj >= %{ecj_ver} BuildRequires: libmpc-devel >= 0.8.1 BuildRequires: mpfr-devel >= 2.4.2 %if %{with python} @@ -210,40 +187,6 @@ BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.211 BuildRequires: texinfo >= 4.7 BuildRequires: zlib-devel -%if %{with java} -%{?with_alsa:BuildRequires: alsa-lib-devel} -%if %{with dssi} -BuildRequires: dssi-devel -BuildRequires: jack-audio-connection-kit-devel -%endif -BuildRequires: libtool >= 2:2 -BuildRequires: libxml2-devel >= 1:2.6.8 -BuildRequires: libxslt-devel >= 1.1.11 -BuildRequires: perl-base -BuildRequires: perl-tools-pod -BuildRequires: pkgconfig -BuildRequires: sed >= 4.0 -BuildRequires: unzip -BuildRequires: zip -%if %{with gtk} -BuildRequires: cairo-devel >= 1.1.8 -BuildRequires: freetype-devel >= 2 -BuildRequires: gdk-pixbuf2-devel >= 2.0 -BuildRequires: gtk+2-devel >= 2:2.8 -BuildRequires: libart_lgpl-devel >= 2.1 -BuildRequires: pango-devel -BuildRequires: xorg-lib-libXrandr-devel -BuildRequires: xorg-lib-libXrender-devel -BuildRequires: xorg-lib-libXt-devel -BuildRequires: xorg-lib-libXtst-devel -%endif -%if %{with qt} -BuildRequires: QtCore-devel >= 4.1.0 -BuildRequires: QtGui-devel >= 4.1.0 -BuildRequires: qt4-build >= 4.1.0 -%endif -%{?with_mozilla:BuildRequires: xulrunner-devel >= 1.8.1.3-1.20070321.5} -%endif BuildConflicts: pdksh < 5.2.14-50 Requires: binutils >= 3:2.23 Requires: gmp >= 4.3.2 @@ -298,7 +241,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # receiving non constant format strings %define Werror_cflags %{nil} -%define skip_post_check_so '.*(libcc1plugin|libgo|libxmlj|lib-gnu-awt-xlib|libmpxwrappers)\.so.*' +%define skip_post_check_so '.*(libcc1plugin|libcp1plugin|libgo|libxmlj|lib-gnu-awt-xlib|libmpxwrappers)\.so.*' # private symbols %define _noautoreq .*\(GLIBC_PRIVATE\) @@ -1448,119 +1391,6 @@ Static GCC __float128 support library - %{m2_desc} version. %description -n libquadmath-multilib-%{multilib2}-static -l pl.UTF-8 Wersja %{m2_desc} biblioteki statycznej GCC do obsługi typu __float128. -%package java -Summary: Java language support for GCC -Summary(es.UTF-8): Soporte de Java para GCC -Summary(pl.UTF-8): Obsługa języka Java dla GCC -Group: Development/Languages/Java -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: java-ecj >= %{ecj_ver} -Requires: libgcj-devel = %{epoch}:%{version}-%{release} -Provides: gcc-java-tools -Provides: gcj = %{epoch}:%{version}-%{release} -Obsoletes: gcc-java-tools -Obsoletes: java-gnu-classpath-tools - -%description java -This package adds experimental support for compiling Java(TM) programs -and bytecode into native code. To use this you will also need the -libgcj package. - -%description java -l es.UTF-8 -Este paquete añade soporte experimental para compilar programas -Java(tm) y su bytecode en código nativo. Para usarlo también va a -necesitar el paquete libgcj. - -%description java -l pl.UTF-8 -Ten pakiet dodaje możliwość kompilowania programów w języku Java(TM) -oraz bajtkodu do kodu natywnego. Do używania go wymagany jest -dodatkowo pakiet libgcj. - -%package java-aotcompile -Summary: Java AOT-compiler - compiling bytecode to native -Summary(pl.UTF-8): Kompilator AOT dla Javy - kompilacja bajtkodu do kodu natywnego -License: GPL v2+ -Group: Development/Tools -Requires: %{name}-java = %{epoch}:%{version}-%{release} - -%description java-aotcompile -aot-compile is a script that searches a directory for Java bytecode -(as class files, or in jars) and uses gcj to compile it to native code -and generate the databases from it. - -%description java-aotcompile -l pl.UTF-8 -aot-compile to skrypt wyszukujący w katalogu bajtkod Javy (w plikach -class lub jarach) i kompilujący go przy użyciu gcj, a następnie -generujący z niego bazy danych. - -%package -n libgcj -Summary: Java Class Libraries -Summary(es.UTF-8): Bibliotecas de clases de Java -Summary(pl.UTF-8): Biblioteki klas Javy -License: GPL v2+ with limited linking exception -Group: Libraries -Requires: jpackage-utils -Requires: libstdc++ = %{epoch}:%{version}-%{release} -Requires: libxml2 >= 1:2.6.8 -Requires: libxslt >= 1.1.11 -%if %{with gtk} -Requires: cairo >= 1.1.8 -Requires: gtk+2 >= 2:2.8 -Requires: libart_lgpl >= 2.1 -%endif -%if %{with qt} -Requires: QtCore >= 4.1.0 -Requires: QtGui >= 4.1.0 -%endif -Provides: java(ClassDataVersion) = %{_classdataversion} -Obsoletes: libgcj3 - -%description -n libgcj -Java Class Libraries. - -%description -n libgcj -l es.UTF-8 -Bibliotecas de clases de Java. - -%description -n libgcj -l pl.UTF-8 -Biblioteki klas Javy. - -%package -n libgcj-devel -Summary: Development files for Java Class Libraries -Summary(es.UTF-8): Ficheros de desarrollo para las bibliotecas de clases de Java -Summary(pl.UTF-8): Pliki nagłówkowe bibliotek klas Javy -License: GPL v2+ with limited linking exception -Group: Development/Libraries -Requires: libgcj = %{epoch}:%{version}-%{release} -Requires: libstdc++-devel = %{epoch}:%{version}-%{release} -Requires: zlib-devel -Obsoletes: libgcj3-devel - -%description -n libgcj-devel -Development files for Java Class Libraries. - -%description -n libgcj-devel -l es.UTF-8 -Ficheros de desarrollo para las bibliotecas de clases de Java. - -%description -n libgcj-devel -l pl.UTF-8 -Pliki nagłówkowe bibliotek klas Javy. - -%package -n libgcj-static -Summary: Static Java Class Libraries -Summary(es.UTF-8): Bibliotecas estáticas de clases de Java -Summary(pl.UTF-8): Statyczne biblioteki klas Javy -License: GPL v2+ with limited linking exception -Group: Development/Libraries -Requires: libgcj-devel = %{epoch}:%{version}-%{release} - -%description -n libgcj-static -Static Java Class Libraries. - -%description -n libgcj-static -l es.UTF-8 -Bibliotecas estáticas de clases de Java. - -%description -n libgcj-static -l pl.UTF-8 -Statyczne biblioteki klas Javy. - %package -n libffi Summary: Foreign Function Interface library Summary(es.UTF-8): Biblioteca de interfaz de funciones ajenas @@ -2992,10 +2822,6 @@ Extensions dla języka C. %patch3 -p1 %patch4 -p1 -%patch7 -p0 -%if %{with qt} -%patch8 -p1 -%endif %patch10 -p1 %if %{with gcc_libffi} %patch11 -p0 @@ -3011,18 +2837,10 @@ echo "release" > gcc/DEV-PHASE cd gcc #{__autoconf} cd .. -%if %{with qt} -cd libjava/classpath -%{__autoconf} -cd ../.. -%endif cp -f /usr/share/automake/config.sub . rm -rf builddir && install -d builddir && cd builddir -# http://www.mailinglistarchive.com/java%40gcc.gnu.org/msg02751.html -export JAR=no - CC="%{__cc}" \ CFLAGS="%{rpmcflags}" \ CXXFLAGS="%{rpmcxxflags}" \ @@ -3049,7 +2867,7 @@ TEXCONFIG=false \ --enable-gnu-unique-object \ --enable-initfini-array \ --disable-isl-version-check \ - --enable-languages="c%{?with_cxx:,c++}%{?with_fortran:,fortran}%{?with_objc:,objc}%{?with_objcxx:,obj-c++}%{?with_ada:,ada}%{?with_java:,java}%{?with_go:,go}" \ + --enable-languages="c%{?with_cxx:,c++}%{?with_fortran:,fortran}%{?with_objc:,objc}%{?with_objcxx:,obj-c++}%{?with_ada:,ada}%{?with_go:,go}" \ --%{?with_gomp:en}%{!?with_gomp:dis}able-libgomp \ --enable-libitm \ --enable-linker-build-id \ @@ -3075,7 +2893,6 @@ TEXCONFIG=false \ --with-cpu=ultrasparc \ %endif --with-demangler-in-ld \ - --with-ecj-jar=%{_javadir}/ecj.jar \ --with-gnu-as \ --with-gnu-ld \ --with-linker-hash-style=gnu \ @@ -3095,7 +2912,7 @@ TEXCONFIG=false \ --with-system-libunwind \ %endif --with-system-zlib \ - %{!?with_java:--without-x} \ + --without-x \ %if %{with cxx} --enable-__cxa_atexit \ --enable-libstdcxx-allocator=new \ @@ -3106,23 +2923,6 @@ TEXCONFIG=false \ --enable-symvers=gnu%{?with_symvers:-versioned-namespace} \ --with-gxx-include-dir=%{_includedir}/c++/%{version} \ %{?with_vtv:--enable-vtable-verify} \ -%endif -%if %{with java} - %{!?with_alsa:--disable-alsa} \ - %{!?with_dssi:--disable-dssi} \ - --disable-gconf-peer \ - %{?with_gtk:--enable-gtk-cairo} \ -%if %{with x} - --enable-java-awt="xlib%{?with_gtk:,gtk}%{?with_qt:,qt}" \ -%endif - --enable-jni \ - --enable-libgcj \ - --enable-libgcj-database \ - --enable-libgcj-multifile \ - --disable-libjava-multilib \ - %{?with_mozilla:--enable-plugin} \ - --enable-static-libjava \ - --enable-xmlj \ %endif --with-pkgversion="PLD-Linux" \ --with-bugurl="http://bugs.pld-linux.org" \ @@ -3182,10 +2982,6 @@ ln -f $RPM_BUILD_ROOT%{_bindir}/sparc64-pld-linux-c++ \ ln -f $RPM_BUILD_ROOT%{_bindir}/sparc64-pld-linux-g++ \ $RPM_BUILD_ROOT%{_bindir}/sparc-pld-linux-g++ %endif -%if %{with java} -ln -f $RPM_BUILD_ROOT%{_bindir}/sparc64-pld-linux-gcj \ - $RPM_BUILD_ROOT%{_bindir}/sparc-pld-linux-gcj -%endif %endif %endif @@ -3273,12 +3069,6 @@ ln -sf libgnarl-%{major_ver}.so $RPM_BUILD_ROOT%{_libdirm2}/libgnarl.so cd .. -%if %{with java} -install -d java-doc -cp -f libjava/READ* java-doc -ln -sf libgcj-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/libgcj.jar -%endif - %if %{with gcc_libffi} # still not installed by gcc? [ ! -f $RPM_BUILD_ROOT%{_pkgconfigdir}/libffi.pc ] || exit 1 @@ -3319,17 +3109,6 @@ for f in libitm.la libssp.la libssp_nonshared.la \ %{?with_lsan_m0:liblsan.la} \ %{?with_tsan_m0:libtsan.la} \ %{?with_atomic:libatomic.la} \ -%if %{with java} - %{?with_gcc_libffi:libffi.la} \ - libgcj.la libgcj-tools.la libgij.la \ - %{gcjdbexecdir}/libjvm.la \ - %{gcjdbexecdir}/libxmlj.la \ - %{?with_x:lib-gnu-awt-xlib.la} \ - %{?with_gtk:%{gcjdbexecdir}/libgtkpeer.la %{gcjdbexecdir}/libjawt.la} \ - %{?with_qt:%{gcjdbexecdir}/libqtpeer.la} \ - %{?with_alsa:%{gcjdbexecdir}/libgjsmalsa.la} \ - %{?with_dssi:%{gcjdbexecdir}/libgjsmdssi.la} \ -%endif %{?with_objc:libobjc.la}; do file="$RPM_BUILD_ROOT%{_libdir}/$f" @@ -3348,7 +3127,6 @@ for f in libitm.la libssp.la libssp_nonshared.la \ %{?with_lsan_m1:liblsan.la} \ %{?with_tsan_m1:libtsan.la} \ %{?with_atomic:libatomic.la} \ - %{?with_java:%{?with_gcc_libffi:libffi.la}} \ %{?with_objc:libobjc.la}; do %{__perl} %{SOURCE1} $RPM_BUILD_ROOT%{_libdir32}/$f %{_libdir32} > $RPM_BUILD_ROOT%{_libdir32}/$f.fixed @@ -3363,7 +3141,6 @@ for f in libitm.la libssp.la libssp_nonshared.la \ %{?with_lsan_m2:liblsan.la} \ %{?with_tsan_m2:libtsan.la} \ %{?with_atomic:libatomic.la} \ - %{?with_java:%{?with_gcc_libffi:libffi.la}} \ %{?with_objc:libobjc.la}; do %{__perl} %{SOURCE1} $RPM_BUILD_ROOT%{_libdirm2}/$f %{_libdirm2} > $RPM_BUILD_ROOT%{_libdirm2}/$f.fixed @@ -3397,18 +3174,11 @@ for LIBDIR in %{_libdir} %{?with_multilib:%{_libdir32}} %{?with_multilib2:%{_lib done install -d $RPM_BUILD_ROOT%{py_sitescriptdir} %{__mv} $RPM_BUILD_ROOT%{_datadir}/gcc-%{version}/python/libstdcxx $RPM_BUILD_ROOT%{py_sitescriptdir} -%if %{with java} -%{__mv} $RPM_BUILD_ROOT%{_datadir}/gcc-%{version}/python/libjava $RPM_BUILD_ROOT%{py_sitescriptdir} -%{__sed} -i -e '1s,#!/usr/bin/env python,#!/usr/bin/python,' $RPM_BUILD_ROOT%{_bindir}/aot-compile -%endif %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir} %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir} %py_postclean %else %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/gcc-%{version}/python/libstdcxx -%if %{with java} -%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/gcc-%{version}/python/libjava -%endif %endif # script(s) always installed; see above for builds with python; if no python, just don't package %{__rm} $RPM_BUILD_ROOT%{_libdir}/libstdc++.so.*-gdb.py @@ -3458,12 +3228,6 @@ rm -rf $RPM_BUILD_ROOT %postun fortran -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%post java -p /sbin/postshell --/usr/sbin/fix-info-dir -c %{_infodir} - -%postun java -p /sbin/postshell --/usr/sbin/fix-info-dir -c %{_infodir} - %post go -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} @@ -3524,8 +3288,6 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig -n libgfortran-multilib-32 %post -p /sbin/ldconfig -n libgfortran-multilib-%{multilib2} %postun -p /sbin/ldconfig -n libgfortran-multilib-%{multilib2} -%post -p /sbin/ldconfig -n libgcj -%postun -p /sbin/ldconfig -n libgcj %post -p /sbin/ldconfig -n libffi %postun -p /sbin/ldconfig -n libffi %post -p /sbin/ldconfig -n libffi-multilib-32 @@ -3605,11 +3367,14 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/gcc-ranlib #%attr(755,root,root) %{_bindir}/gccbug %attr(755,root,root) %{_bindir}/gcov +%attr(755,root,root) %{_bindir}/gcov-dump %attr(755,root,root) %{_bindir}/gcov-tool %{_mandir}/man1/cc.1* %{_mandir}/man1/cpp.1* %{_mandir}/man1/gcc.1* %{_mandir}/man1/gcov.1* +%{_mandir}/man1/gcov-dump.1* +%{_mandir}/man1/gcov-tool.1* %{_infodir}/cpp.info* %{_infodir}/cppinternals.info* %{_infodir}/gcc.info* @@ -3647,6 +3412,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{gcclibdir}/include/ssp %{gcclibdir}/include/ssp/*.h %{gcclibdir}/include/float.h +%{gcclibdir}/include/gcov.h %{gcclibdir}/include/iso646.h %{gcclibdir}/include/limits.h %{gcclibdir}/include/stdalign.h @@ -3665,6 +3431,9 @@ rm -rf $RPM_BUILD_ROOT %{gcclibdir}/include/adxintrin.h %{gcclibdir}/include/ammintrin.h %{gcclibdir}/include/avx2intrin.h +%{gcclibdir}/include/avx5124fmapsintrin.h +%{gcclibdir}/include/avx5124vnniwintrin.h +%{gcclibdir}/include/avx512vpopcntdqintrin.h %{gcclibdir}/include/avx512bwintrin.h %{gcclibdir}/include/avx512cdintrin.h %{gcclibdir}/include/avx512dqintrin.h @@ -3707,6 +3476,7 @@ rm -rf $RPM_BUILD_ROOT %{gcclibdir}/include/prfchwintrin.h %{gcclibdir}/include/rdseedintrin.h %{gcclibdir}/include/rtmintrin.h +%{gcclibdir}/include/sgxintrin.h %{gcclibdir}/include/shaintrin.h %{gcclibdir}/include/smmintrin.h %{gcclibdir}/include/tbmintrin.h @@ -4006,9 +3776,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc gcc/ada/ChangeLog %attr(755,root,root) %{_bindir}/gnat* -%if %{with java} -%exclude %{_bindir}/gnative2ascii -%endif %attr(755,root,root) %{_libdir}/libgnarl-*.so %attr(755,root,root) %{_libdir}/libgnarl.so %attr(755,root,root) %{_libdir}/libgnat-*.so @@ -4019,6 +3786,8 @@ rm -rf $RPM_BUILD_ROOT %{gcclibdir}/adalib/*.ali %ifarch %{ix86} %{x8664} x32 %{gcclibdir}/adalib/libgmem.a +%{gcclibdir}/adalib/libgnarl_pic.a +%{gcclibdir}/adalib/libgnat_pic.a %endif %{_infodir}/gnat-style.info* %{_infodir}/gnat_rm.info* @@ -4140,14 +3909,6 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/extc++.h %{_includedir}/stdc++.h %{_includedir}/stdtr1c++.h -%if %{with java} -%exclude %{_includedir}/c++/%{version}/java -%exclude %{_includedir}/c++/%{version}/javax -%exclude %{_includedir}/c++/%{version}/gcj -%exclude %{_includedir}/c++/%{version}/gnu -%exclude %{_includedir}/c++/%{version}/org -%exclude %{_includedir}/c++/%{version}/sun -%endif %files -n libstdc++-static %defattr(644,root,root,755) @@ -4259,7 +4020,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc libgfortran/{AUTHORS,README,ChangeLog} %attr(755,root,root) %{_libdir}/libgfortran.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgfortran.so.3 +%attr(755,root,root) %ghost %{_libdir}/libgfortran.so.4 %files -n libgfortran-static %defattr(644,root,root,755) @@ -4269,7 +4030,7 @@ rm -rf $RPM_BUILD_ROOT %files -n libgfortran-multilib-32 %defattr(644,root,root,755) %attr(755,root,root) %{_libdir32}/libgfortran.so.*.*.* -%attr(755,root,root) %ghost %{_libdir32}/libgfortran.so.3 +%attr(755,root,root) %ghost %{_libdir32}/libgfortran.so.4 %files -n libgfortran-multilib-32-static %defattr(644,root,root,755) @@ -4280,7 +4041,7 @@ rm -rf $RPM_BUILD_ROOT %files -n libgfortran-multilib-%{multilib2} %defattr(644,root,root,755) %attr(755,root,root) %{_libdirm2}/libgfortran.so.*.*.* -%attr(755,root,root) %ghost %{_libdirm2}/libgfortran.so.3 +%attr(755,root,root) %ghost %{_libdirm2}/libgfortran.so.4 %files -n libgfortran-multilib-%{multilib2}-static %defattr(644,root,root,755) @@ -4337,146 +4098,10 @@ rm -rf $RPM_BUILD_ROOT %endif %endif -%if %{with java} -%files java -%defattr(644,root,root,755) -%doc gcc/java/ChangeLog java-doc/* -%attr(755,root,root) %{_bindir}/gappletviewer -%attr(755,root,root) %{_bindir}/gc-analyze -%attr(755,root,root) %{_bindir}/gcj -%attr(755,root,root) %{_bindir}/gcj-dbtool -%attr(755,root,root) %{_bindir}/gcjh -%attr(755,root,root) %{_bindir}/gjar -%attr(755,root,root) %{_bindir}/gjarsigner -%attr(755,root,root) %{_bindir}/gjavah -%attr(755,root,root) %{_bindir}/gkeytool -%attr(755,root,root) %{_bindir}/gnative2ascii -%attr(755,root,root) %{_bindir}/gorbd -%attr(755,root,root) %{_bindir}/grmic -%attr(755,root,root) %{_bindir}/grmid -%attr(755,root,root) %{_bindir}/grmiregistry -%attr(755,root,root) %{_bindir}/gserialver -%attr(755,root,root) %{_bindir}/gtnameserv -%attr(755,root,root) %{_bindir}/jcf-dump -%attr(755,root,root) %{_bindir}/jv-convert -%attr(755,root,root) %{_bindir}/rebuild-gcj-db -%attr(755,root,root) %{_bindir}/*-gcj -%attr(755,root,root) %{gcclibdir}/ecj1 -%attr(755,root,root) %{gcclibdir}/jc1 -%attr(755,root,root) %{gcclibdir}/jvgenmain -%{_infodir}/cp-tools.info* -%{_infodir}/gcj.info* -%{_mandir}/man1/gappletviewer.1* -%{_mandir}/man1/gc-analyze.1* -%{_mandir}/man1/gcj.1* -%{_mandir}/man1/gcj-dbtool.1* -%{_mandir}/man1/gcjh.1* -%{_mandir}/man1/gjar.1* -%{_mandir}/man1/gjarsigner.1* -%{_mandir}/man1/gjavah.1* -%{_mandir}/man1/gkeytool.1* -%{_mandir}/man1/gnative2ascii.1* -%{_mandir}/man1/gorbd.1* -%{_mandir}/man1/grmic.1* -%{_mandir}/man1/grmid.1* -%{_mandir}/man1/grmiregistry.1* -%{_mandir}/man1/gserialver.1* -%{_mandir}/man1/gtnameserv.1* -%{_mandir}/man1/jcf-dump.1* -%{_mandir}/man1/jv-convert.1* -%{_mandir}/man1/rebuild-gcj-db* - -%if %{with python} -%files java-aotcompile -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/aot-compile -%dir %{py_sitescriptdir}/libjava -%{py_sitescriptdir}/libjava/*.py[co] -%{_mandir}/man1/aot-compile.1* -%endif - -%files -n libgcj -%defattr(644,root,root,755) -%doc libjava/{ChangeLog,LIBGCJ_LICENSE,NEWS,README,THANKS} -%attr(755,root,root) %{_bindir}/gij -%attr(755,root,root) %{_libdir}/libgcj-tools.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgcj-tools.so.%{gcj_soname_ver} -%attr(755,root,root) %{_libdir}/libgcj.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgcj.so.%{gcj_soname_ver} -%attr(755,root,root) %{_libdir}/libgcj_bc.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgcj_bc.so.1 -%attr(755,root,root) %{_libdir}/libgcj_bc.so -%attr(755,root,root) %{_libdir}/libgij.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgij.so.%{gcj_soname_ver} -%{?with_x:%attr(755,root,root) %{_libdir}/lib-gnu-awt-xlib.so.*.*.*} -%{?with_x:%attr(755,root,root) %ghost %{_libdir}/lib-gnu-awt-xlib.so.%{gcj_soname_ver}} -%dir %{_libdir}/%{gcjdbexecdir} -%{_libdir}/%{gcjdbexecdir}/classmap.db -%{?with_mozilla:%attr(755,root,root) %{_libdir}/%{gcjdbexecdir}/libgcjwebplugin.so} -%{?with_alsa:%attr(755,root,root) %{_libdir}/%{gcjdbexecdir}/libgjsmalsa.so*} -%{?with_dssi:%attr(755,root,root) %{_libdir}/%{gcjdbexecdir}/libgjsmdssi.so*} -%{?with_gtk:%attr(755,root,root) %{_libdir}/%{gcjdbexecdir}/libgtkpeer.so} -%{?with_gtk:%attr(755,root,root) %{_libdir}/%{gcjdbexecdir}/libjawt.so} -%attr(755,root,root) %{_libdir}/%{gcjdbexecdir}/libjavamath.so -%attr(755,root,root) %{_libdir}/%{gcjdbexecdir}/libjvm.so -%{?with_qt:%attr(755,root,root) %{_libdir}/%{gcjdbexecdir}/libqtpeer.so} -%attr(755,root,root) %{_libdir}/%{gcjdbexecdir}/libxmlj.so* -%{_libdir}/logging.properties -%{_javadir}/libgcj*.jar -%{_mandir}/man1/gij.1* - -%files -n libgcj-devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libgcj-tools.so -%{_libdir}/libgcj-tools.la -%attr(755,root,root) %{_libdir}/libgcj.so -%{_libdir}/libgcj.la -%attr(755,root,root) %{_libdir}/libgij.so -%{_libdir}/libgij.la -%if %{with x} -%attr(755,root,root) %{_libdir}/lib-gnu-awt-xlib.so -%{_libdir}/lib-gnu-awt-xlib.la -%endif -%{_libdir}/libgcj.spec -%dir %{_libdir}/security -%{_libdir}/security/* -%{?with_alsa:%{_libdir}/%{gcjdbexecdir}/libgjsmalsa.la} -%{?with_dssi:%{_libdir}/%{gcjdbexecdir}/libgjsmdssi.la} -%{?with_gtk:%{_libdir}/%{gcjdbexecdir}/libgtkpeer.la} -%{?with_gtk:%{_libdir}/%{gcjdbexecdir}/libjawt.la} -%{_libdir}/%{gcjdbexecdir}/libjavamath.la -%{_libdir}/%{gcjdbexecdir}/libjvm.la -%{?with_qt:%{_libdir}/%{gcjdbexecdir}/libqtpeer.la} -%{?with_mozilla:%{_libdir}/%{gcjdbexecdir}/libgcjwebplugin.la} -%{_libdir}/%{gcjdbexecdir}/libxmlj.la -%{gcclibdir}/include/gcj -%{gcclibdir}/include/jawt.h -%{gcclibdir}/include/jawt_md.h -%{gcclibdir}/include/jni.h -%{gcclibdir}/include/jni_md.h -%{gcclibdir}/include/jvmpi.h -%{_includedir}/c++/%{version}/java -%{_includedir}/c++/%{version}/javax -%{_includedir}/c++/%{version}/gcj -%{_includedir}/c++/%{version}/gnu -%{_includedir}/c++/%{version}/org -%{_includedir}/c++/%{version}/sun -%{_pkgconfigdir}/libgcj-%{major_ver}.pc - -%files -n libgcj-static -%defattr(644,root,root,755) -%{_libdir}/libgcj-tools.a -%{_libdir}/libgcj.a -%{_libdir}/libgcj_bc.a -%{_libdir}/libgij.a -%{?with_x:%{_libdir}/lib-gnu-awt-xlib.a} -%{_libdir}/%{gcjdbexecdir}/libjvm.a -%endif - %if %{with gcc_libffi} %files -n libffi %defattr(644,root,root,755) -%doc libffi/{ChangeLog,ChangeLog.libgcj,LICENSE,README} +%doc libffi/{ChangeLog,LICENSE,README} %attr(755,root,root) %{_libdir}/libffi.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libffi.so.4 @@ -4626,7 +4251,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc libgo/{LICENSE,PATENTS,README} %attr(755,root,root) %{_libdir}/libgo.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgo.so.9 +%attr(755,root,root) %ghost %{_libdir}/libgo.so.11 %files -n libgo-devel %defattr(644,root,root,755) @@ -4634,7 +4259,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgo.la %{_libdir}/libgobegin.a %{_libdir}/libgolibbegin.a -%{_libdir}/libnetgo.a %files -n libgo-static %defattr(644,root,root,755) @@ -4644,7 +4268,7 @@ rm -rf $RPM_BUILD_ROOT %files -n libgo-multilib-32 %defattr(644,root,root,755) %attr(755,root,root) %{_libdir32}/libgo.so.*.*.* -%attr(755,root,root) %ghost %{_libdir32}/libgo.so.9 +%attr(755,root,root) %ghost %{_libdir32}/libgo.so.11 %files -n libgo-multilib-32-devel %defattr(644,root,root,755) @@ -4652,7 +4276,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir32}/libgo.la %{_libdir32}/libgobegin.a %{_libdir32}/libgolibbegin.a -%{_libdir32}/libnetgo.a %files -n libgo-multilib-32-static %defattr(644,root,root,755) @@ -4663,7 +4286,7 @@ rm -rf $RPM_BUILD_ROOT %files -n libgo-multilib-%{multilib2} %defattr(644,root,root,755) %attr(755,root,root) %{_libdirm2}/libgo.so.*.*.* -%attr(755,root,root) %ghost %{_libdirm2}/libgo.so.9 +%attr(755,root,root) %ghost %{_libdirm2}/libgo.so.11 %files -n libgo-multilib-%{multilib2}-devel %defattr(644,root,root,755) @@ -4671,7 +4294,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdirm2}/libgo.la %{_libdirm2}/libgobegin.a %{_libdirm2}/libgolibbegin.a -%{_libdirm2}/libnetgo.a %files -n libgo-multilib-%{multilib2}-static %defattr(644,root,root,755) @@ -4684,7 +4306,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc libsanitizer/ChangeLog* libsanitizer/LICENSE.TXT %attr(755,root,root) %{_libdir}/libasan.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libasan.so.3 +%attr(755,root,root) %ghost %{_libdir}/libasan.so.4 %files -n libasan-devel %defattr(644,root,root,755) @@ -4701,7 +4323,7 @@ rm -rf $RPM_BUILD_ROOT %files -n libasan-multilib-32 %defattr(644,root,root,755) %attr(755,root,root) %{_libdir32}/libasan.so.*.*.* -%attr(755,root,root) %ghost %{_libdir32}/libasan.so.3 +%attr(755,root,root) %ghost %{_libdir32}/libasan.so.4 %files -n libasan-multilib-32-devel %defattr(644,root,root,755) @@ -4718,7 +4340,7 @@ rm -rf $RPM_BUILD_ROOT %files -n libasan-multilib-%{multilib2} %defattr(644,root,root,755) %attr(755,root,root) %{_libdirm2}/libasan.so.*.*.* -%attr(755,root,root) %ghost %{_libdirm2}/libasan.so.3 +%attr(755,root,root) %ghost %{_libdirm2}/libasan.so.4 %files -n libasan-multilib-%{multilib2}-devel %defattr(644,root,root,755) @@ -4779,6 +4401,7 @@ rm -rf $RPM_BUILD_ROOT %files -n libtsan-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libtsan.so +%{_libdir}/libtsan_preinit.o %{_libdir}/libtsan.la %files -n libtsan-static @@ -4956,6 +4579,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libcc1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libcc1.so.0 %attr(755,root,root) %{gcclibdir}/plugin/libcc1plugin.so.* +%attr(755,root,root) %{gcclibdir}/plugin/libcp1plugin.so.* %files plugin-devel %defattr(644,root,root,755) @@ -4965,3 +4589,5 @@ rm -rf $RPM_BUILD_ROOT %{gcclibdir}/plugin/include %attr(755,root,root) %{gcclibdir}/plugin/libcc1plugin.la %attr(755,root,root) %{gcclibdir}/plugin/libcc1plugin.so +%attr(755,root,root) %{gcclibdir}/plugin/libcp1plugin.la +%attr(755,root,root) %{gcclibdir}/plugin/libcp1plugin.so -- 2.44.0