[packages/gcc] - updated nodebug, ppc64-m32-m64-multilib-only, moresparcs patches - more check-files cleanups

qboosh qboosh at pld-linux.org
Fri Jul 13 15:32:23 CEST 2012


commit 838d73c573fecf7cabf6d8387f1a9a3a51c785cb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 13 15:32:27 2012 +0200

    - updated nodebug,ppc64-m32-m64-multilib-only,moresparcs patches
    - more check-files cleanups

 gcc-moresparcs.patch                  | 46 ++++++++++----------
 gcc-nodebug.patch                     | 80 +++++++++++++++--------------------
 gcc-ppc64-m32-m64-multilib-only.patch |  9 ++--
 gcc.spec                              | 15 ++++---
 4 files changed, 68 insertions(+), 82 deletions(-)
---
diff --git a/gcc-moresparcs.patch b/gcc-moresparcs.patch
index 38a68ff..9d62700 100644
--- a/gcc-moresparcs.patch
+++ b/gcc-moresparcs.patch
@@ -1,40 +1,40 @@
---- gcc-4.6.0/gcc/config.gcc.orig	2011-03-14 07:05:29.000000000 +0100
-+++ gcc-4.6.0/gcc/config.gcc	2011-04-30 16:17:12.535045280 +0200
-@@ -2529,7 +2529,7 @@
- 	tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
- 	extra_parts="crtbegin.o crtend.o"
+--- gcc-4.7.1/gcc/config.gcc.orig	2012-07-10 17:33:40.596463050 +0200
++++ gcc-4.7.1/gcc/config.gcc	2012-07-12 18:39:03.475713361 +0200
+@@ -2401,7 +2401,7 @@
+ 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
+ 	tmake_file="sparc/t-sparc sparc/t-elf t-rtems"
  	;;
 -sparc-*-linux*)
 +sparc-*-linux* | sparcv[789]*-*-linux*)
- 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h"
+ 	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
-@@ -2623,7 +2623,7 @@
- 	tmake_file="${tmake_file} sparc/t-crtfm t-rtems"
- 	extra_parts="crtbegin.o crtend.o"
+@@ -2454,7 +2454,7 @@
+ 	extra_options="${extra_options}"
+ 	tmake_file="${tmake_file} sparc/t-sparc t-rtems"
  	;;
 -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/linux64.h"
+ 	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"
  	extra_options="${extra_options} sparc/long-double-switch.opt"
- 	tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
---- gcc-4.6.0/libgcc/config.host.orig	2011-03-14 07:06:23.000000000 +0100
-+++ gcc-4.6.0/libgcc/config.host	2011-04-30 16:18:16.995047438 +0200
-@@ -548,7 +548,7 @@
- 	;;
- sparc-*-elf*)
+ 	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
++++ gcc-4.7.1/libgcc/config.host	2012-07-12 18:39:51.112378028 +0200
+@@ -1012,7 +1012,7 @@
+ 	tmake_file="${tmake_file} t-fdpbit t-crtfm"
+ 	extra_parts="$extra_parts crti.o crtn.o crtfastmath.o"
  	;;
 -sparc-*-linux*)		# SPARC's running GNU/Linux, libc6
 +sparc-*-linux* | sparcv[789]*-*-linux*)		# SPARC's running GNU/Linux, libc6
+ 	tmake_file="${tmake_file} t-crtfm"
+ 	if test "${host_address}" = 64; then
+ 		tmake_file="$tmake_file sparc/t-linux64"
+@@ -1060,7 +1060,7 @@
+ 	tmake_file="$tmake_file t-crtfm"
  	extra_parts="$extra_parts crtfastmath.o"
- 	tmake_file="${tmake_file} sparc/t-crtfm"
- 	;;
-@@ -564,7 +564,7 @@
- 	;;
- sparc64-*-freebsd*|ultrasparc-*-freebsd*)
  	;;
 -sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
 +sparc64*-*-linux*)		# 64-bit SPARC's running GNU/Linux
  	extra_parts="$extra_parts crtfastmath.o"
- 	tmake_file="${tmake_file} sparc/t-crtfm"
- 	;;
+ 	tmake_file="${tmake_file} t-crtfm sparc/t-linux"
+ 	if test "${host_address}" = 64; then
diff --git a/gcc-nodebug.patch b/gcc-nodebug.patch
index ccb49a9..09ca5a9 100644
--- a/gcc-nodebug.patch
+++ b/gcc-nodebug.patch
@@ -1,6 +1,5 @@
-diff -urN gcc-4.7.0.org/gcc/ada/gcc-interface/Makefile.in gcc-4.7.0/gcc/ada/gcc-interface/Makefile.in
---- gcc-4.7.0.org/gcc/ada/gcc-interface/Makefile.in	2012-02-24 17:17:01.000000000 +0100
-+++ gcc-4.7.0/gcc/ada/gcc-interface/Makefile.in	2012-03-22 15:46:37.236129553 +0100
+--- gcc-4.7.1/gcc/ada/gcc-interface/Makefile.in.orig	2012-07-10 17:33:42.146462985 +0200
++++ gcc-4.7.1/gcc/ada/gcc-interface/Makefile.in	2012-07-12 18:27:21.682409479 +0200
 @@ -66,7 +66,7 @@
  # CFLAGS is for the user to override to, e.g., do a bootstrap with -O2.
  # BOOT_CFLAGS is the value of CFLAGS to pass
@@ -22,9 +21,9 @@ diff -urN gcc-4.7.0.org/gcc/ada/gcc-interface/Makefile.in gcc-4.7.0/gcc/ada/gcc-
 -GNATLIBCFLAGS = -g -O2
 +GNATLIBCFLAGS = -O2
  PICFLAG_FOR_TARGET = @PICFLAG_FOR_TARGET@
+ 
  # Pretend that _Unwind_GetIPInfo is available for the target by default.  This
- # should be autodetected during the configuration of libada and passed down to
-@@ -2739,7 +2739,7 @@
+@@ -2755,7 +2755,7 @@
  	cd $(RTSDIR) && \
  	../../gnatsym -s SYMVEC_$$$$.opt \
  	$(LIBGNAT_OBJS) $(GNATRTL_NONTASKING_OBJS) && \
@@ -33,7 +32,7 @@ diff -urN gcc-4.7.0.org/gcc/ada/gcc-interface/Makefile.in gcc-4.7.0/gcc/ada/gcc-
  	   -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) libgnat.a \
  	   sys\$$library:trace.exe \
  	   --for-linker=/noinform \
-@@ -2748,7 +2748,7 @@
+@@ -2764,7 +2764,7 @@
  	cd $(RTSDIR) && \
  	../../gnatsym -s SYMVEC_$$$$.opt \
  	$(GNATRTL_TASKING_OBJS) && \
@@ -42,21 +41,19 @@ diff -urN gcc-4.7.0.org/gcc/ada/gcc-interface/Makefile.in gcc-4.7.0/gcc/ada/gcc-
  	   -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
  	   libgnarl.a libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
  	   sys\$$library:trace.exe \
-diff -urN gcc-4.7.0.org/libada/Makefile.in gcc-4.7.0/libada/Makefile.in
---- gcc-4.7.0.org/libada/Makefile.in	2012-02-24 17:17:01.000000000 +0100
-+++ gcc-4.7.0/libada/Makefile.in	2012-03-22 15:46:37.016124154 +0100
-@@ -54,7 +54,7 @@
+--- gcc-4.7.1/libada/Makefile.in.orig	2012-06-12 17:12:37.000000000 +0200
++++ gcc-4.7.1/libada/Makefile.in	2012-07-12 18:27:53.482408144 +0200
+@@ -53,7 +53,7 @@
  CFLAGS=-g
  PICFLAG = @PICFLAG@
  GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
 -GNATLIBCFLAGS= -g -O2
 +GNATLIBCFLAGS= -O2
- GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
+ GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
  	-fexceptions -DIN_RTS @have_getipinfo@
  
-diff -urN gcc-4.7.0.org/libffi/Makefile.am gcc-4.7.0/libffi/Makefile.am
---- gcc-4.7.0.org/libffi/Makefile.am	2012-02-27 11:00:12.000000000 +0100
-+++ gcc-4.7.0/libffi/Makefile.am	2012-03-22 15:46:33.659375098 +0100
+--- gcc-4.7.1/libffi/Makefile.am.orig	2012-02-27 11:00:12.000000000 +0100
++++ gcc-4.7.1/libffi/Makefile.am	2012-07-12 18:28:20.115740360 +0200
 @@ -168,7 +168,7 @@
  libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
  nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
@@ -66,9 +63,8 @@ diff -urN gcc-4.7.0.org/libffi/Makefile.am gcc-4.7.0/libffi/Makefile.am
  
  LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
  
-diff -urN gcc-4.7.0.org/libffi/Makefile.in gcc-4.7.0/libffi/Makefile.in
---- gcc-4.7.0.org/libffi/Makefile.in	2012-03-22 08:37:39.000000000 +0100
-+++ gcc-4.7.0/libffi/Makefile.in	2012-03-22 15:46:37.216129063 +0100
+--- gcc-4.7.1/libffi/Makefile.in.orig	2012-06-14 10:48:08.000000000 +0200
++++ gcc-4.7.1/libffi/Makefile.in	2012-07-12 18:28:35.029073067 +0200
 @@ -475,7 +475,7 @@
  	$(am__append_24) $(am__append_25)
  libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
@@ -78,9 +74,8 @@ diff -urN gcc-4.7.0.org/libffi/Makefile.in gcc-4.7.0/libffi/Makefile.in
  LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
  libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
  AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
-diff -urN gcc-4.7.0.org/libgcc/Makefile.in gcc-4.7.0/libgcc/Makefile.in
---- gcc-4.7.0.org/libgcc/Makefile.in	2011-11-22 04:01:02.000000000 +0100
-+++ gcc-4.7.0/libgcc/Makefile.in	2012-03-22 15:46:37.229462724 +0100
+--- gcc-4.7.1/libgcc/Makefile.in.orig	2012-05-24 16:59:38.000000000 +0200
++++ gcc-4.7.1/libgcc/Makefile.in	2012-07-12 18:28:59.042405393 +0200
 @@ -221,7 +221,7 @@
  
  # Options to use when compiling libgcc2.a.
@@ -90,9 +85,8 @@ diff -urN gcc-4.7.0.org/libgcc/Makefile.in gcc-4.7.0/libgcc/Makefile.in
  LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \
  		 $(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \
  		 -fbuilding-libgcc -fno-stack-protector \
-diff -urN gcc-4.7.0.org/libjava/classpath/tools/Makefile.am gcc-4.7.0/libjava/classpath/tools/Makefile.am
---- gcc-4.7.0.org/libjava/classpath/tools/Makefile.am	2011-09-29 13:37:47.000000000 +0200
-+++ gcc-4.7.0/libjava/classpath/tools/Makefile.am	2012-03-22 15:46:33.626040947 +0100
+--- 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.
@@ -104,9 +98,8 @@ diff -urN gcc-4.7.0.org/libjava/classpath/tools/Makefile.am gcc-4.7.0/libjava/cl
  endif
  ## END GCJ LOCAL
  ## Copy over tools resource files.
-diff -urN gcc-4.7.0.org/libjava/classpath/tools/Makefile.in gcc-4.7.0/libjava/classpath/tools/Makefile.in
---- gcc-4.7.0.org/libjava/classpath/tools/Makefile.in	2011-09-29 13:37:47.000000000 +0200
-+++ gcc-4.7.0/libjava/classpath/tools/Makefile.in	2012-03-22 15:46:37.172794665 +0100
+--- 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
@@ -118,9 +111,8 @@ diff -urN gcc-4.7.0.org/libjava/classpath/tools/Makefile.in gcc-4.7.0/libjava/cl
  	@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 \
-diff -urN gcc-4.7.0.org/libjava/Makefile.am gcc-4.7.0/libjava/Makefile.am
---- gcc-4.7.0.org/libjava/Makefile.am	2011-08-05 16:37:48.000000000 +0200
-+++ gcc-4.7.0/libjava/Makefile.am	2012-03-22 15:46:33.516038248 +0100
+--- 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
@@ -130,9 +122,8 @@ diff -urN gcc-4.7.0.org/libjava/Makefile.am gcc-4.7.0/libjava/Makefile.am
  JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
  
  LIBFFIINCS = @LIBFFIINCS@
-diff -urN gcc-4.7.0.org/libjava/Makefile.in gcc-4.7.0/libjava/Makefile.in
---- gcc-4.7.0.org/libjava/Makefile.in	2012-03-22 08:37:39.000000000 +0100
-+++ gcc-4.7.0/libjava/Makefile.in	2012-03-22 15:46:37.049458306 +0100
+--- 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 at LIBGCJ_REDUCED_REFLECTION_FLAGS = 
  @BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE at LIBGCJ_REDUCED_REFLECTION_FLAGS = -freduced-reflection
@@ -142,9 +133,8 @@ diff -urN gcc-4.7.0.org/libjava/Makefile.in gcc-4.7.0/libjava/Makefile.in
  JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
  AM_CPPFLAGS = -I$(top_srcdir) \
  	-Iinclude -I$(top_srcdir)/include \
-diff -urN gcc-4.7.0.org/libjava/testsuite/Makefile.am gcc-4.7.0/libjava/testsuite/Makefile.am
---- gcc-4.7.0.org/libjava/testsuite/Makefile.am	2010-05-04 00:37:50.000000000 +0200
-+++ gcc-4.7.0/libjava/testsuite/Makefile.am	2012-03-22 15:46:33.522705078 +0100
+--- 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; \
@@ -159,9 +149,8 @@ diff -urN gcc-4.7.0.org/libjava/testsuite/Makefile.am gcc-4.7.0/libjava/testsuit
  	    $(top_builddir)/libgcj-$(gcc_version).jar:$$testtmpdir \
  	    -d $$testtmpdir $(srcdir)/$$test || exit; \
  	  case "$$test" in \
-diff -urN gcc-4.7.0.org/libjava/testsuite/Makefile.in gcc-4.7.0/libjava/testsuite/Makefile.in
---- gcc-4.7.0.org/libjava/testsuite/Makefile.in	2011-04-08 16:16:38.000000000 +0200
-+++ gcc-4.7.0/libjava/testsuite/Makefile.in	2012-03-22 15:46:37.029457815 +0100
+--- 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; \
@@ -176,9 +165,8 @@ diff -urN gcc-4.7.0.org/libjava/testsuite/Makefile.in gcc-4.7.0/libjava/testsuit
  @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 \
-diff -urN gcc-4.7.0.org/libstdc++-v3/include/Makefile.am gcc-4.7.0/libstdc++-v3/include/Makefile.am
---- gcc-4.7.0.org/libstdc++-v3/include/Makefile.am	2011-12-01 03:20:32.000000000 +0100
-+++ gcc-4.7.0/libstdc++-v3/include/Makefile.am	2012-03-22 15:46:33.492704342 +0100
+--- 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 @@
  # Build two precompiled C++ includes, stdc++.h.gch/*.gch
  ${pch1a_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source}
@@ -206,9 +194,8 @@ diff -urN gcc-4.7.0.org/libstdc++-v3/include/Makefile.am gcc-4.7.0/libstdc++-v3/
  
  # For robustness sake (in light of junk files or in-source
  # configuration), copy from the build or source tree to the install
-diff -urN gcc-4.7.0.org/libstdc++-v3/include/Makefile.in gcc-4.7.0/libstdc++-v3/include/Makefile.in
---- gcc-4.7.0.org/libstdc++-v3/include/Makefile.in	2012-02-17 21:26:32.000000000 +0100
-+++ gcc-4.7.0/libstdc++-v3/include/Makefile.in	2012-03-22 15:46:36.926121945 +0100
+--- gcc-4.7.1/libstdc++-v3/include/Makefile.in.orig	2012-03-23 12:00:54.000000000 +0100
++++ gcc-4.7.1/libstdc++-v3/include/Makefile.in	2012-07-12 18:31:43.922398474 +0200
 @@ -1543,22 +1543,22 @@
  # Build two precompiled C++ includes, stdc++.h.gch/*.gch
  ${pch1a_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source}
@@ -236,9 +223,8 @@ diff -urN gcc-4.7.0.org/libstdc++-v3/include/Makefile.in gcc-4.7.0/libstdc++-v3/
  
  # For robustness sake (in light of junk files or in-source
  # configuration), copy from the build or source tree to the install
-diff -urN gcc-4.7.0.org/Makefile.in gcc-4.7.0/Makefile.in
---- gcc-4.7.0.org/Makefile.in	2012-01-02 11:59:04.000000000 +0100
-+++ gcc-4.7.0/Makefile.in	2012-03-22 15:46:37.012790739 +0100
+--- gcc-4.7.1/Makefile.in.orig	2012-05-16 17:54:24.000000000 +0200
++++ gcc-4.7.1/Makefile.in	2012-07-12 18:32:07.075730835 +0200
 @@ -364,7 +364,7 @@
  
  # Flags to pass to stage2 and later makes.  They are defined
diff --git a/gcc-ppc64-m32-m64-multilib-only.patch b/gcc-ppc64-m32-m64-multilib-only.patch
index 45f053a..6665f97 100644
--- a/gcc-ppc64-m32-m64-multilib-only.patch
+++ b/gcc-ppc64-m32-m64-multilib-only.patch
@@ -1,6 +1,6 @@
---- a/gcc/config/rs6000/t-linux64	2007-09-27 21:56:06.000000000 +0200
-+++ b/gcc/config/rs6000/t-linux64	2008-03-04 15:59:23.000000000 +0100
-@@ -14,13 +14,13 @@
+--- gcc-4.7.1/gcc/config/rs6000/t-linux64.orig	2011-11-02 16:23:48.000000000 +0100
++++ gcc-4.7.1/gcc/config/rs6000/t-linux64	2012-07-12 18:36:30.279053123 +0200
+@@ -26,10 +26,10 @@
  # it doesn't tell anything about the 32bit libraries on those systems.  Set
  # MULTILIB_OSDIRNAMES according to what is found on the target.
  
@@ -17,6 +17,3 @@
 +MULTILIB_EXCLUSIONS     =
 +MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
 +MULTILIB_MATCHES        =
- 
- softfp_wrap_start := '\#ifndef __powerpc64__'
- softfp_wrap_end := '\#endif'
diff --git a/gcc.spec b/gcc.spec
index dda0681..46b67cf 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -33,6 +33,7 @@
 %bcond_without	x		# don't build libgcj Xlib-dependent AWTs (incl. GTK/Qt)
 # - other:
 %bcond_without	bootstrap	# omit 3-stage bootstrap
+%bcond_with	ppc64_nof	# "nof" multilib target in ppc64 compiler
 %bcond_with	tests		# torture gcc
 %bcond_with	symvers		# enable versioned symbols in libstdc++ (WARNING: changes soname from .so.6 to so.7)
 
@@ -1496,19 +1497,16 @@ Statyczna biblioteka języka Go - wersja 32-bitowa.
 %patch100 -p0
 %patch0 -p1
 %patch1 -p1
-# update if it makes speed difference for you
-#%patch2 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
-# update if you need it
-#%patch6 -p1
+%{!?with_ppc64_nof:%patch6 -p1}
 %patch7 -p0
 %if %{with qt}
 %patch8 -p1
 %endif
-# update if you need it
-#%patch10 -p1
+%patch10 -p1
 
 %patch13 -p0
 
@@ -1807,6 +1805,11 @@ cp -p $RPM_BUILD_ROOT%{gcclibdir}/include-fixed/syslimits.h $RPM_BUILD_ROOT%{gcc
 %{__rm} -r $RPM_BUILD_ROOT%{gcclibdir}/install-tools
 %{__rm} -r $RPM_BUILD_ROOT%{gcclibdir}/include-fixed
 
+# plugin, .la not needed
+%{__rm} $RPM_BUILD_ROOT%{gcclibdir}/liblto_plugin.la
+# already packaged in binutils-devel
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libiberty.a
+
 %if %{with python}
 for LIB in lib lib64; do
 	LIBPATH="$RPM_BUILD_ROOT%{_datadir}/gdb/auto-load%{_prefix}/$LIB"


More information about the pld-cvs-commit mailing list