From 0f6dbe06a601f65ed0975fcb5e14dc83fa4ef025 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sat, 15 Nov 2014 21:28:12 +0100 Subject: [PATCH] - drop sparc64-ada patch - was breaking x86_64 multilib ada build; turn off gcc_libffi - follow upstream and for system there is libffi.spec (with newer version); updated branch diff; rel 1 --- gcc-sparc64-ada_fix.patch | 188 -------------------------------------- gcc.spec | 10 +- libffi.pc.in | 2 +- 3 files changed, 6 insertions(+), 194 deletions(-) delete mode 100644 gcc-sparc64-ada_fix.patch diff --git a/gcc-sparc64-ada_fix.patch b/gcc-sparc64-ada_fix.patch deleted file mode 100644 index dd2d33e..0000000 --- a/gcc-sparc64-ada_fix.patch +++ /dev/null @@ -1,188 +0,0 @@ ---- a/gcc/ada/gcc-interface/Makefile.in 2005-05-26 10:48:40.000000000 +0000 -+++ b/gcc/ada/gcc-interface/Makefile.in 2005-05-26 10:59:25.000000000 +0000 -@@ -1180,6 +1180,31 @@ - LIBRARY_VERSION := $(LIB_VERSION) - endif - -+ifeq ($(strip $(filter-out sparc64% linux%,$(arch) $(osys))),) -+ LIBGNAT_TARGET_PAIRS = \ -+ a-intnam.ads" (Left, Right : Address) return Boolean; -+ function ">=" (Left, Right : Address) return Boolean; -+ function "=" (Left, Right : Address) return Boolean; -+ -+ pragma Import (Intrinsic, "<"); -+ pragma Import (Intrinsic, "<="); -+ pragma Import (Intrinsic, ">"); -+ pragma Import (Intrinsic, ">="); -+ pragma Import (Intrinsic, "="); -+ -+ -- Other System-Dependent Declarations -+ -+ type Bit_Order is (High_Order_First, Low_Order_First); -+ Default_Bit_Order : constant Bit_Order := High_Order_First; -+ -+ -- Priority-related Declarations (RM D.1) -+ -+ Max_Priority : constant Positive := 30; -+ Max_Interrupt_Priority : constant Positive := 31; -+ -+ subtype Any_Priority is Integer range 0 .. 31; -+ subtype Priority is Any_Priority range 0 .. 30; -+ subtype Interrupt_Priority is Any_Priority range 31 .. 31; -+ -+ Default_Priority : constant Priority := 15; -+ -+private -+ -+ type Address is mod Memory_Size; -+ Null_Address : constant Address := 0; -+ -+ -------------------------------------- -+ -- System Implementation Parameters -- -+ -------------------------------------- -+ -+ -- These parameters provide information about the target that is used -+ -- by the compiler. They are in the private part of System, where they -+ -- can be accessed using the special circuitry in the Targparm unit -+ -- whose source should be consulted for more detailed descriptions -+ -- of the individual switch values. -+ -+ AAMP : constant Boolean := False; -+ Backend_Divide_Checks : constant Boolean := False; -+ Backend_Overflow_Checks : constant Boolean := False; -+ Command_Line_Args : constant Boolean := True; -+ Configurable_Run_Time : constant Boolean := False; -+ Denorm : constant Boolean := True; -+ Duration_32_Bits : constant Boolean := False; -+ Exit_Status_Supported : constant Boolean := True; -+ Fractional_Fixed_Ops : constant Boolean := False; -+ Frontend_Layout : constant Boolean := False; -+ Functions_Return_By_DSP : constant Boolean := False; -+ Machine_Overflows : constant Boolean := False; -+ Machine_Rounds : constant Boolean := True; -+ OpenVMS : constant Boolean := False; -+ Preallocated_Stacks : constant Boolean := False; -+ Signed_Zeros : constant Boolean := True; -+ Stack_Check_Default : constant Boolean := False; -+ Stack_Check_Probes : constant Boolean := False; -+ Support_64_Bit_Divides : constant Boolean := True; -+ Support_Aggregates : constant Boolean := True; -+ Support_Composite_Assign : constant Boolean := True; -+ Support_Composite_Compare : constant Boolean := True; -+ Support_Long_Shifts : constant Boolean := True; -+ Suppress_Standard_Library : constant Boolean := False; -+ Use_Ada_Main_Program_Name : constant Boolean := False; -+ ZCX_By_Default : constant Boolean := True; -+ GCC_ZCX_Support : constant Boolean := True; -+ Front_End_ZCX_Support : constant Boolean := False; -+ -+ -- Obsolete entries, to be removed eventually (bootstrap issues!) -+ -+ High_Integrity_Mode : constant Boolean := False; -+ Long_Shifts_Inlined : constant Boolean := True; -+ -+end System; diff --git a/gcc.spec b/gcc.spec index bb33f7f..29dfb73 100644 --- a/gcc.spec +++ b/gcc.spec @@ -23,7 +23,7 @@ %bcond_without asan # build without Address Sanitizer library %bcond_without tsan # build without Thread Sanitizer library %bcond_without atomic # build without library for atomic operations not supported by hardware -%bcond_without gcc_libffi # packaging gcc libffi for system usage +%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 @@ -97,7 +97,7 @@ Summary(pl.UTF-8): Kolekcja kompilatorów GNU: kompilator C i pliki współdziel Summary(pt_BR.UTF-8): Coleção dos compiladores GNU: o compilador C e arquivos compartilhados Name: gcc Version: %{major_ver}.%{minor_ver} -Release: 0.1 +Release: 1 Epoch: 6 License: GPL v3+ Group: Development/Languages @@ -110,12 +110,12 @@ Source2: ftp://sourceware.org/pub/java/ecj-%{major_ecj_ver}.jar Source3: libffi.pc.in # svn diff -x --ignore-eol-style --force svn://gcc.gnu.org/svn/gcc/tags/gcc_4_9_2_release svn://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch > gcc-branch.diff Patch100: %{name}-branch.diff -# Patch100-md5: 372b68ca84755a8182cf2aac6f93de13 +# Patch100-md5: 66e843617ce0bfe9764059752a9706d6 Patch0: %{name}-info.patch Patch1: %{name}-cloog.patch Patch2: %{name}-nodebug.patch Patch3: %{name}-ada-link.patch -Patch4: %{name}-sparc64-ada_fix.patch + Patch5: %{name}-4.9-isl-0.13-hack.patch Patch6: %{name}-pr61164.patch Patch7: %{name}-libjava-multilib.patch @@ -1775,7 +1775,7 @@ Ten pakiet zawiera 32-bitową wersję statycznej biblioteki GNU Atomic. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 + %patch5 -p1 %patch6 -p1 %patch7 -p0 diff --git a/libffi.pc.in b/libffi.pc.in index fd3902c..6456752 100644 --- a/libffi.pc.in +++ b/libffi.pc.in @@ -5,6 +5,6 @@ includedir=@gcclibdir@/include Name: libffi Description: Library supporting Foreign Function Interfaces -Version: 4.0.1 +Version: 3.0.11 Libs: -L${libdir} -lffi Cflags: -I${includedir} -- 2.43.0