OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Matthias Kurz Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 26-Sep-2005 21:56:24 Branch: HEAD Handle: 2005092620562400 Modified files: openpkg-src/gcc gcc.patch gcc.spec Log: workaround for gcc-4.0.1/binutils problems under Solaris-x86 Summary: Revision Changes Path 1.26 +12 -8 openpkg-src/gcc/gcc.patch 1.120 +5 -1 openpkg-src/gcc/gcc.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/gcc/gcc.patch ============================================================================ $ cvs diff -u -r1.25 -r1.26 gcc.patch --- openpkg-src/gcc/gcc.patch 22 Sep 2005 13:36:48 -0000 1.25 +++ openpkg-src/gcc/gcc.patch 26 Sep 2005 19:56:24 -0000 1.26 @@ -49,6 +49,18 @@ %(link_arch) \ %{Qy:} %{!Qn:-Qy}" +Index: sol2-10.h +--- gcc/config/i386/sol2-10.h.orig 2004-11-24 15:43:26.000000000 +0100 ++++ gcc/config/i386/sol2-10.h 2005-09-26 20:26:59.419760000 +0200 +@@ -80,7 +80,7 @@ + #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE + + #ifdef TARGET_GNU_LD +-#define TARGET_LD_EMULATION "%{m64:-m elf_x86_64}%{!m64:-m elf_i386} " ++#define TARGET_LD_EMULATION "%{m64:-m elf_x86_64}%{!m64:} " + #else + #define TARGET_LD_EMULATION "" + #endif Index: gcc/system.h --- gcc/system.h.orig 2003-08-23 20:03:05.000000000 +0200 +++ gcc/system.h 2003-09-03 20:02:11.000000000 +0200 @@ -86,14 +98,6 @@ *) echo 'Please update *-*-freebsd* in gcc/config.gcc' exit 1 -@@ -1092,7 +1094,6 @@ - *-*-solaris2.1[0-9]*) - tm_file="${tm_file} i386/x86-64.h i386/sol2-10.h" - tm_defines="${tm_defines} TARGET_BI_ARCH=1" -- tmake_file="$tmake_file i386/t-sol2-10" - need_64bit_hwint=yes - # Solaris 2.10 provides crt1.o, crti.o, crtn.o, and gcrt1.o as - # part of the base system. Index: gcc/config/freebsd-spec.h --- gcc/config/freebsd-spec.h.orig 2005-05-01 20:59:27 +0200 +++ gcc/config/freebsd-spec.h 2005-09-21 11:56:50 +0200 @@ . patch -p0 <<'@@ .' Index: openpkg-src/gcc/gcc.spec ============================================================================ $ cvs diff -u -r1.119 -r1.120 gcc.spec --- openpkg-src/gcc/gcc.spec 22 Sep 2005 13:36:48 -0000 1.119 +++ openpkg-src/gcc/gcc.spec 26 Sep 2005 19:56:24 -0000 1.120 @@ -37,7 +37,7 @@ Group: Compiler License: GPL Version: %{V_full} -Release: 20050922 +Release: 20050926 # package options %option with_cxx yes @@ -129,6 +129,10 @@ ;; esac %endif + case "%{l_platform -t}" in + ix86*-sunos* ) + l_with_gnu_ld_as="${l_with_gnu_ld_as} --disable-multilib" ;; + esac # determine threads usage %if "%{with_threads}" == "yes" @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org