diff --git a/2.19.diff b/2.19.diff deleted file mode 100644 index 90f645b..0000000 --- a/2.19.diff +++ /dev/null @@ -1,204 +0,0 @@ -2008-11-20 Alan Modra - - * elf32-ppc.c (allocate_dynrelocs): Always use tlsld_got for - TLS_LD even when symbol is used with other TLS reloc types. - (ppc_elf_relocate_section): Bypass symbol checks when using tlsld_got. - Leave addend zero on LD DTPMOD dynamic reloc. - -2008-11-17 Eric B. Weddington - - PR 7022 - * elf32-avr.c (bfd_elf_avr_final_write_processing): - Add missing break statements. - -ld/: -2008-11-14 Alan Modra - - * Makefile.am (spu_ovl.o_c): Add missing line continuations. - * Makefile.in: Regenerate. - ---- bfd/elf32-avr.c -+++ bfd/elf32-avr.c -@@ -1298,6 +1298,7 @@ bfd_elf_avr_final_write_processing (bfd *abfd, - - case bfd_mach_avr25: - val = E_AVR_MACH_AVR25; -+ break; - - case bfd_mach_avr3: - val = E_AVR_MACH_AVR3; -@@ -1305,9 +1306,11 @@ bfd_elf_avr_final_write_processing (bfd *abfd, - - case bfd_mach_avr31: - val = E_AVR_MACH_AVR31; -+ break; - - case bfd_mach_avr35: - val = E_AVR_MACH_AVR35; -+ break; - - case bfd_mach_avr4: - val = E_AVR_MACH_AVR4; ---- bfd/elf32-ppc.c -+++ bfd/elf32-ppc.c -@@ -4997,6 +4997,9 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) - eh = (struct ppc_elf_link_hash_entry *) h; - if (eh->elf.got.refcount > 0) - { -+ bfd_boolean dyn; -+ unsigned int need; -+ - /* Make sure this symbol is output as a dynamic symbol. */ - if (eh->elf.dynindx == -1 - && !eh->elf.forced_local -@@ -5006,30 +5009,32 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) - return FALSE; - } - -- if (eh->tls_mask == (TLS_TLS | TLS_LD) -- && !eh->elf.def_dynamic) -- { -- /* If just an LD reloc, we'll just use htab->tlsld_got.offset. */ -- htab->tlsld_got.refcount += 1; -- eh->elf.got.offset = (bfd_vma) -1; -- } -- else -+ need = 0; -+ if ((eh->tls_mask & TLS_TLS) != 0) - { -- bfd_boolean dyn; -- unsigned int need = 0; -- if ((eh->tls_mask & TLS_TLS) != 0) -+ if ((eh->tls_mask & TLS_LD) != 0) - { -- if ((eh->tls_mask & TLS_LD) != 0) -- need += 8; -- if ((eh->tls_mask & TLS_GD) != 0) -+ if (!eh->elf.def_dynamic) -+ /* We'll just use htab->tlsld_got.offset. This should -+ always be the case. It's a little odd if we have -+ a local dynamic reloc against a non-local symbol. */ -+ htab->tlsld_got.refcount += 1; -+ else - need += 8; -- if ((eh->tls_mask & (TLS_TPREL | TLS_TPRELGD)) != 0) -- need += 4; -- if ((eh->tls_mask & TLS_DTPREL) != 0) -- need += 4; - } -- else -+ if ((eh->tls_mask & TLS_GD) != 0) -+ need += 8; -+ if ((eh->tls_mask & (TLS_TPREL | TLS_TPRELGD)) != 0) -+ need += 4; -+ if ((eh->tls_mask & TLS_DTPREL) != 0) - need += 4; -+ } -+ else -+ need += 4; -+ if (need == 0) -+ eh->elf.got.offset = (bfd_vma) -1; -+ else -+ { - eh->elf.got.offset = allocate_got (htab, need); - dyn = htab->elf.dynamic_sections_created; - if ((info->shared -@@ -5039,7 +5044,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) - { - /* All the entries we allocated need relocs. - Except LD only needs one. */ -- if ((eh->tls_mask & TLS_LD) != 0) -+ if ((eh->tls_mask & TLS_LD) != 0 -+ && eh->elf.def_dynamic) - need -= 4; - htab->relgot->size += need * (sizeof (Elf32_External_Rela) / 4); - } -@@ -5275,27 +5281,24 @@ ppc_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, - for (; local_got < end_local_got; ++local_got, ++lgot_masks) - if (*local_got > 0) - { -- if (*lgot_masks == (TLS_TLS | TLS_LD)) -+ unsigned int need = 0; -+ if ((*lgot_masks & TLS_TLS) != 0) - { -- /* If just an LD reloc, we'll just use -- htab->tlsld_got.offset. */ -- htab->tlsld_got.refcount += 1; -- *local_got = (bfd_vma) -1; -+ if ((*lgot_masks & TLS_GD) != 0) -+ need += 8; -+ if ((*lgot_masks & TLS_LD) != 0) -+ htab->tlsld_got.refcount += 1; -+ if ((*lgot_masks & (TLS_TPREL | TLS_TPRELGD)) != 0) -+ need += 4; -+ if ((*lgot_masks & TLS_DTPREL) != 0) -+ need += 4; - } - else -+ need += 4; -+ if (need == 0) -+ *local_got = (bfd_vma) -1; -+ else - { -- unsigned int need = 0; -- if ((*lgot_masks & TLS_TLS) != 0) -- { -- if ((*lgot_masks & TLS_GD) != 0) -- need += 8; -- if ((*lgot_masks & (TLS_TPREL | TLS_TPRELGD)) != 0) -- need += 4; -- if ((*lgot_masks & TLS_DTPREL) != 0) -- need += 4; -- } -- else -- need += 4; - *local_got = allocate_got (htab, need); - if (info->shared) - htab->relgot->size += (need -@@ -6560,7 +6563,8 @@ ppc_elf_relocate_section (bfd *output_bfd, - - /* Generate relocs for the dynamic linker. */ - if ((info->shared || indx != 0) -- && (h == NULL -+ && (offp == &htab->tlsld_got.offset -+ || h == NULL - || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT - || h->root.type != bfd_link_hash_undefweak)) - { -@@ -6591,7 +6595,7 @@ ppc_elf_relocate_section (bfd *output_bfd, - outrel.r_info = ELF32_R_INFO (indx, R_PPC_RELATIVE); - else - outrel.r_info = ELF32_R_INFO (indx, R_PPC_GLOB_DAT); -- if (indx == 0) -+ if (indx == 0 && tls_ty != (TLS_TLS | TLS_LD)) - { - outrel.r_addend += relocation; - if (tls_ty & (TLS_GD | TLS_DTPREL | TLS_TPREL)) ---- ld/Makefile.am -+++ ld/Makefile.am -@@ -758,9 +758,9 @@ eelf32_spu.c: $(srcdir)/emulparams/elf32_spu.sh $(srcdir)/emultempl/spuelf.em \ - $(srcdir)/emultempl/spu_ovl.o_c: @MAINT@ $(srcdir)/emultempl/spu_ovl.S - if ../gas/as-new --version \ - | grep 'target.*spu' >/dev/null 2>/dev/null; then \ -- cpp -DOVLY_IRQ_SAVE $(srcdir)/emultempl/spu_ovl.S spu_ovl.s -+ cpp -DOVLY_IRQ_SAVE $(srcdir)/emultempl/spu_ovl.S spu_ovl.s; \ - ../gas/as-new -o spu_ovl.o spu_ovl.s; \ -- ../binutils/bin2c $@ -+ ../binutils/bin2c $@; \ - fi - eelf32_i860.c: $(srcdir)/emulparams/elf32_i860.sh \ - $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ---- ld/Makefile.in -+++ ld/Makefile.in -@@ -1588,9 +1588,9 @@ eelf32_spu.c: $(srcdir)/emulparams/elf32_spu.sh $(srcdir)/emultempl/spuelf.em \ - $(srcdir)/emultempl/spu_ovl.o_c: @MAINT@ $(srcdir)/emultempl/spu_ovl.S - if ../gas/as-new --version \ - | grep 'target.*spu' >/dev/null 2>/dev/null; then \ -- cpp -DOVLY_IRQ_SAVE $(srcdir)/emultempl/spu_ovl.S spu_ovl.s -+ cpp -DOVLY_IRQ_SAVE $(srcdir)/emultempl/spu_ovl.S spu_ovl.s; \ - ../gas/as-new -o spu_ovl.o spu_ovl.s; \ -- ../binutils/bin2c $@ -+ ../binutils/bin2c $@; \ - fi - eelf32_i860.c: $(srcdir)/emulparams/elf32_i860.sh \ - $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} diff --git a/assign-file-positions.diff b/assign-file-positions.diff deleted file mode 100644 index 37fc011..0000000 --- a/assign-file-positions.diff +++ /dev/null @@ -1,181 +0,0 @@ -2008-11-11 Alan Modra - - * elf.c (assign_file_positions_for_non_load_sections): Consolidate - PT_GNU_RELRO handling. - -2008-11-07 Andreas Schwab - - PR 7011 - * elf.c (assign_file_positions_for_non_load_sections): Handle - PT_GNU_RELRO specially. - -Index: bfd/elf.c -=================================================================== -RCS file: /cvs/src/src/bfd/elf.c,v -retrieving revision 1.466 -retrieving revision 1.468 -diff -u -a -p -u -p -a -r1.466 -r1.468 ---- bfd/elf.c 8 Oct 2008 08:30:27 -0000 1.466 -+++ bfd/elf.c 11 Nov 2008 04:26:13 -0000 1.468 -@@ -4631,7 +4631,61 @@ assign_file_positions_for_non_load_secti - m != NULL; - m = m->next, p++) - { -- if (m->count != 0) -+ if (p->p_type == PT_GNU_RELRO) -+ { -+ const Elf_Internal_Phdr *lp; -+ -+ BFD_ASSERT (!m->includes_filehdr && !m->includes_phdrs); -+ -+ if (link_info != NULL) -+ { -+ /* During linking the range of the RELRO segment is passed -+ in link_info. */ -+ for (lp = phdrs; lp < phdrs + count; ++lp) -+ { -+ if (lp->p_type == PT_LOAD -+ && lp->p_vaddr >= link_info->relro_start -+ && lp->p_vaddr < link_info->relro_end -+ && lp->p_vaddr + lp->p_filesz >= link_info->relro_end) -+ break; -+ } -+ } -+ else -+ { -+ /* Otherwise we are copying an executable or shared -+ library, but we need to use the same linker logic. */ -+ for (lp = phdrs; lp < phdrs + count; ++lp) -+ { -+ if (lp->p_type == PT_LOAD -+ && lp->p_paddr == p->p_paddr) -+ break; -+ } -+ } -+ -+ if (lp < phdrs + count) -+ { -+ p->p_vaddr = lp->p_vaddr; -+ p->p_paddr = lp->p_paddr; -+ p->p_offset = lp->p_offset; -+ if (link_info != NULL) -+ p->p_filesz = link_info->relro_end - lp->p_vaddr; -+ else if (m->p_size_valid) -+ p->p_filesz = m->p_size; -+ else -+ abort (); -+ p->p_memsz = p->p_filesz; -+ p->p_align = 1; -+ p->p_flags = (lp->p_flags & ~PF_W); -+ } -+ else if (link_info != NULL) -+ { -+ memset (p, 0, sizeof *p); -+ p->p_type = PT_NULL; -+ } -+ else -+ abort (); -+ } -+ else if (m->count != 0) - { - if (p->p_type != PT_LOAD - && (p->p_type != PT_NOTE -@@ -4647,87 +4701,20 @@ assign_file_positions_for_non_load_secti - p->p_filesz = sect->filepos - m->sections[0]->filepos; - if (hdr->sh_type != SHT_NOBITS) - p->p_filesz += hdr->sh_size; -- -- if (p->p_type == PT_GNU_RELRO) -- { -- /* When we get here, we are copying executable -- or shared library. But we need to use the same -- linker logic. */ -- Elf_Internal_Phdr *lp; -- -- for (lp = phdrs; lp < phdrs + count; ++lp) -- { -- if (lp->p_type == PT_LOAD -- && lp->p_paddr == p->p_paddr) -- break; -- } -- -- if (lp < phdrs + count) -- { -- /* We should use p_size if it is valid since it -- may contain the first few bytes of the next -- SEC_ALLOC section. */ -- if (m->p_size_valid) -- p->p_filesz = m->p_size; -- else -- abort (); -- p->p_vaddr = lp->p_vaddr; -- p->p_offset = lp->p_offset; -- p->p_memsz = p->p_filesz; -- p->p_align = 1; -- } -- else -- abort (); -- } -- else -- p->p_offset = m->sections[0]->filepos; -+ p->p_offset = m->sections[0]->filepos; - } - } -- else -+ else if (m->includes_filehdr) - { -- if (m->includes_filehdr) -- { -- p->p_vaddr = filehdr_vaddr; -- if (! m->p_paddr_valid) -- p->p_paddr = filehdr_paddr; -- } -- else if (m->includes_phdrs) -- { -- p->p_vaddr = phdrs_vaddr; -- if (! m->p_paddr_valid) -- p->p_paddr = phdrs_paddr; -- } -- else if (p->p_type == PT_GNU_RELRO) -- { -- Elf_Internal_Phdr *lp; -- -- for (lp = phdrs; lp < phdrs + count; ++lp) -- { -- if (lp->p_type == PT_LOAD -- && lp->p_vaddr <= link_info->relro_end -- && lp->p_vaddr >= link_info->relro_start -- && (lp->p_vaddr + lp->p_filesz -- >= link_info->relro_end)) -- break; -- } -- -- if (lp < phdrs + count -- && link_info->relro_end > lp->p_vaddr) -- { -- p->p_vaddr = lp->p_vaddr; -- p->p_paddr = lp->p_paddr; -- p->p_offset = lp->p_offset; -- p->p_filesz = link_info->relro_end - lp->p_vaddr; -- p->p_memsz = p->p_filesz; -- p->p_align = 1; -- p->p_flags = (lp->p_flags & ~PF_W); -- } -- else -- { -- memset (p, 0, sizeof *p); -- p->p_type = PT_NULL; -- } -- } -+ p->p_vaddr = filehdr_vaddr; -+ if (! m->p_paddr_valid) -+ p->p_paddr = filehdr_paddr; -+ } -+ else if (m->includes_phdrs) -+ { -+ p->p_vaddr = phdrs_vaddr; -+ if (! m->p_paddr_valid) -+ p->p_paddr = phdrs_paddr; - } - } - diff --git a/baselibs.conf b/baselibs.conf index fccf4b9..93ea20c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,2 @@ binutils-devel + requires -binutils- diff --git a/binutils-2.19.51.tar.bz2 b/binutils-2.19.51.tar.bz2 new file mode 100644 index 0000000..2136a0e --- /dev/null +++ b/binutils-2.19.51.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f226dabfc2f1790ce53c4ab1444f9dc23309052d3a42d8cbf34715ebc8072c3b +size 15624445 diff --git a/binutils-2.19.tar.bz2 b/binutils-2.19.tar.bz2 deleted file mode 100644 index 567be68..0000000 --- a/binutils-2.19.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd2ea10ffc2bf62a917b05f4fbe3d02212589c2bc177fa0c51a9c874d3da528a -size 16219400 diff --git a/binutils.changes b/binutils.changes index a325d59..3239774 100644 --- a/binutils.changes +++ b/binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/binutils.spec b/binutils.spec index d838988..5f9ee1d 100644 --- a/binutils.spec +++ b/binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package binutils (Version 2.19) +# spec file for package binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU Binutils Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -155,8 +151,48 @@ Authors: Torbjorn Granlund Ulf Carlsson +%package gold +License: GPL v3 or later +Summary: The gold linker +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +gold is an ELF linker. It is intended to have complete support for ELF +and to run as fast as possible on modern systems. For normal use it is +a drop-in replacement for the older GNU linker. + +The existing GNU linker manual is intended to be accurate + documentation for features which gold supports. gold supports + most of the features of the GNU linker for ELF targets. Notable + omissions--features of the GNU linker not currently supported in + gold--are: * MEMORY regions in linker scripts + +* MRI compatible linker scripts + +* linker map files (-M, -Map) + +* cross-reference reports (--cref) + +* linker garbage collection (--gc-sections) + +* position independent executables (-pie) + +* various other minor options + + + +Authors: +-------- + Ian Lance Taylor + Cary Coutant + Craig Silverstein + Andrew Chatham + %package devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later; GPL v3 or later; LGPL v2.1 or later Summary: GNU binutils (BFD development files) AutoReqProv: on Requires: binutils = %{version}-%{release}, zlib-devel @@ -236,7 +272,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -250,11 +285,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -263,12 +295,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -300,9 +327,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -313,14 +338,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -328,6 +360,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -394,9 +430,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -409,20 +453,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -469,12 +513,22 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %files devel %defattr(-,root,root) @@ -482,6 +536,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*.*a %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/common-sysroot-binutils.diff b/common-sysroot-binutils.diff deleted file mode 100644 index fd29a12..0000000 --- a/common-sysroot-binutils.diff +++ /dev/null @@ -1,16 +0,0 @@ - -ChangeLog: - - * configure.tgt [spu-*-elf*]: Set NATIVE_LIB_DIRS to '/lib'. - ---- ld/configure.tgt.orig 2008-11-05 18:44:25.000000000 +0100 -+++ ld/configure.tgt 2008-11-05 18:45:01.000000000 +0100 -@@ -676,7 +676,7 @@ sparc*-*-solaris2*) - - spu-*-elf*) - # This allows to build a pair of PPU/SPU toolchains with common sysroot. -- NATIVE_LIB_DIRS='/usr/spu/lib' -+ NATIVE_LIB_DIRS='/lib' - ;; - - i[03-9x]86-*-cygwin*) diff --git a/cross-alpha-binutils.changes b/cross-alpha-binutils.changes index a325d59..3239774 100644 --- a/cross-alpha-binutils.changes +++ b/cross-alpha-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-alpha-binutils.spec b/cross-alpha-binutils.spec index 3cd1c0a..fd66fc2 100644 --- a/cross-alpha-binutils.spec +++ b/cross-alpha-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-alpha-binutils (Version 2.19) +# spec file for package cross-alpha-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-alpha-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to ALPHA Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +Summary: GNU binutils for Cross-Development to ALPHA Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to ALPHA +targets. This can be handy even if you are running on an ALPHA +development platform, because it decouples the host tools from your +embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes index a325d59..3239774 100644 --- a/cross-arm-binutils.changes +++ b/cross-arm-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec index a135567..24f9f16 100644 --- a/cross-arm-binutils.spec +++ b/cross-arm-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-arm-binutils (Version 2.19) +# spec file for package cross-arm-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-arm-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to ARM Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +Summary: GNU binutils for Cross-Development to ARM Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to ARM +targets. This can be handy even if you are running on an ARM +development platform, because it decouples the host tools from your +embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes index a325d59..3239774 100644 --- a/cross-avr-binutils.changes +++ b/cross-avr-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec index c9f4a57..330a251 100644 --- a/cross-avr-binutils.spec +++ b/cross-avr-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-avr-binutils (Version 2.19) +# spec file for package cross-avr-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-avr-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU Binutils for Cross-Development to AVR Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later +Summary: GNU Binutils for Cross-Development to AVR Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to AVR +targets. This can be handy even if you are running on an AVR +development platform, because it decouples the host tools from your +embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes index a325d59..3239774 100644 --- a/cross-hppa-binutils.changes +++ b/cross-hppa-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec index 6c068e0..0d77cdd 100644 --- a/cross-hppa-binutils.spec +++ b/cross-hppa-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-hppa-binutils (Version 2.19) +# spec file for package cross-hppa-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-hppa-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to HPPA Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +Summary: GNU binutils for Cross-Development to HPPA Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to HPPA +targets. This can be handy even if you are running on an HPPA +development platform, because it decouples the host tools from your +embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes index a325d59..3239774 100644 --- a/cross-hppa64-binutils.changes +++ b/cross-hppa64-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec index 95cd5aa..3589323 100644 --- a/cross-hppa64-binutils.spec +++ b/cross-hppa64-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-hppa64-binutils (Version 2.19) +# spec file for package cross-hppa64-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-hppa64-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to HPPA64 Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +Summary: GNU binutils for Cross-Development to HPPA64 Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to HPPA64 +targets. This can be handy even if you are running on an HPPA +development platform, because it decouples the host tools from your +embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes index a325d59..3239774 100644 --- a/cross-i386-binutils.changes +++ b/cross-i386-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec index b7950d7..81ac5ee 100644 --- a/cross-i386-binutils.spec +++ b/cross-i386-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-i386-binutils (Version 2.19) +# spec file for package cross-i386-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-i386-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to X86 Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +Summary: GNU binutils for Cross-Development to X86 Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to X86 +targets. This can be handy even if you are running on an X86 +development platform, because it decouples the host tools from your +embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes index a325d59..3239774 100644 --- a/cross-ia64-binutils.changes +++ b/cross-ia64-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec index 34b8101..6b94442 100644 --- a/cross-ia64-binutils.spec +++ b/cross-ia64-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-ia64-binutils (Version 2.19) +# spec file for package cross-ia64-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-ia64-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to IA64 Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +Summary: GNU binutils for Cross-Development to IA64 Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to IA64 +targets. This can be handy even if you are running on an IA64 +development platform, because it decouples the host tools from your +embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes index a325d59..3239774 100644 --- a/cross-mips-binutils.changes +++ b/cross-mips-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec index 23489e8..b331c92 100644 --- a/cross-mips-binutils.spec +++ b/cross-mips-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-mips-binutils (Version 2.19) +# spec file for package cross-mips-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-mips-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to MIPS Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +Summary: GNU binutils for Cross-Development to MIPS Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to MIPS +targets. This can be handy even if you are running on a MIPS +development platform, because it decouples the host tools from your +embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes index a325d59..3239774 100644 --- a/cross-ppc-binutils.changes +++ b/cross-ppc-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec index ae3e463..f5c3f57 100644 --- a/cross-ppc-binutils.spec +++ b/cross-ppc-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-ppc-binutils (Version 2.19) +# spec file for package cross-ppc-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-ppc-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to PowerPC Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +Summary: GNU binutils for Cross-Development to PowerPC Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to +PowerPC targets. This can be handy even if you are running on a PowerPC +development platform, because it decouples the host tools from your +embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes index a325d59..3239774 100644 --- a/cross-ppc64-binutils.changes +++ b/cross-ppc64-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec index 8852bb7..5d6bb90 100644 --- a/cross-ppc64-binutils.spec +++ b/cross-ppc64-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-ppc64-binutils (Version 2.19) +# spec file for package cross-ppc64-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-ppc64-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for cross-development to PowerPC 64bit processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ your embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later +Summary: GNU binutils for cross-development to PowerPC 64bit processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SuSE binutils package in that it is designed to +cross-compile from whatever platform SuSE Linux is running on to +PowerPC64 targets. This can be handy even if you are running on a +PowerPC64 development platform, as it decouples the host tools from +your embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes index a325d59..3239774 100644 --- a/cross-s390-binutils.changes +++ b/cross-s390-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec index 4927f8a..04d3640 100644 --- a/cross-s390-binutils.spec +++ b/cross-s390-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-s390-binutils (Version 2.19) +# spec file for package cross-s390-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-s390-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to S/390 Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +Summary: GNU binutils for Cross-Development to S/390 Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to S/390 +targets. This can be handy even if you are running on an S/390 +development platform, because it decouples the host tools from your +embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes index a325d59..3239774 100644 --- a/cross-s390x-binutils.changes +++ b/cross-s390x-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec index 4a76578..02e05fc 100644 --- a/cross-s390x-binutils.spec +++ b/cross-s390x-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-s390x-binutils (Version 2.19) +# spec file for package cross-s390x-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-s390x-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to 64-Bit S/390 Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ your embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +Summary: GNU binutils for Cross-Development to 64-Bit S/390 Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to 64-bit +S/390 targets. This can be handy even if you are running on a 64-bit +S/390 development platform, because it decouples the host tools from +your embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-sh4-binutils.changes b/cross-sh4-binutils.changes index a325d59..3239774 100644 --- a/cross-sh4-binutils.changes +++ b/cross-sh4-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-sh4-binutils.spec b/cross-sh4-binutils.spec index 860a505..617d245 100644 --- a/cross-sh4-binutils.spec +++ b/cross-sh4-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-sh4-binutils (Version 2.19) +# spec file for package cross-sh4-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-sh4-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to SH4 Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -102,6 +98,82 @@ platform, because it decouples the host tools from your embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later +Summary: GNU binutils for Cross-Development to SH4 Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to SH4 +targets. This can be handy even if you are running on a SH4 development +platform, because it decouples the host tools from your embedded tools. + + + Authors: -------- Alan Modra @@ -168,7 +240,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -182,11 +253,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -195,12 +263,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -232,9 +295,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -245,14 +306,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -260,6 +328,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -326,9 +398,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -341,20 +421,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -401,14 +481,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes index a325d59..3239774 100644 --- a/cross-sparc-binutils.changes +++ b/cross-sparc-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec index dc360a0..e6e13b9 100644 --- a/cross-sparc-binutils.spec +++ b/cross-sparc-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-sparc-binutils (Version 2.19) +# spec file for package cross-sparc-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-sparc-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to SPARC Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +Summary: GNU binutils for Cross-Development to SPARC Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to SPARC +targets. This can be handy even if you are running on a SPARC +development platform, because it decouples the host tools from your +embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes index a325d59..3239774 100644 --- a/cross-spu-binutils.changes +++ b/cross-spu-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec index 50ccd47..5a83bdd 100644 --- a/cross-spu-binutils.spec +++ b/cross-spu-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-spu-binutils (Version 2.19) +# spec file for package cross-spu-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-spu-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to SPU Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +Summary: GNU binutils for Cross-Development to SPU Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to SPU +targets. This can be handy even if you are running on an SPU +development platform, because it decouples the host tools from your +embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes index a325d59..3239774 100644 --- a/cross-x86_64-binutils.changes +++ b/cross-x86_64-binutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 19 18:19:30 CET 2009 - schwab@suse.de + +- Update to head of trunk. +- Add gold. + +------------------------------------------------------------------- +Thu Jan 15 16:42:33 CET 2009 - schwab@suse.de + +- Use consistent label names. + +------------------------------------------------------------------- +Thu Jan 15 08:01:02 CET 2009 - olh@suse.de + +- remove Requires: binutils-XXbit in binutils-devel-XXbit package + ------------------------------------------------------------------- Fri Jan 9 14:42:24 CET 2009 - schwab@suse.de diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec index 51c1a3a..384f6a9 100644 --- a/cross-x86_64-binutils.spec +++ b/cross-x86_64-binutils.spec @@ -1,5 +1,5 @@ # -# spec file for package cross-x86_64-binutils (Version 2.19) +# spec file for package cross-x86_64-binutils (Version 2.19.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cross-x86_64-binutils BuildRequires: bison dejagnu flex gcc-c++ zlib-devel -Version: 2.19 -Release: 11 +Version: 2.19.51 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -64,7 +64,6 @@ Summary: GNU binutils for Cross-Development to X86-64 Processors Source: binutils-%{binutils_version}.tar.bz2 Source1: pre_checkin.sh Source2: README.First-for.SuSE.packagers -Patch1: 2.19.diff Patch2: s390-pic.patch Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff @@ -76,12 +75,9 @@ Patch9: testsuite.diff Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: common-sysroot-binutils.diff -Patch14: assign-file-positions.diff -Patch15: dw-cfa-advance-loc.diff -Patch16: ppc-opc.diff -Patch17: ld-ia64-relax.diff +Patch13: gold.diff Patch18: s390-calls-local.diff +Patch19: local-label-prefix.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +99,83 @@ embedded tools. +Authors: +-------- + Alan Modra + Andreas Jaeger + Andreas Schwab + Bill Cox + Brendan Kehoe + D. V. Henkel-Wallace + DJ Delorie + David D "Zoo" Zuhn + David J. Mackenzie + Denis Chertykov + Diego Novillo + Doug Evans + Eric Christopher + Eric Youngdale + Fred Fish + Geoff Keating + H.J.Lu + Hans-Peter Nilsson + Ian Dall + Ian Taylor + J.T. Conklin + Jakub Jelinek + Jan Hubicka + Jason Eckhardt + Jason Merrill + Jeff Law + Jeffrey Osier + Jeffrey Wheat + Jim Kingdon + Jim Wilson + John Gilmore + Jörn Rennecke + K. Richard Pixley + Ken Raeburn + Kung Hsu + Mark Eichin + Michael Meissner + Michael Tiemann + Mike Werner + Nick Clifton + Per Bothner + Peter Schauer + Richard Earnshaw + Richard Henderson + Richard Stallman + Rob Savoye + Roland H. Pesch + Sean Eric Fagan + Stan Shebs + Stephane Carrez + Steve Chamberlain + Stu Grossman + Torbjorn Granlund + Ulf Carlsson + +%package gold +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT +Summary: GNU binutils for Cross-Development to X86-64 Processors +AutoReqProv: on +Requires: binutils = %{version}-%{release} +Group: Development/Tools/Building +%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64 + +%description gold +Cross-development utilities: ar, as, gasp, gprof, ld, nm, objcopy, +objdump, ranlib, size, strings, strip. These utilities are needed +whenever you want to compile a program or a kernel. This package +differs from the normal SUSE binutils package in that it is designed to +cross-compile from whatever platform SUSE Linux is running on to X86-64 +targets. This can be handy even if you are running on an X86-64 +development platform, because it decouples the host tools from your +embedded tools. + + + Authors: -------- Alan Modra @@ -169,7 +242,6 @@ Authors: %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{binutils_version} -%patch1 %if !%{test_vanilla} %patch2 %patch3 @@ -183,11 +255,8 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch11 %patch12 %patch13 -%patch14 -%patch15 -%patch16 -%patch17 %patch18 +%patch19 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -196,12 +265,7 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -case %{version} in - *.*.*.*) - grep -q %(echo %{version} | sed 's/.*\.//') bfd/version.h - sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h - ;; -esac +sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -233,9 +297,7 @@ ADDITIONAL_LD_TARGETS="s390-suse-linux" %ifarch %ix86 ADDITIONAL_LD_TARGETS="x86_64-suse-linux" %endif -mkdir build-dir -cd build-dir -%define common_flags CFLAGS="${RPM_OPT_FLAGS}" \\\ +%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ --prefix=%{_prefix} \\\ --with-bugurl=http://bugs.opensuse.org/ \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\ @@ -246,14 +308,21 @@ cd build-dir --disable-ld-targets \\\ ${ADDITIONAL_LD_TARGETS:+--enable-ld-targets="${ADDITIONAL_LD_TARGETS// /,}"} \\\ ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} +mkdir build-dir +cd build-dir ../configure %common_flags --enable-shared make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers # force reconfiguring rm bfd/Makefile make %{?jobs:-j%jobs} -cd .. -mkdir build-dir2 -cd build-dir2 +%ifarch %gold_archs +mkdir ../build-dir2 +cd ../build-dir2 +../configure %common_flags --enable-shared --enable-gold --program-prefix=go +make %{?jobs:-j%jobs} +%endif +mkdir ../build-dir3 +cd ../build-dir3 ../configure %common_flags --disable-shared make %{?jobs:-j%jobs} all-bfd all-opcodes @@ -261,6 +330,10 @@ make %{?jobs:-j%jobs} all-bfd all-opcodes cd build-dir %ifnarch %arm make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || %{make_check_handling} +%ifarch %gold_archs +cd ../build-dir2 +make -k check-gold CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : +%endif %endif # # @@ -327,9 +400,17 @@ make -k check CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-unprototyped-calls" || : cd build-dir %if "%name" == "binutils" # installing native binutils +%ifarch %gold_archs +cd ../build-dir2 +make DESTDIR=$RPM_BUILD_ROOT install-gold +cd ../build-dir +%endif make DESTDIR=$RPM_BUILD_ROOT install-info install make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin/* +cd ../build-dir3 +make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes +cd ../build-dir +rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} @@ -342,20 +423,20 @@ install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-* chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-* # No shared linking outside binutils -rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.{la,so} +rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so # Remove unwanted files to shut up rpm rm $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info* rm $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1 cd .. -cd build-dir2 -make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes -cd .. %find_lang binutils %find_lang bfd binutils.lang %find_lang gas binutils.lang %find_lang ld binutils.lang %find_lang opcodes binutils.lang %find_lang gprof binutils.lang +#%ifarch %gold_archs +#%find_lang gold binutils.lang +#%endif mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas @@ -402,14 +483,31 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{HOST}/lib/ldscripts %{_libdir}/ldscripts %{_bindir}/* +%ifarch %gold_archs +%exclude %{_bindir}/gold +%endif %doc %{_infodir}/*.gz %{_libdir}/lib*-%{version}*.so %doc %{_mandir}/man1/*.1.gz %else %{_prefix} %endif +%ifarch %gold_archs + +%files gold +%defattr(-,root,root) +%doc gold/NEWS gold/README +%{_bindir}/gold +%endif %changelog +* Mon Jan 19 2009 schwab@suse.de +- Update to head of trunk. +- Add gold. +* Thu Jan 15 2009 schwab@suse.de +- Use consistent label names. +* Thu Jan 15 2009 olh@suse.de +- remove Requires: binutils-XXbit in binutils-devel-XXbit package * Fri Jan 09 2009 schwab@suse.de - Fix last change. * Fri Jan 09 2009 olh@suse.de diff --git a/dw-cfa-advance-loc.diff b/dw-cfa-advance-loc.diff deleted file mode 100644 index b91aea8..0000000 --- a/dw-cfa-advance-loc.diff +++ /dev/null @@ -1,191 +0,0 @@ -2008-11-19 Jakub Jelinek - - * Makefile.am (ehopt.o): Add struc-symbol.h. - * Makefile.in: Regenerated. - * ehopt.c: Include struc-symbol.h. - (check_eh_frame): For very small O_constant DW_CFA_advance_loc4 - create correct DW_CFA_advance_loc. Handle O_subtract only - for code alignment factor 1, otherwise handle O_divide or - O_right_shift of O_subtract and O_constant. - (eh_frame_estimate_size_before_relax): Always divide by ca. - (eh_frame_convert_frag): Likewise. - -2008-11-18 John David Anglin - - * dw2gencfi.c (output_cfi_insn): Scale DW_CFA_advance_loc1, - DW_CFA_advance_loc2 and DW_CFA_advance_loc4 outputs. - ---- gas/Makefile.am.jj 2008-11-19 15:50:40.000000000 +0100 -+++ gas/Makefile.am 2008-11-19 16:57:49.000000000 +0100 -@@ -2159,7 +2159,8 @@ dwarf2dbg.o: dwarf2dbg.c $(INCDIR)/safe- - dw2gencfi.o: dw2gencfi.c dw2gencfi.h $(INCDIR)/elf/dwarf2.h \ - subsegs.h $(INCDIR)/obstack.h - ecoff.o: ecoff.c ecoff.h --ehopt.o: ehopt.c subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h -+ehopt.o: ehopt.c subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h \ -+ struc-symbol.h - expr.o: expr.c $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h - flonum-copy.o: flonum-copy.c - flonum-konst.o: flonum-konst.c ---- gas/Makefile.in.jj 2008-11-19 15:50:40.000000000 +0100 -+++ gas/Makefile.in 2008-11-19 16:58:03.000000000 +0100 -@@ -3015,7 +3015,8 @@ dwarf2dbg.o: dwarf2dbg.c $(INCDIR)/safe- - dw2gencfi.o: dw2gencfi.c dw2gencfi.h $(INCDIR)/elf/dwarf2.h \ - subsegs.h $(INCDIR)/obstack.h - ecoff.o: ecoff.c ecoff.h --ehopt.o: ehopt.c subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h -+ehopt.o: ehopt.c subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/dwarf2.h \ -+ struc-symbol.h - expr.o: expr.c $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h - flonum-copy.o: flonum-copy.c - flonum-konst.o: flonum-konst.c ---- gas/dw2gencfi.c 9 Oct 2008 17:31:43 -0000 1.39 -+++ gas/dw2gencfi.c 18 Nov 2008 02:50:24 -0000 -@@ -972,20 +972,20 @@ output_cfi_insn (struct cfi_insn_data *i - - if (scaled <= 0x3F) - out_one (DW_CFA_advance_loc + scaled); -- else if (delta <= 0xFF) -+ else if (scaled <= 0xFF) - { - out_one (DW_CFA_advance_loc1); -- out_one (delta); -+ out_one (scaled); - } -- else if (delta <= 0xFFFF) -+ else if (scaled <= 0xFFFF) - { - out_one (DW_CFA_advance_loc2); -- out_two (delta); -+ out_two (scaled); - } - else - { - out_one (DW_CFA_advance_loc4); -- out_four (delta); -+ out_four (scaled); - } - } - else ---- gas/ehopt.c.jj 2007-12-28 09:31:47.000000000 +0100 -+++ gas/ehopt.c 2008-11-19 17:03:48.000000000 +0100 -@@ -1,5 +1,6 @@ - /* ehopt.c--optimize gcc exception frame information. -- Copyright 1998, 2000, 2001, 2003, 2005, 2007 Free Software Foundation, Inc. -+ Copyright 1998, 2000, 2001, 2003, 2005, 2007, 2008 -+ Free Software Foundation, Inc. - Written by Ian Lance Taylor . - - This file is part of GAS, the GNU Assembler. -@@ -21,6 +22,7 @@ - - #include "as.h" - #include "subsegs.h" -+#include "struc-symbol.h" - - /* We include this ELF file, even though we may not be assembling for - ELF, since the exception frame information is always in a format -@@ -398,13 +400,10 @@ check_eh_frame (expressionS *exp, unsign - subtracted were in the same frag and the expression was - reduced to a constant. We can do the optimization entirely - in this function. */ -- if (d->cie_info.code_alignment > 0 -- && exp->X_add_number % d->cie_info.code_alignment == 0 -- && exp->X_add_number / d->cie_info.code_alignment < 0x40) -+ if (exp->X_add_number < 0x40) - { - d->loc4_frag->fr_literal[d->loc4_fix] -- = DW_CFA_advance_loc -- | (exp->X_add_number / d->cie_info.code_alignment); -+ = DW_CFA_advance_loc | exp->X_add_number; - /* No more bytes needed. */ - return 1; - } -@@ -419,23 +418,39 @@ check_eh_frame (expressionS *exp, unsign - *pnbytes = 2; - } - } -- else if (exp->X_op == O_subtract) -+ else if (exp->X_op == O_subtract && d->cie_info.code_alignment == 1) - { - /* This is a case we can optimize. The expression was not - reduced, so we can not finish the optimization until the end - of the assembly. We set up a variant frag which we handle - later. */ -- int fr_subtype; -- -- if (d->cie_info.code_alignment > 0) -- fr_subtype = d->cie_info.code_alignment << 3; -- else -- fr_subtype = 0; -- -- frag_var (rs_cfa, 4, 0, fr_subtype, make_expr_symbol (exp), -+ frag_var (rs_cfa, 4, 0, 1 << 3, make_expr_symbol (exp), - d->loc4_fix, (char *) d->loc4_frag); - return 1; - } -+ else if ((exp->X_op == O_divide -+ || exp->X_op == O_right_shift) -+ && d->cie_info.code_alignment > 1) -+ { -+ if (exp->X_add_symbol->bsym -+ && exp->X_op_symbol->bsym -+ && exp->X_add_symbol->sy_value.X_op == O_subtract -+ && exp->X_op_symbol->sy_value.X_op == O_constant -+ && ((exp->X_op == O_divide -+ ? exp->X_op_symbol->sy_value.X_add_number -+ : (offsetT) 1 << exp->X_op_symbol->sy_value.X_add_number) -+ == (offsetT) d->cie_info.code_alignment)) -+ { -+ /* This is a case we can optimize as well. The expression was -+ not reduced, so we can not finish the optimization until the -+ end of the assembly. We set up a variant frag which we -+ handle later. */ -+ frag_var (rs_cfa, 4, 0, d->cie_info.code_alignment << 3, -+ make_expr_symbol (&exp->X_add_symbol->sy_value), -+ d->loc4_fix, (char *) d->loc4_frag); -+ return 1; -+ } -+ } - break; - - case state_error: -@@ -459,7 +474,9 @@ eh_frame_estimate_size_before_relax (fra - - diff = resolve_symbol_value (frag->fr_symbol); - -- if (ca > 0 && diff % ca == 0 && diff / ca < 0x40) -+ assert (ca > 0); -+ diff /= ca; -+ if (diff < 0x40) - ret = 0; - else if (diff < 0x100) - ret = 1; -@@ -496,21 +513,21 @@ eh_frame_convert_frag (fragS *frag) - { - offsetT diff; - fragS *loc4_frag; -- int loc4_fix; -+ int loc4_fix, ca; - - loc4_frag = (fragS *) frag->fr_opcode; - loc4_fix = (int) frag->fr_offset; - - diff = resolve_symbol_value (frag->fr_symbol); - -+ ca = frag->fr_subtype >> 3; -+ assert (ca > 0); -+ diff /= ca; - switch (frag->fr_subtype & 7) - { - case 0: -- { -- int ca = frag->fr_subtype >> 3; -- assert (ca > 0 && diff % ca == 0 && diff / ca < 0x40); -- loc4_frag->fr_literal[loc4_fix] = DW_CFA_advance_loc | (diff / ca); -- } -+ assert (diff < 0x40); -+ loc4_frag->fr_literal[loc4_fix] = DW_CFA_advance_loc | diff; - break; - - case 1: diff --git a/enable-targets.diff b/enable-targets.diff index e390cf1..6264edc 100644 --- a/enable-targets.diff +++ b/enable-targets.diff @@ -1,14 +1,89 @@ +--- gold/configure ++++ gold/configure +@@ -867,6 +867,7 @@ Optional Features: + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-threads multi-threaded linking + --enable-targets alternative target configurations ++ --enable-ld-targets alternative target configurations + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors + --disable-nls do not use Native Language Support +@@ -1981,9 +1982,31 @@ else + + fi; + ++# Check whether --enable-ld-targets or --disable-ld-targets was given. ++if test "${enable_ld_targets+set}" = set; then ++ enableval="$enable_ld_targets" ++ case "${enableval}" in ++ yes | "") ++ { { echo "$as_me:$LINENO: error: --enable-ld-targets option must specify target names or 'all'" >&5 ++echo "$as_me: error: --enable-ld-targets option must specify target names or 'all'" >&2;} ++ { (exit 1); exit 1; }; } ++ ;; ++ no) ++ enable_ld_targets= ++ ;; ++ *) ++ enable_ld_targets=$enableval ++ ;; ++esac ++else ++ # For now, enable all targets by default ++ enable_ld_targets=$enable_targets ++ ++fi; ++ + # Canonicalize the enabled targets. +-if test -n "$enable_targets"; then +- for targ in `echo $enable_targets | sed -e 's/,/ /g'`; do ++if test -n "$enable_ld_targets"; then ++ for targ in `echo $enable_ld_targets | sed -e 's/,/ /g'`; do + result=`$ac_config_sub $targ 2>/dev/null` + if test -n "$result"; then + canon_targets="$canon_targets $result" +--- gold/configure.ac ++++ gold/configure.ac +@@ -70,9 +70,26 @@ esac], + enable_targets=all + ]) + ++AC_ARG_ENABLE([ld-targets], ++[ --enable-ld-targets alternative target configurations], ++[case "${enableval}" in ++ yes | "") ++ AC_MSG_ERROR([--enable-ld-targets option must specify target names or 'all']) ++ ;; ++ no) ++ enable_ld_targets= ++ ;; ++ *) ++ enable_ld_targets=$enableval ++ ;; ++esac], ++[# For now, enable all targets by default ++ enable_ld_targets=$enable_targets ++]) ++ + # Canonicalize the enabled targets. +-if test -n "$enable_targets"; then +- for targ in `echo $enable_targets | sed -e 's/,/ /g'`; do ++if test -n "$enable_ld_targets"; then ++ for targ in `echo $enable_ld_targets | sed -e 's/,/ /g'`; do + result=`$ac_config_sub $targ 2>/dev/null` + if test -n "$result"; then + canon_targets="$canon_targets $result" --- ld/configure +++ ld/configure -@@ -857,6 +857,7 @@ - --enable-fast-install=PKGS optimize for fast installation default=yes - --disable-libtool-lock avoid locking (might break parallel builds) +@@ -1003,6 +1003,7 @@ Optional Features: + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors --enable-targets alternative target configurations + --enable-ld-targets alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) - --enable-werror treat compile warnings as errors - --enable-build-warnings enable build-time compiler warnings -@@ -4172,6 +4173,19 @@ + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -3283,6 +3284,19 @@ echo "$as_me: error: enable-targets opti no) enable_targets= ;; *) enable_targets=$enableval ;; esac @@ -28,7 +103,7 @@ fi; # Check whether --enable-64-bit-bfd or --disable-64-bit-bfd was given. if test "${enable_64_bit_bfd+set}" = set; then enableval="$enable_64_bit_bfd" -@@ -7430,7 +7444,7 @@ +@@ -12958,7 +12972,7 @@ all_libpath= rm -f tdirs @@ -39,7 +114,7 @@ all_targets=true --- ld/configure.in +++ ld/configure.in -@@ -22,6 +22,14 @@ +@@ -21,6 +21,14 @@ AC_ARG_ENABLE(targets, no) enable_targets= ;; *) enable_targets=$enableval ;; esac])dnl @@ -54,7 +129,7 @@ AC_ARG_ENABLE(64-bit-bfd, [ --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)], [case "${enableval}" in -@@ -152,7 +160,7 @@ +@@ -187,7 +195,7 @@ dnl not permit literal newlines in an AC dnl file. rm -f tdirs diff --git a/gold.diff b/gold.diff new file mode 100644 index 0000000..5671ccc --- /dev/null +++ b/gold.diff @@ -0,0 +1,11 @@ +--- gold/configure.tgt ++++ gold/configure.tgt +@@ -85,7 +85,7 @@ powerpc-*) + targ_extra_big_endian=false + ;; + powerpc64-*) +- targ_obj=ppc64 ++ targ_obj=powerpc + targ_machine=EM_PPC64 + targ_size=64 + targ_extra_size=32 diff --git a/ld-ia64-relax.diff b/ld-ia64-relax.diff deleted file mode 100644 index 1b0ac53..0000000 --- a/ld-ia64-relax.diff +++ /dev/null @@ -1,31 +0,0 @@ -2008-12-01 H.J. Lu - - PR ld/7036 - * elfxx-ia64.c (elfNN_ia64_relax_section): Assume linker will - always insert 32byte between the .plt and .text sections after - the the first relaxation pass. - ---- bfd/elfxx-ia64.c.relax 2008-11-29 12:08:04.000000000 -0800 -+++ bfd/elfxx-ia64.c 2008-12-01 13:57:01.000000000 -0800 -@@ -994,8 +994,20 @@ elfNN_ia64_relax_section (bfd *abfd, ase - + sec->output_offset - + roff) & (bfd_vma) -4; - -+ /* The .plt section is aligned at 32byte and the .text section -+ is aligned at 64byte. The .text section is right after the -+ .plt section. After the first relaxation pass, linker may -+ increase the gap between the .plt and .text sections up -+ to 32byte. We assume linker will always insert 32byte -+ between the .plt and .text sections after the the first -+ relaxation pass. */ -+ if (tsec == ia64_info->plt_sec) -+ offset = -0x1000000 + 32; -+ else -+ offset = -0x1000000; -+ - /* If the branch is in range, no need to do anything. */ -- if ((bfd_signed_vma) (symaddr - reladdr) >= -0x1000000 -+ if ((bfd_signed_vma) (symaddr - reladdr) >= offset - && (bfd_signed_vma) (symaddr - reladdr) <= 0x0FFFFF0) - { - /* If the 60-bit branch is in 21-bit range, optimize it. */ diff --git a/local-label-prefix.diff b/local-label-prefix.diff new file mode 100644 index 0000000..1d69b28 --- /dev/null +++ b/local-label-prefix.diff @@ -0,0 +1,13 @@ +--- gas/config/obj-elf.h ++++ gas/config/obj-elf.h +@@ -98,6 +98,10 @@ struct elf_obj_sy + #endif + extern void elf_begin (void); + ++#ifndef LOCAL_LABEL_PREFIX ++#define LOCAL_LABEL_PREFIX '.' ++#endif ++ + /* should be conditional on address size! */ + #define elf_symbol(asymbol) ((elf_symbol_type *) (&(asymbol)->the_bfd)) + diff --git a/ppc-opc.diff b/ppc-opc.diff deleted file mode 100644 index 0504183..0000000 --- a/ppc-opc.diff +++ /dev/null @@ -1,27 +0,0 @@ -2008-11-27 Alan Modra - - * ppc-opc.c (extract_sprg): Correct operand range check. - -Index: opcodes/ppc-opc.c -=================================================================== -RCS file: /cvs/src/src/opcodes/ppc-opc.c,v -retrieving revision 1.110 -retrieving revision 1.111 -diff -u -a -p -u -p -a -r1.110 -r1.111 ---- opcodes/ppc-opc.c 14 Aug 2008 13:56:00 -0000 1.110 -+++ opcodes/ppc-opc.c 27 Nov 2008 10:47:23 -0000 1.111 -@@ -1281,10 +1281,10 @@ extract_sprg (unsigned long insn, - - /* mfsprg can use 260..263 and 272..279. mtsprg only uses spr 272..279 - If not BOOKE or 405, then both use only 272..275. */ -- if (val <= 3 -- || (val < 0x10 && (insn & 0x100) != 0) -- || (val - 0x10 > 3 -- && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_403)) == 0)) -+ if ((val - 0x10 > 3 && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_405)) == 0) -+ || (val - 0x10 > 7 && (insn & 0x100) != 0) -+ || val <= 3 -+ || (val & 8) != 0) - *invalid = 1; - return val & 7; - } diff --git a/testsuite.diff b/testsuite.diff index 1edc718..c2ec42d 100644 --- a/testsuite.diff +++ b/testsuite.diff @@ -8,18 +8,14 @@ send_log "\nWarning: Assuming windres can find the win32 headers\n\n" } ---- ld/testsuite/ld-gc/gc.exp.~1.3.~ 2008-01-23 10:18:59.000000000 +0100 -+++ ld/testsuite/ld-gc/gc.exp 2008-01-24 10:31:56.000000000 +0100 -@@ -53,6 +53,9 @@ proc test_gc { testname filename linker - unresolved $testname - return - } -+ -+ # PPC64 does not drop unsused variables -+ setup_xfail "powerpc64-*-*" - if {![info exists nm_output(used_func)] \ - || ![info exists nm_output(used_var)]} { - send_log "used sections do not exist\n" +--- ld/testsuite/ld-elf/group9.s 14 Jan 2009 22:52:49 +0100 1.1 ++++ ld/testsuite/ld-elf/group9.s 19 Jan 2009 13:47:33 +0100 +@@ -12,4 +12,4 @@ foo.data: + .globl bar + .type bar,%function + bar: +- .byte foo.data ++ .long foo.data --- ld/testsuite/ld-srec/srec.exp +++ ld/testsuite/ld-srec/srec.exp @@ -17,6 +17,9 @@