From 187d5ed35b6dcf531f85a26a5ed5ca2463a22869 Mon Sep 17 00:00:00 2001 From: wolfwood Date: Sun, 27 Jan 2013 00:53:26 -0500 Subject: [PATCH] update everything I can --- patches/binutils.2.23.patch | 61 +++++++++++++++++++++++++++++++++++++ patches/binutils.patch | 2 +- patches/gmp.patch | 9 ------ patches/ppl.patch | 11 ------- scripts/config.sh | 13 ++++---- scripts/fetchandpatch.sh | 9 ++++-- 6 files changed, 74 insertions(+), 31 deletions(-) create mode 100644 patches/binutils.2.23.patch diff --git a/patches/binutils.2.23.patch b/patches/binutils.2.23.patch new file mode 100644 index 0000000..0cf03d4 --- /dev/null +++ b/patches/binutils.2.23.patch @@ -0,0 +1,61 @@ +diff -rupN ../binutils-2.23.1/bfd/config.bfd ./bfd/config.bfd +--- ../binutils-2.23.1/bfd/config.bfd 2012-09-04 10:14:59.000000000 -0400 ++++ ./bfd/config.bfd 2013-01-26 23:22:51.744303432 -0500 +@@ -623,6 +623,11 @@ case "${targ}" in + targ_selvecs="bfd_elf32_i386_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec" + want64=true + ;; ++ x86_64-*-xomb*) ++ targ_defvec=bfd_elf64_x86_64_vec ++ targ_selvecs=bfd_elf32_i386_vec ++ want64=true ++ ;; + x86_64-*-elf*) + targ_defvec=bfd_elf64_x86_64_vec + targ_selvecs="bfd_elf32_i386_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec i386coff_vec" +diff -rupN ../binutils-2.23.1/config.sub ./config.sub +--- ../binutils-2.23.1/config.sub 2012-04-25 11:53:25.000000000 -0400 ++++ ./config.sub 2013-01-26 23:22:51.740970099 -0500 +@@ -1349,6 +1349,7 @@ case $os in + | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ ++ | -xomb* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +diff -rupN ../binutils-2.23.1/gas/configure.tgt ./gas/configure.tgt +--- ../binutils-2.23.1/gas/configure.tgt 2012-09-04 08:53:45.000000000 -0400 ++++ ./gas/configure.tgt 2013-01-26 23:22:51.744303432 -0500 +@@ -248,6 +248,7 @@ case ${generic_target} in + i386-*-chaos) fmt=elf ;; + i386-*-rdos*) fmt=elf ;; + i386-*-darwin*) fmt=macho ;; ++ i386-*-xomb*) fmt=elf ;; + + i860-*-*) fmt=elf endian=little ;; + +diff -rupN ../binutils-2.23.1/ld/configure.tgt ./ld/configure.tgt +--- ../binutils-2.23.1/ld/configure.tgt 2012-09-04 08:53:47.000000000 -0400 ++++ ./ld/configure.tgt 2013-01-26 23:33:56.577629812 -0500 +@@ -217,6 +217,7 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x + targ_extra_libpath="elf_i386 elf_x86_64 elf_l1om elf_k1om" + tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` + tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;; ++x86_64-*-xomb*) targ_emul=xomb_x86_64 ;; + x86_64-*-linux-*) targ_emul=elf_x86_64 + targ_extra_emuls="elf32_x86_64 elf_i386 i386linux elf_l1om elf_k1om" + targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om" +diff -rupN ../binutils-2.23.1/ld/Makefile.in ./ld/Makefile.in +--- ../binutils-2.23.1/ld/Makefile.in 2012-09-04 08:53:47.000000000 -0400 ++++ ./ld/Makefile.in 2013-01-26 23:36:20.067628311 -0500 +@@ -3541,6 +3541,9 @@ eelf_k1om_fbsd.c: $(srcdir)/emulparams/e + $(srcdir)/emulparams/elf_k1om.sh \ + $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} elf_k1om_fbsd "$(tdir_elf_k1om_fbsd)" ++exomb_x86_64.c: $(srcdir)/emulparams/xomb_x86_64.sh \ ++ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ++ ${GENSCRIPTS} xomb_x86_64 "$(tdir_xomb_x86_64)" + eelf_x86_64.c: $(srcdir)/emulparams/elf_x86_64.sh \ + $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} elf_x86_64 "$(tdir_elf_x86_64)" diff --git a/patches/binutils.patch b/patches/binutils.patch index 0043e5b..b24ab59 120000 --- a/patches/binutils.patch +++ b/patches/binutils.patch @@ -1 +1 @@ -binutils.2.2X.patch \ No newline at end of file +binutils.2.23.patch \ No newline at end of file diff --git a/patches/gmp.patch b/patches/gmp.patch index 37ddbf3..ec7bc26 100644 --- a/patches/gmp.patch +++ b/patches/gmp.patch @@ -1,15 +1,6 @@ diff -rupN gmp-5.0.2.orig/configfsf.sub gmp-5.0.2/configfsf.sub --- gmp-5.0.2.orig/configfsf.sub 2011-09-20 02:48:37.224034311 -0400 +++ gmp-5.0.2/configfsf.sub 2011-09-20 02:53:08.140695606 -0400 -@@ -4,7 +4,7 @@ - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, - # 2011 Free Software Foundation, Inc. - --timestamp='2011-03-23' -+timestamp='2011-09-20' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software @@ -1327,6 +1327,7 @@ case $os in | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ diff --git a/patches/ppl.patch b/patches/ppl.patch index 157d579..f675a15 100644 --- a/patches/ppl.patch +++ b/patches/ppl.patch @@ -9,14 +9,3 @@ diff -rupN ../../ppl-0.11.2/config.sub ./config.sub | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -diff -rupN ../../ppl-0.11.2/Watchdog/config.sub ./Watchdog/config.sub ---- ../../ppl-0.11.2/Watchdog/config.sub 2011-02-27 04:07:47.000000000 -0500 -+++ ./Watchdog/config.sub 2011-09-30 22:35:51.082687892 -0400 -@@ -1306,6 +1306,7 @@ case $os in - | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ -+ | -xomb* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ diff --git a/scripts/config.sh b/scripts/config.sh index ce71a80..0f41bba 100644 --- a/scripts/config.sh +++ b/scripts/config.sh @@ -2,15 +2,14 @@ OSNAME=xomb NCPU=4 -BINUTILS_VER=2.21.1 +BINUTILS_VER=2.23.1 GCC_VER=4.7.2 -GMP_VER=5.0.2 -MPFR_VER=3.1.0 -#NEWLIB_VER=1.20.0 +GMP_VER=5.1.0 +MPFR_VER=3.1.1 NEWLIB_VER=2.0.0 -MPC_VER=0.9 -PPL_VER=0.11.2 -CLOOG_VER=0.16.3 +MPC_VER=1.0.1 +PPL_VER=1.0 +CLOOG_VER=0.18.0 AUTOCONF_VER=2.68 AUTOMAKE_VER=1.11.6 diff --git a/scripts/fetchandpatch.sh b/scripts/fetchandpatch.sh index 7d45c45..5363944 100644 --- a/scripts/fetchandpatch.sh +++ b/scripts/fetchandpatch.sh @@ -9,8 +9,9 @@ wget $WFLAGS http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.gz tar -xf gcc-${GCC_VER}.tar.gz setphase "FETCH GMP" -wget $WFLAGS http://ftp.gnu.org/gnu/gmp/gmp-${GMP_VER}.tar.gz -tar -xf gmp-${GMP_VER}.tar.gz + +wget $WFLAGS ftp://ftp.gmplib.org/pub/gmp-${GMP_VER}/gmp-${GMP_VER}.tar.bz2 +tar -xf gmp-${GMP_VER}.tar.bz2 setphase "FETCH MPFR" wget $WFLAGS http://ftp.gnu.org/gnu/mpfr/mpfr-${MPFR_VER}.tar.gz @@ -53,7 +54,9 @@ tar -xf automake-${AUTOMAKE_VER}.tar.gz # diff -rupN -doPatch binutils +#doPatch binutils +setphase "PATCH BINUTILS" +patch -p1 -d binutils-${BINUTILS_VER} < ../patches/binutils.patch cp ../binutils-files/ld/emulparams/os_x86_64.sh binutils-${BINUTILS_VER}/ld/emulparams/${OSNAME}_x86_64.sh setphase "PATCH GMP"