Correct gcc config option on armv7l.

[platform/upstream/gcc48.git] / packaging / gcc.spec.in

diff --git a/packaging/gcc.spec.in b/packaging/gcc.spec.in
index 8af5c00..6733999 100644 (file)
--- a/packaging/gcc.spec.in
+++ b/packaging/gcc.spec.in
@@ -56,24 +56,20 @@
 %endif
 
 # Shared library SONAME versions
-%ifarch hppa
-%define libgcc_s 4
-%else
 %define libgcc_s 1
-%endif
-%define libgcj_sover 14
-%define libgcj_bc_sover 1
-%define libffi_sover 4
-%define libmudflap_sover 0
-%define libgomp_sover 1
-%define libstdcxx_sover 6
-%define libobjc_sover 4
-%define libgfortran_sover 3
-%define libquadmath_sover 0
-%define libasan_sover 0
-%define libtsan_sover 0
-%define libatomic_sover 1
-%define libitm_sover 1
+%define libgcj_sover %{nil}
+%define libgcj_bc_sover %{nil}
+%define libffi_sover %{nil}
+%define libmudflap_sover %{nil}
+%define libgomp_sover %{nil}
+%define libstdcxx_sover %{nil}
+%define libobjc_sover %{nil}
+%define libgfortran_sover %{nil}
+%define libquadmath_sover %{nil}
+%define libasan_sover %{nil}
+%define libtsan_sover %{nil}
+%define libatomic_sover %{nil}
+%define libitm_sover %{nil}
 
 # Shared library package suffix
 # This is used for the "non-standard" set of libraries, the standard
@@ -211,7 +207,7 @@ Suggests: gcc@base_ver@-info gcc@base_ver@-locale
 
 # COMMON-BEGIN
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
-Source:                gcc-%{gcc_version}%{snapshot_date}.tar.bz2
+Source:                gcc-%{version}.tar.bz2
 Source1:       change_spec
 Source3:       gcc48-rpmlintrc
 Source4:       ecj.jar
@@ -220,7 +216,7 @@ Source6:    baselibs.conf
 
 # GCC-TESTSUITE-DELETE-BEGIN
 # LIBJAVA-DELETE-BEGIN
-Group:         Development/Languages/C and C++
+Group:         Development/Toolchain
 Summary:       The GNU C Compiler and Support Files
 License:        GPL-3.0+
 
@@ -238,7 +234,6 @@ gcc-obj-c++.
 # COMMON-END
 %package -n gcc@base_ver@-32bit
 Summary:      The GNU C Compiler 32bit support
-Group:        Development/Languages/C and C++
 Requires: gcc@base_ver@ = %{version}-%{release}
 Requires: libgcc_s%{libgcc_s}-32bit >= %{version}-%{release}
 Requires: libgomp%{libgomp_sover}-32bit >= %{version}-%{release}
@@ -253,7 +248,6 @@ This package contains 32bit support for the GNU Compiler Collection.
 
 %package -n gcc@base_ver@-64bit
 Summary:      The GNU C Compiler 64bit support
-Group:        Development/Languages/C and C++
 Requires: gcc@base_ver@ = %{version}-%{release}
 Requires: libgcc_s%{libgcc_s}-64bit >= %{version}-%{release}
 Requires: libgomp%{libgomp_sover}-64bit >= %{version}-%{release}
@@ -270,7 +264,6 @@ This package contains 64bit support for the GNU Compiler Collection.
 %package locale
 Summary:      Locale Data for the GNU Compiler Collection
 License:        GPL-3.0+
-Group:        Development/Languages/C and C++
 Requires: gcc@base_ver@ = %{version}-%{release}
 
 %description locale
@@ -281,7 +274,6 @@ in the current locale.
 %package c++
 Summary:      The GNU C++ Compiler
 License:        GPL-3.0+
-Group:        Development/Languages/C and C++
 Requires: gcc@base_ver@ = %{version}-%{release}
 Requires: libstdc++@base_ver@-devel = %{version}-%{release}
 
@@ -292,7 +284,6 @@ This package contains the GNU compiler for C++.
 %package -n libstdc++@base_ver@-devel@variant@
 Summary:      Include Files and Libraries mandatory for Development
 License:        GPL-3.0-with-GCC-exception
-Group:        Development/Languages/C and C++
 Requires: libstdc++%{libstdcxx_sover}@variant@ >= %{version}-%{release}
 Requires: glibc-devel@variant@
 %ifarch ia64
@@ -307,7 +298,6 @@ library. It is needed for compiling C++ code.
 %package -n libstdc++@base_ver@-doc
 Summary:      Documentation for the GNU C++ standard library
 License:        GPL-3.0+
-Group:        Documentation/HTML
 BuildArch:    noarch
 
 %description -n libstdc++@base_ver@-doc
@@ -318,7 +308,7 @@ Extensive HTML documentation for the GNU C++ standard library.
 %package -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}@variant@
 Summary:      C compiler runtime library
 License:        GPL-3.0-with-GCC-exception
-Group:        System/Base
+Group:        System/Libraries
 Provides:      libgcc_s%{libgcc_s}@variant@ = %{version}-%{release}
 
 %description -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}@variant@
@@ -335,7 +325,7 @@ Libgcc is needed for dynamically linked C programs.
 %package -n libgomp%{libgomp_sover}%{libgomp_suffix}@variant@
 Summary:      The GNU compiler collection OpenMP runtime library
 License:        GPL-3.0-with-GCC-exception
-Group:        System/Base
+Group:        System/Libraries
 Provides:      libgomp%{libgomp_sover}@variant@ = %{version}-%{release}
 
 %description -n libgomp%{libgomp_sover}%{libgomp_suffix}@variant@
@@ -384,7 +374,6 @@ The standard C++ library locale data.
 %package info
 Summary:      Documentation for the GNU compiler collection
 License:      GFDL-1.2
-Group:        Documentation/Other
 BuildArch:    noarch
 
 %description info
@@ -396,7 +385,6 @@ and internals documentation.
 %package objc@variant@
 Summary:      GNU Objective C Compiler
 License:        GPL-3.0+
-Group:        Development/Languages/Other
 Requires: gcc@base_ver@ = %{version}-%{release}
 Requires: libobjc%{libobjc_sover}@variant@ >= %{version}-%{release}
 
@@ -410,7 +398,6 @@ Nextstep OS. The source code is available in the gcc package.
 %package -n libobjc%{libobjc_sover}%{libobjc_suffix}@variant@
 Summary:      Library for the GNU Objective C Compiler
 License:        GPL-3.0-with-GCC-exception
-Group:        Development/Libraries/Other
 Provides:      libobjc%{libobjc_sover}@variant@ = %{version}-%{release}
 
 %description -n libobjc%{libobjc_sover}%{libobjc_suffix}@variant@
@@ -426,7 +413,6 @@ The library for the GNU Objective C compiler.
 %package obj-c++
 Summary:      GNU Objective C++ Compiler
 License:        GPL-3.0+
-Group:        Development/Languages/Other
 Requires: gcc@base_ver@-objc = %{version}-%{release}
 Requires: gcc@base_ver@-c++ = %{version}-%{release}
 
@@ -439,7 +425,6 @@ Nextstep OS. The source code is available in the gcc package.
 %package -n cpp@base_ver@
 Summary:      The GCC Preprocessor
 License:        GPL-3.0+
-Group:        Development/Languages/C and C++
 
 %description -n cpp@base_ver@
 This Package contains just the preprocessor that is used by the X11
@@ -450,7 +435,6 @@ packages.
 %package ada@variant@
 Summary:      GNU Ada95 Compiler Based on GCC (GNAT)
 License:        GPL-3.0+
-Group:        Development/Languages/Other
 Requires: gcc@base_ver@@variant@ = %{version}-%{release}
 Requires: libada@base_ver@@variant@ = %{version}-%{release}
 
@@ -465,7 +449,6 @@ must have installed a binary version to bootstrap the compiler.
 %package -n libada@base_ver@@variant@
 Summary:      GNU Ada Runtime Libraries
 License:      GPL-3.0-with-GCC-exception
-Group:        System/Libraries
 %description -n libada@base_ver@@variant@
 This package contains the shared libraries required to run programs
 compiled with the GNU Ada compiler (GNAT) if they are compiled to use
@@ -485,7 +468,6 @@ implementation of Distributed Systems Programming (GLADE) and the Posix
 %package fortran@variant@
 Summary:      The GNU Fortran Compiler and Support Files
 License:        GPL-3.0+
-Group:        Development/Languages/Fortran
 Requires: gcc@base_ver@ = %{version}-%{release}
 Requires: libgfortran%{libgfortran_sover}@variant@ >= %{version}-%{release}
 %ifarch %quadmath_arch
@@ -500,7 +482,6 @@ This is the Fortran compiler of the GNU Compiler Collection (GCC).
 %package -n libgfortran%{libgfortran_sover}%{libgfortran_suffix}@variant@
 Summary:      The GNU Fortran Compiler Runtime Library
 License:        GPL-3.0-with-GCC-exception
-Group:        Development/Languages/Fortran
 %ifarch %quadmath_arch
 Requires: libquadmath%{libquadmath_sover}@variant@ >= %{version}-%{release}
 %endif
@@ -521,7 +502,6 @@ of the GNU Compiler Collection (GCC).
 %package -n libquadmath%{libquadmath_sover}%{libquadmath_suffix}@variant@
 Summary:      The GNU Fortran Compiler Quadmath Runtime Library
 License:        LGPL-2.1
-Group:        Development/Languages/Fortran
 Provides:      libquadmath%{libquadmath_sover}@variant@ = %{version}-%{release}
 
 %description -n libquadmath%{libquadmath_sover}%{libquadmath_suffix}@variant@
@@ -540,7 +520,6 @@ operations.
 %package -n libmudflap@base_ver@@variant@
 Summary:      The Mudflap Extension Runtime Library
 License:        GPL-3.0-with-GCC-exception
-Group:        Development/Languages/C and C++
 
 %description -n libmudflap@base_ver@@variant@
 This is the Mudflap Extension Runtime Library.
@@ -556,7 +535,6 @@ This is the Mudflap Extension Runtime Library.
 %package -n libitm%{libitm_sover}%{libitm_suffix}@variant@
 Summary:      The GNU Compiler Transactional Memory Runtime Library
 License:        MIT
-Group:        Development/Languages/C and C++
 
 %description -n libitm%{libitm_sover}%{libitm_suffix}@variant@
 The runtime library needed to run programs compiled with the
@@ -573,7 +551,6 @@ The runtime library needed to run programs compiled with the
 %package -n libasan%{libasan_sover}%{libasan_suffix}@variant@
 Summary:      The GNU Compiler Address Sanitizer Runtime Library
 License:        MIT
-Group:        Development/Languages/C and C++
 
 %description -n libasan%{libasan_sover}%{libasan_suffix}@variant@
 The runtime library needed to run programs compiled with the
@@ -590,7 +567,6 @@ The runtime library needed to run programs compiled with the
 %package -n libtsan%{libtsan_sover}%{libtsan_suffix}@variant@
 Summary:      The GNU Compiler Thread Sanitizer Runtime Library
 License:        MIT
-Group:        Development/Languages/C and C++
 
 %description -n libtsan%{libtsan_sover}%{libtsan_suffix}@variant@
 The runtime library needed to run programs compiled with the
@@ -607,7 +583,6 @@ The runtime library needed to run programs compiled with the
 %package -n libatomic%{libatomic_sover}%{libatomic_suffix}@variant@
 Summary:      The GNU Compiler Atomic Operations Runtime Library
 License:      GPL-3.0-with-GCC-exception
-Group:        Development/Languages/C and C++
 
 %description -n libatomic%{libatomic_sover}%{libatomic_suffix}@variant@
 The runtime library for atomic operations of the GNU Compiler Collection (GCC).
@@ -640,7 +615,6 @@ Source code for this package is in gcc.
 %package -n gcc@base_ver@-java
 Summary:      The GNU Java Compiler
 License:        GPL-3.0+
-Group:        Development/Languages/Java
 Requires: gcc@base_ver@ = %{version}
 Requires: libgcj@base_ver@-devel = %{version}-%{release}
 
@@ -651,7 +625,6 @@ The Java compiler from the GCC-tools-suite.
 %package -n libgcj_bc%{libgcj_bc_sover}%{libgcj_bc_suffix}
 Summary:      Fake library for BC-ABI compatibility.
 License:        GPL-2.0-with-classpath-exception
-Group:        Development/Libraries/Java
 # libgcj_bc is special in that it just contains a symlink to
 # a proper libgcj version.  So require that library and add
 # provides for the shlib version as created at link time
@@ -672,7 +645,6 @@ libgcj.so changes.
 %package -n libgcj@base_ver@-jar
 Summary:      Java runtime library (jar files).
 License:        GPL-2.0-with-classpath-exception
-Group:        Development/Libraries/Java
 
 %description -n libgcj@base_ver@-jar
 These are the jar files that go along with the gcj front end to gcc.
@@ -681,7 +653,6 @@ These are the jar files that go along with the gcj front end to gcc.
 %package -n libgcj@base_ver@-devel
 Summary:      Include Files and Libraries mandatory for Development.
 License:        GPL-2.0-with-classpath-exception
-Group:        Development/Libraries/Java
 Requires: libstdc++@base_ver@-devel = %{version}
 Requires: libgcj%{libgcj_sover} >= %{version}-%{release}
 Requires: libgcj_bc%{libgcj_bc_sover} >= %{version}-%{release}
@@ -702,7 +673,6 @@ to develop applications that require these.
 %package -n gcc@base_ver@-gij
 Summary:      Java Bytecode Interpreter for gcc
 License:      GPL-2.0-with-classpath-exception
-Group:        Development/Libraries/Java
 Requires: libgcj%{libgcj_sover} >= %{version}-%{release}
 
 %description -n gcc@base_ver@-gij
@@ -713,7 +683,6 @@ This package contains the java bytecode interpreter gij and related tools.
 %package -n libffi%{libffi_sover}%{libffi_suffix}@variant@
 Summary:      Foreign Function Interface library
 License:        BSD-3-Clause
-Group:        Development/Languages/C and C++
 
 %description -n libffi%{libffi_sover}%{libffi_suffix}@variant@
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
@@ -729,7 +698,6 @@ A foreign function interface is the popular name for the interface that allows c
 %package -n libffi@base_ver@-devel@variant@
 Summary:      Foreign Function Interface library development files
 License:        BSD 3-Clause
-Group:        Development/Languages/C and C++
 Requires: libffi%{libffi_sover}@variant@ >= %{version}-%{release}
 
 %description -n libffi@base_ver@-devel@variant@
@@ -740,7 +708,6 @@ A foreign function interface is the popular name for the interface that allows c
 # GCC-TESTSUITE-DELETE-END
 Summary:      Testsuite results
 License:       SUSE-Public-Domain
-Group:        Development/Languages/C and C++
 
 %description -n gcc@base_ver@-testresults
 Results from running the gcc and target library testsuites.
@@ -860,7 +827,7 @@ Results from running the gcc and target library testsuites.
 # COMMON-BEGIN
 
 %prep
-%setup -q -n gcc-%{gcc_version}%{snapshot_date}
+%setup -q -n gcc-%{version}
 
 
 # We are configuring ppc as ppc64 but with switched multilibs.  Adjust
@@ -1072,10 +1039,9 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS $GCJ_EXTRA_FLAGS" \
 %endif
 %if "%{TARGET_ARCH}" == "armv7l" 
        --with-arch=armv7-a \
-       --with-tune=cortex-a9 \
-       --with-float=hard \
-       --with-abi=aapcs-linux \
-       --with-fpu=vfpv3-d16 \
+       --with-tune=cortex-a8 \
+       --with-float=softfp \
+       --with-fpu=vfpv3 \
        --disable-sjlj-exceptions \
 %endif
 %if  "%{TARGET_ARCH}" == "armv7hl"