[meego-commits] 9009: Changes to Tools:SDK:Host/meego-sdk-i586-gcc-bootstrap
Fathi Boudra
no_reply at build.meego.com
Thu Oct 28 09:39:27 UTC 2010
Hi,
I have made the following changes to meego-sdk-i586-gcc-bootstrap in project Tools:SDK:Host. Please review and accept ASAP.
Thank You,
Fathi Boudra
[This message was auto-generated]
---
Request #9009:
submit: devel:tools:sdk:host/meego-sdk-i586-gcc-bootstrap(r13) -> Tools:SDK:Host/meego-sdk-i586-gcc-bootstrap
Message:
* Thu Oct 28 2010 Fathi Boudra <fathi.boudra at nokia.com> - 4.5.0
- Build against mpc static library on OpenSUSE 11.2
- Add meego-sdk-mpc-devel build requirement
- Pass --with-mpc option to configure
State: new 2010-10-28T02:39:26 boudra
Comment: None
changes files:
--------------
--- meego-sdk-i586-gcc-bootstrap.changes
+++ meego-sdk-i586-gcc-bootstrap.changes
@@ -1,2 +1,4 @@
--------------------------------------------------------------------
-Mon Oct 18 14:04:01 UTC 2010 - jackie.wu at intel.com
+* Thu Oct 28 2010 Fathi Boudra <fathi.boudra at nokia.com> - 4.5.0
+- Build against mpc static library on OpenSUSE 11.2
+- Add meego-sdk-mpc-devel build requirement
+- Pass --with-mpc option to configure
@@ -4,6 +6,2 @@
-- Replace "libmpc" with "mpc" for MeeGo build.
-
--------------------------------------------------------------------
-Wed Oct 13 14:19:23 UTC 2010 - jackie.wu at intel.com
-
-- Initial commit of gcc bootstrap to build toolchain.
+* Mon Oct 18 2010 Jackie Wu <jackie.wu at intel.com> - 4.5.0
+- Replace "libmpc" with "mpc" for MeeGo build
@@ -10,0 +9,2 @@
+* Wed Oct 13 2010 Jackie Wu <jackie.wu at intel.com> - 4.5.0
+- Initial commit of gcc bootstrap to build toolchain
\ No newline at end of file
spec files:
-----------
--- meego-sdk-i586-gcc-bootstrap-openSUSE_11.2.spec
+++ meego-sdk-i586-gcc-bootstrap-openSUSE_11.2.spec
@@ -60,8 +60,9 @@
%endif
BuildRequires: meego-sdk-%{_meego_cpu}-kernel-headers meego-sdk-%{_meego_cpu}-binutils
BuildRequires: meego-sdk-%{_meego_cpu}-glibc-headers
-BuildRequires: mpc-devel, gmp-devel, mpfr-devel
-Requires: libmpc2, gmp, mpfr
+BuildRequires: meego-sdk-mpc-devel >= 0.8
+BuildRequires: gmp-devel, mpfr-devel
+Requires: gmp, mpfr
BuildRequires: -post-build-checks
@@ -317,7 +318,8 @@
--enable-ssp --disable-libssp \
--disable-libmudflap \
--disable-__cxa_atexit --disable-checking --disable-threads \
- --without-newlib --enable-fp
+ --without-newlib --enable-fp \
+ --with-mpc=/opt/meego/mpc
make %{?jobs:-j%jobs} all-gcc
make %{?jobs:-j%jobs} all-target-libgcc
dsc files:
----------
--- meego-sdk-i586-gcc-bootstrap.dsc
+++ meego-sdk-i586-gcc-bootstrap.dsc
@@ -4,10 +4,6 @@
Architecture: any
Version: 4.5.0-1
Maintainer: Jackie Wu <jackie.wu at intel.com>
-Homepage: <insert the upstream URL, if relevant>
-Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 7), autotools-dev,
- quilt, meego-sdk-i586-kernel-headers, meego-sdk-i586-binutils, meego-sdk-i586-glibc-headers,
- libmpc-dev, libgmp3-dev, libmpfr-dev,
- zlib1g-dev, gettext, bison, flex, texinfo
+Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), autotools-dev, quilt, bison, flex, gettext, libgmp3-dev, libmpc-dev (>= 0.8) | meego-sdk-libmpc-dev (>= 0.8), libmpfr-dev, meego-sdk-i586-binutils, meego-sdk-i586-glibc-headers, meego-sdk-i586-kernel-headers, texinfo, zlib1g-dev
Debtransform-Tar: gcc-4.5.0.tar.gz
other changes:
--------------
++++++ debian.tar.gz
--- README.Debian
+++ README.Debian
-gcc for Debian
---------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Jackie Wu <jackie.wu at intel.com> Sun, 24 Oct 2010 17:29:24 +0800
--- README.source
+++ README.source
-gcc for Debian
---------------
-
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
-
-
-
-
--- changelog
+++ changelog
@@ -1,5 +1,5 @@
meego-sdk-i586-gcc-bootstrap (4.5.0-1) unstable; urgency=low
- * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
+ * Initial release.
-- Jackie Wu <jackie.wu at intel.com> Sun, 24 Oct 2010 17:29:24 +0800
--- control
+++ control
@@ -1,16 +1,19 @@
Source: meego-sdk-i586-gcc-bootstrap
-Section: unknown
+Section: devel
Priority: extra
Maintainer: Jackie Wu <jackie.wu at intel.com>
-Build-Depends: debhelper (>= 7), autotools-dev,
- quilt, meego-sdk-i586-kernel-headers, meego-sdk-i586-binutils, meego-sdk-i586-glibc-headers,
- libmpc-dev, libgmp3-dev, libmpfr-dev,
- zlib1g-dev, gettext, bison, flex, texinfo
-Standards-Version: 3.8.3
-Homepage: <insert the upstream URL, if relevant>
+Build-Depends: debhelper (>= 7), autotools-dev, quilt, bison, flex, gettext,
+ libgmp3-dev, libmpc-dev (>= 0.8) | meego-sdk-libmpc-dev (>= 0.8), libmpfr-dev,
+ meego-sdk-i586-binutils,
+ meego-sdk-i586-glibc-headers,
+ meego-sdk-i586-kernel-headers,
+ texinfo, zlib1g-dev
+Standards-Version: 3.8.0
+Homepage: http://gcc.gnu.org/
Package: meego-sdk-i586-gcc-bootstrap
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmpc2, libgmp3c2, libmpfr1ldbl
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: gcc bootstrap to build MeeGo SDK Toolchain for IA32
- <insert long description, indented with spaces>
+ This package contains gcc bootstrap to build MeeGo SDK Toolchain for IA32
+ architecture.
--- copyright
+++ copyright
@@ -2,7 +2,7 @@
Jackie Wu <jackie.wu at intel.com> on Sun, 24 Oct 2010 17:29:24 +0800
-It was downloaded from <url://example.com>
+It was downloaded from http://gcc.gnu.org/
Upstream Author(s):
@@ -22,14 +22,4 @@
Copyright (C) 2010 Jackie Wu <jackie.wu at intel.com>
-# Please chose a license for your packaging work. If the program you package
-# uses a mainstream license, using the same license is the safest choice.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
-# If you just want it to be GPL version 3, leave the following lines in.
-
-and is licensed under the GPL version 3,
-see `/usr/share/common-licenses/GPL-3'.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
+and is licensed under the GPL version 2, see `/usr/share/common-licenses/GPL-2'.
--- patches/gcc44-ARM-boehm-gc-stack-qemu.patch
+++ patches/gcc44-ARM-boehm-gc-stack-qemu.patch
@@ -1,6 +1,5 @@
-diff -Napur _/boehm-gc/include/private/gcconfig.h gcc-4.5.0/boehm-gc/include/private/gcconfig.h
---- _/boehm-gc/include/private/gcconfig.h 2010-03-21 20:34:19.000000000 +0100
-+++ gcc-4.5.0/boehm-gc/include/private/gcconfig.h 2010-06-25 12:24:23.000000000 +0200
+--- a/boehm-gc/include/private/gcconfig.h
++++ b/boehm-gc/include/private/gcconfig.h
@@ -1860,7 +1860,7 @@
# endif
# ifdef LINUX
--- patches/gcc44-build-id.patch
+++ patches/gcc44-build-id.patch
@@ -6,9 +6,9 @@
* config/alpha/elf.h (LINK_EH_SPEC): Likewise.
* config/ia64/linux.h (LINK_EH_SPEC): Likewise.
---- gcc/config/rs6000/sysv4.h.~1~
-+++ gcc/config/rs6000/sysv4.h
-@@ -906,7 +906,7 @@ extern int fixuplabelno;
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -916,7 +916,7 @@ SVR4_ASM_SPEC \
%{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}"
#if defined(HAVE_LD_EH_FRAME_HDR)
@@ -17,9 +17,9 @@
#endif
#define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \
---- gcc/config/linux.h.~1~
-+++ gcc/config/linux.h
-@@ -85,7 +85,7 @@ Boston, MA 02110-1301, USA. */
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -89,7 +89,7 @@ see the files COPYING3 and COPYING.RUNTI
} while (0)
#if defined(HAVE_LD_EH_FRAME_HDR)
@@ -28,9 +28,9 @@
#endif
/* Define this so we can compile MS code for use with WINE. */
---- gcc/config/alpha/elf.h.~1~
-+++ gcc/config/alpha/elf.h
-@@ -421,7 +421,7 @@ extern int alpha_this_gpdisp_sequence_nu
+--- a/gcc/config/alpha/elf.h
++++ b/gcc/config/alpha/elf.h
+@@ -423,7 +423,7 @@ extern int alpha_this_gpdisp_sequence_nu
I imagine that other systems will catch up. In the meantime, it
doesn't harm to make sure that the data exists to be used later. */
#if defined(HAVE_LD_EH_FRAME_HDR)
@@ -39,9 +39,9 @@
#endif
/* A C statement (sans semicolon) to output to the stdio stream STREAM
---- gcc/config/ia64/linux.h.~1~
-+++ gcc/config/ia64/linux.h
-@@ -56,7 +56,7 @@ do { \
+--- a/gcc/config/ia64/linux.h
++++ b/gcc/config/ia64/linux.h
+@@ -80,7 +80,7 @@ do { \
Signalize that because we have fde-glibc, we don't need all C shared libs
linked against -lgcc_s. */
#undef LINK_EH_SPEC
--- patches/gcc44-c++-builtin-redecl.patch
+++ patches/gcc44-c++-builtin-redecl.patch
@@ -7,9 +7,9 @@
* gcc.dg/builtins-65.c: New test.
* g++.dg/ext/builtin10.C: New test.
---- gcc/cp/decl.c.jj 2007-10-01 22:11:09.000000000 +0200
-+++ gcc/cp/decl.c 2007-10-02 11:39:46.000000000 +0200
-@@ -2001,23 +2001,21 @@ duplicate_decls (tree newdecl, tree oldd
+--- a/gcc/cp/decl.c
++++ b/gcc/cp/decl.c
+@@ -2021,23 +2021,21 @@ duplicate_decls (tree newdecl, tree oldd
DECL_ARGUMENTS (olddecl) = DECL_ARGUMENTS (newdecl);
DECL_RESULT (olddecl) = DECL_RESULT (newdecl);
}
@@ -42,9 +42,9 @@
DECL_RESULT (newdecl) = DECL_RESULT (olddecl);
/* Don't clear out the arguments if we're just redeclaring a
function. */
---- gcc/testsuite/gcc.dg/builtins-65.c.jj 2007-10-02 11:23:51.000000000 +0200
-+++ gcc/testsuite/gcc.dg/builtins-65.c 2007-10-02 11:24:12.000000000 +0200
-@@ -0,0 +1,25 @@
+--- a/gcc/testsuite/gcc.dg/builtins-65.c
++++ b/gcc/testsuite/gcc.dg/builtins-65.c
+@@ -1,3 +1,28 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
@@ -70,9 +70,12 @@
+
+/* { dg-final { scan-assembler "mysnprintf" } } */
+/* { dg-final { scan-assembler-not "__chk_fail" } } */
---- gcc/testsuite/g++.dg/ext/builtin10.C.jj 2007-10-02 11:19:45.000000000 +0200
-+++ gcc/testsuite/g++.dg/ext/builtin10.C 2007-10-02 11:23:26.000000000 +0200
-@@ -0,0 +1,27 @@
+ /* { dg-do link } */
+ /* { dg-options "-O2 -ffast-math" } */
+ /* { dg-require-effective-target c99_runtime } */
+--- a/gcc/testsuite/g++.dg/ext/builtin10.C
++++ b/gcc/testsuite/g++.dg/ext/builtin10.C
+@@ -1,3 +1,30 @@
+// { dg-do compile }
+// { dg-options "-O2" }
+
@@ -100,3 +103,6 @@
+
+// { dg-final { scan-assembler "mysnprintf" } }
+// { dg-final { scan-assembler-not "__chk_fail" } }
+ // { dg-do compile { target correct_iso_cpp_string_wchar_protos } }
+ // { dg-options "-O2 -fdump-tree-optimized" }
+
--- patches/gcc44-hack.patch
+++ patches/gcc44-hack.patch
@@ -1,6 +1,6 @@
---- libada/Makefile.in.jj 2009-01-14 12:07:35.000000000 +0100
-+++ libada/Makefile.in 2009-01-15 14:25:33.000000000 +0100
-@@ -69,18 +69,40 @@ version := $(shell cat $(srcdir)/../gcc/
+--- a/libada/Makefile.in
++++ b/libada/Makefile.in
+@@ -71,18 +71,40 @@ version := $(shell cat $(srcdir)/../gcc/
libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR)
ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
@@ -45,7 +45,7 @@
"TARGET_LIBGCC2_CFLAGS=$(TARGET_LIBGCC2_CFLAGS)" \
"THREAD_KIND=$(THREAD_KIND)" \
"TRACE=$(TRACE)" \
-@@ -91,7 +113,7 @@ LIBADA_FLAGS_TO_PASS = \
+@@ -93,7 +115,7 @@ LIBADA_FLAGS_TO_PASS = \
"exeext=.exeext.should.not.be.used " \
'CC=the.host.compiler.should.not.be.needed' \
"GCC_FOR_TARGET=$(CC)" \
@@ -54,13 +54,13 @@
# Rules to build gnatlib.
.PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared oscons
---- gcc/ada/make.adb 2008-11-07 23:00:32.000000000 +0100
-+++ gcc/ada/make.adb 2009-01-16 17:55:02.000000000 +0100
-@@ -8039,6 +8039,7 @@ package body Make is
+--- a/gcc/ada/make.adb
++++ b/gcc/ada/make.adb
+@@ -8007,6 +8007,7 @@ package body Make is
or else Argv (2 .. Argv'Last) = "pg"
or else (Argv (2) = 'm' and then Argv'Last > 2)
or else (Argv (2) = 'f' and then Argv'Last > 2)
+ or else (Argv'Last >= 8 and then Argv (2 .. 8) = "-param=")
then
Add_Switch (Argv, Compiler, And_Save => And_Save);
- Add_Switch (Argv, Linker, And_Save => And_Save);
+ Add_Switch (Argv, Linker, And_Save => And_Save);
--- patches/gcc44-i386-libgomp.patch
+++ patches/gcc44-i386-libgomp.patch
@@ -1,9 +1,9 @@
Build i386.rpm libgomp and libsupc++.a(guard.o) as i486+, pre-i486
hardware isn't supported because NPTL doesn't support it anyway.
---- libgomp/configure.tgt.jj 2008-01-10 20:53:48.000000000 +0100
-+++ libgomp/configure.tgt 2008-03-27 12:44:51.000000000 +0100
-@@ -44,14 +44,14 @@ if test $enable_linux_futex = yes; then
+--- a/libgomp/configure.tgt
++++ b/libgomp/configure.tgt
+@@ -48,14 +48,14 @@ if test $enable_linux_futex = yes; then
;;
# Note that bare i386 is not included here. We need cmpxchg.
@@ -20,7 +20,7 @@
fi
esac
;;
-@@ -63,7 +63,7 @@ if test $enable_linux_futex = yes; then
+@@ -67,7 +67,7 @@ if test $enable_linux_futex = yes; then
config_path="linux/x86 linux posix"
case " ${CC} ${CFLAGS} " in
*" -m32 "*)
@@ -29,9 +29,9 @@
;;
esac
;;
---- libstdc++-v3/libsupc++/guard.cc.jj 2008-03-01 00:58:24.000000000 +0100
-+++ libstdc++-v3/libsupc++/guard.cc 2008-03-27 14:08:44.000000000 +0100
-@@ -35,6 +35,27 @@
+--- a/libstdc++-v3/libsupc++/guard.cc
++++ b/libstdc++-v3/libsupc++/guard.cc
+@@ -30,6 +30,27 @@
#include <new>
#include <ext/atomicity.h>
#include <ext/concurrence.h>
--- patches/gcc44-java-debug-iface-type.patch
+++ patches/gcc44-java-debug-iface-type.patch
@@ -2,9 +2,9 @@
* lang.c (java_classify_record): Revert 2007-12-20 change.
---- gcc/java/lang.c 2007-12-27 09:09:49.000000000 +0100
-+++ gcc/java/lang.c 2008-01-25 17:43:57.000000000 +0100
-@@ -965,9 +965,7 @@ java_classify_record (tree type)
+--- a/gcc/java/lang.c
++++ b/gcc/java/lang.c
+@@ -881,9 +881,7 @@ java_classify_record (tree type)
if (! CLASS_P (type))
return RECORD_IS_STRUCT;
--- patches/gcc44-java-nomulti.patch
+++ patches/gcc44-java-nomulti.patch
@@ -1,6 +1,6 @@
---- libjava/configure.ac.jj 2007-12-07 17:55:50.000000000 +0100
-+++ libjava/configure.ac 2007-12-07 18:36:56.000000000 +0100
-@@ -82,6 +82,13 @@ AC_ARG_ENABLE(java-maintainer-mode,
+--- a/libjava/configure.ac
++++ b/libjava/configure.ac
+@@ -139,6 +139,13 @@ AC_ARG_ENABLE(java-maintainer-mode,
[allow rebuilding of .class and .h files]))
AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
@@ -14,9 +14,9 @@
# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
GCC_NO_EXECUTABLES
---- libjava/configure.jj 2007-12-07 17:55:50.000000000 +0100
-+++ libjava/configure 2007-12-07 18:39:58.000000000 +0100
-@@ -1021,6 +1021,8 @@ Optional Features:
+--- a/libjava/configure
++++ b/libjava/configure
+@@ -1609,6 +1609,8 @@ Optional Features:
default=yes
--enable-java-maintainer-mode
allow rebuilding of .class and .h files
@@ -25,7 +25,7 @@
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--enable-maintainer-mode enable make rules and dependencies not useful
-@@ -1973,6 +1975,16 @@ else
+@@ -3346,6 +3348,16 @@ else
fi
--- patches/gcc44-libgomp-omp_h-multilib.patch
+++ patches/gcc44-libgomp-omp_h-multilib.patch
@@ -2,9 +2,9 @@
* omp.h.in (omp_nest_lock_t): Fix up for Linux multilibs.
---- libgomp/omp.h.in.jj 2008-06-09 13:34:05.000000000 +0200
-+++ libgomp/omp.h.in 2008-06-09 13:34:48.000000000 +0200
-@@ -42,8 +42,8 @@ typedef struct
+--- a/libgomp/omp.h.in
++++ b/libgomp/omp.h.in
+@@ -39,8 +39,8 @@ typedef struct
typedef struct
{
--- patches/gcc44-libtool-no-rpath.patch
+++ patches/gcc44-libtool-no-rpath.patch
@@ -1,7 +1,7 @@
libtool sucks.
---- ltmain.sh.jj 2007-12-07 14:53:21.000000000 +0100
-+++ ltmain.sh 2008-09-05 21:51:48.000000000 +0200
-@@ -5394,6 +5394,7 @@ EOF
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -7103,6 +7103,7 @@ EOF
rpath="$finalize_rpath"
test "$mode" != relink && rpath="$compile_rpath$rpath"
for libdir in $rpath; do
@@ -9,7 +9,7 @@
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
-@@ -6071,6 +6072,7 @@ EOF
+@@ -7798,6 +7799,7 @@ EOF
rpath=
hardcode_libdirs=
for libdir in $compile_rpath $finalize_rpath; do
@@ -17,7 +17,7 @@
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
-@@ -6120,6 +6122,7 @@ EOF
+@@ -7849,6 +7851,7 @@ EOF
rpath=
hardcode_libdirs=
for libdir in $finalize_rpath; do
--- patches/gcc44-pr33763.patch
+++ patches/gcc44-pr33763.patch
@@ -10,9 +10,9 @@
* tree-inline.c (expand_call_inline): Silently ignore always_inline
attribute for redefined extern inline functions.
---- gcc/tree-inline.c.jj 2007-11-06 09:29:04.000000000 +0100
-+++ gcc/tree-inline.c 2007-11-06 16:19:12.000000000 +0100
-@@ -3157,6 +3157,12 @@ expand_call_inline (basic_block bb, gimp
+--- a/gcc/tree-inline.c
++++ b/gcc/tree-inline.c
+@@ -3545,6 +3545,12 @@ expand_call_inline (basic_block bb, gimp
goto egress;
if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn))
@@ -25,8 +25,8 @@
/* Avoid warnings during early inline pass. */
&& cgraph_global_info_ready)
{
---- gcc/testsuite/gcc.dg/pr33763.c.jj 2007-11-06 16:19:12.000000000 +0100
-+++ gcc/testsuite/gcc.dg/pr33763.c 2007-11-06 16:19:12.000000000 +0100
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/pr33763.c
@@ -0,0 +1,60 @@
+/* PR tree-optimization/33763 */
+/* { dg-do compile } */
@@ -88,8 +88,8 @@
+{
+ return inl (x, y);
+}
---- gcc/testsuite/g++.dg/opt/inline13.C.jj 2007-11-06 16:20:20.000000000 +0100
-+++ gcc/testsuite/g++.dg/opt/inline13.C 2007-11-06 16:21:30.000000000 +0100
+--- /dev/null
++++ b/gcc/testsuite/g++.dg/opt/inline13.C
@@ -0,0 +1,60 @@
+// PR tree-optimization/33763
+// { dg-do compile }
--- patches/gcc44-rh341221.patch
+++ patches/gcc44-rh341221.patch
@@ -4,8 +4,8 @@
timestamp rather than from current date.
* doc/Makefile.in: Regenerated.
---- libjava/classpath/doc/Makefile.am.jj 2007-12-07 17:55:00.000000000 +0100
-+++ libjava/classpath/doc/Makefile.am 2007-12-07 18:55:28.000000000 +0100
+--- a/libjava/classpath/doc/Makefile.am
++++ b/libjava/classpath/doc/Makefile.am
@@ -31,7 +31,7 @@ TOOLS_MANFILES = \
gtnameserv.1 \
gjdoc.1
@@ -15,9 +15,9 @@
TEXI2POD = perl $(srcdir)/texi2pod.pl
STAMP = echo timestamp >
---- libjava/classpath/doc/Makefile.in.jj 2007-12-07 17:55:00.000000000 +0100
-+++ libjava/classpath/doc/Makefile.in 2007-12-07 18:55:43.000000000 +0100
-@@ -382,7 +382,7 @@ TOOLS_MANFILES = \
+--- a/libjava/classpath/doc/Makefile.in
++++ b/libjava/classpath/doc/Makefile.in
+@@ -376,7 +376,7 @@ TOOLS_MANFILES = \
gtnameserv.1 \
gjdoc.1
--- patches/gcc45-pr43572.patch
+++ patches/gcc45-pr43572.patch
@@ -1,6 +1,5 @@
-diff -Naurp gcc-4.5.0-orig/gcc/testsuite/gcc.dg/tree-ssa/tailcall-5.c gcc-4.5.0/gcc/testsuite/gcc.dg/tree-ssa/tailcall-5.c
---- gcc-4.5.0-orig/gcc/testsuite/gcc.dg/tree-ssa/tailcall-5.c 1970-01-01 08:00:00.000000000 +0800
-+++ gcc-4.5.0/gcc/testsuite/gcc.dg/tree-ssa/tailcall-5.c 2010-07-09 13:56:34.593063124 +0800
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/tree-ssa/tailcall-5.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-tailc" } */
@@ -14,9 +13,8 @@
+
+/* { dg-final { scan-tree-dump-not "tail call" "tailc" } } */
+/* { dg-final { cleanup-tree-dump "tailc" } } */
-diff -Naurp gcc-4.5.0-orig/gcc/testsuite/gcc.dg/tree-ssa/tailcall-6.c gcc-4.5.0/gcc/testsuite/gcc.dg/tree-ssa/tailcall-6.c
---- gcc-4.5.0-orig/gcc/testsuite/gcc.dg/tree-ssa/tailcall-6.c 1970-01-01 08:00:00.000000000 +0800
-+++ gcc-4.5.0/gcc/testsuite/gcc.dg/tree-ssa/tailcall-6.c 2010-07-09 13:56:34.619072316 +0800
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/tree-ssa/tailcall-6.c
@@ -0,0 +1,33 @@
+/* PR tree-optimization/43904. */
+/* { dg-do run } */
@@ -51,10 +49,9 @@
+ expose_bug(&ptr, sizeof(ptr));
+ return 0;
+}
-diff -Naurp gcc-4.5.0-orig/gcc/tree-tailcall.c gcc-4.5.0/gcc/tree-tailcall.c
---- gcc-4.5.0-orig/gcc/tree-tailcall.c 2010-07-09 13:46:12.430567142 +0800
-+++ gcc-4.5.0/gcc/tree-tailcall.c 2010-07-09 13:50:35.371673436 +0800
-@@ -375,6 +375,8 @@ find_tail_calls (basic_block bb, struct
+--- a/gcc/tree-tailcall.c
++++ b/gcc/tree-tailcall.c
+@@ -375,6 +375,8 @@ find_tail_calls (basic_block bb, struct
tree m, a;
basic_block abb;
size_t idx;
@@ -63,7 +60,7 @@
if (!single_succ_p (bb))
return;
-@@ -462,6 +464,16 @@ find_tail_calls (basic_block bb, struct
+@@ -462,6 +464,16 @@ find_tail_calls (basic_block bb, struct
tail_recursion = true;
}
--- patches/gcc45-pr43698.patch
+++ patches/gcc45-pr43698.patch
@@ -1,6 +1,5 @@
-diff -Naurp gcc-4.5.0-orig/gcc/config/arm/arm.md gcc-4.5.0/gcc/config/arm/arm.md
---- gcc-4.5.0-orig/gcc/config/arm/arm.md 2010-07-09 13:46:15.306510905 +0800
-+++ gcc-4.5.0/gcc/config/arm/arm.md 2010-07-20 16:33:41.844529086 +0800
+--- a/gcc/config/arm/arm.md
++++ b/gcc/config/arm/arm.md
@@ -11200,12 +11200,18 @@
(define_insn "arm_rev"
[(set (match_operand:SI 0 "s_register_operand" "=r")
@@ -25,9 +24,8 @@
)
(define_expand "arm_legacy_rev"
-diff -Naurp gcc-4.5.0-orig/gcc/testsuite/gcc.target/arm/pr43698.c gcc-4.5.0/gcc/testsuite/gcc.target/arm/pr43698.c
---- gcc-4.5.0-orig/gcc/testsuite/gcc.target/arm/pr43698.c 1970-01-01 08:00:00.000000000 +0800
-+++ gcc-4.5.0/gcc/testsuite/gcc.target/arm/pr43698.c 2010-07-20 16:30:38.634677281 +0800
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/arm/pr43698.c
@@ -0,0 +1,39 @@
+/* { dg-do run } */
+/* { dg-options "-Os" } */
--- patches/gcc45-pr45094.patch
+++ patches/gcc45-pr45094.patch
@@ -12,11 +12,9 @@
PR target/45094
* gcc.target/arm/pr45094.c: New test.
-Index: gcc/config/arm/arm.c
-===================================================================
---- gcc/config/arm/arm.c (revision 162853)
-+++ gcc/config/arm/arm.c (working copy)
-@@ -12836,13 +12836,13 @@
+--- a/gcc/config/arm/arm.c
++++ b/gcc/config/arm/arm.c
+@@ -12182,13 +12182,13 @@ output_move_double (rtx *operands)
{
if (GET_CODE (XEXP (operands[0], 0)) == PRE_MODIFY)
{
@@ -34,10 +32,8 @@
}
}
else if (GET_CODE (XEXP (operands[0], 0)) == PRE_MODIFY)
-Index: gcc/testsuite/gcc.target/arm/pr45094.c
-===================================================================
---- gcc/testsuite/gcc.target/arm/pr45094.c (revision 0)
-+++ gcc/testsuite/gcc.target/arm/pr45094.c (revision 0)
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/arm/pr45094.c
@@ -0,0 +1,27 @@
+/* { dg-do run } */
+/* { dg-require-effective-target arm_neon_hw } */
--- patches/gcc45-use-atom.patch
+++ patches/gcc45-use-atom.patch
@@ -1,6 +1,5 @@
-diff -Naurp gcc-4.5.0-orig/gcc/config/i386/i386.c gcc-4.5.0/gcc/config/i386/i386.c
---- gcc-4.5.0-orig/gcc/config/i386/i386.c 2010-04-23 04:43:24.000000000 -0400
-+++ gcc-4.5.0/gcc/config/i386/i386.c 2010-04-23 04:45:30.000000000 -0400
+--- a/gcc/config/i386/i386.c
++++ b/gcc/config/i386/i386.c
@@ -1783,7 +1783,7 @@ enum asm_dialect ix86_asm_dialect = ASM_
enum tls_dialect ix86_tls_dialect = TLS_DIALECT_GNU;
--- patches/series
+++ patches/series
@@ -8,14 +8,10 @@
gcc44-i386-libgomp.patch
gcc44-libgomp-omp_h-multilib.patch
gcc44-libtool-no-rpath.patch
-gcc44-libstdc++-docs.patch
+#gcc44-libstdc++-docs.patch
gcc45-pr43572.patch
gcc45-pr43698.patch
-
gcc45-use-atom.patch
-libgcc_post_upgrade.c.arm.patch
-
+#libgcc_post_upgrade.c.arm.patch
gcc45-pr45094.patch
-
gcc44-ARM-boehm-gc-stack-qemu.patch
-
--- rules
+++ rules
@@ -1,56 +1,20 @@
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
-# Packaging version
-PKG_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+target := i586-meego-linux-gnu
+install_prefix := /opt/meego/meego-sdk-i586-toolchain/$(target)
-# Compiler flags
-LDFLAGS = -Wl,--as-needed
-
-# Support multiple makes at once
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NJOBS := -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
-
-# Architecture/system specific configuration
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-
-_meego_cpu=i586
-_meego_arch=i586
-TARGET=$(_meego_arch)-meego-linux-gnu
-install_prefix=/opt/meego/meego-sdk-$(_meego_cpu)-toolchain/$(TARGET)
-_prefix=$(install_prefix)
-pkgname=meego-sdk-$(_meego_arch)-gcc-bootstrap
-version=4.5.0
-gcc_release=1
+pkg_name := $(shell dh_listpackages)
+gcc_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -f1 -d '-')
+gcc_release := 1
%:
- dh $@
+ dh $@ --list-missing --with quilt
override_dh_auto_configure:
- patch -p0 -b < debian/patches/gcc44-hack.patch
- patch -p0 -b < debian/patches/gcc44-build-id.patch
- patch -p0 -b < debian/patches/gcc44-c++-builtin-redecl.patch
- patch -p0 -b < debian/patches/gcc44-java-nomulti.patch
- patch -p0 -b < debian/patches/gcc44-pr33763.patch
- patch -p0 -b < debian/patches/gcc44-rh341221.patch
- patch -p0 -b < debian/patches/gcc44-java-debug-iface-type.patch
- patch -p0 -b < debian/patches/gcc44-i386-libgomp.patch
- patch -p0 -b < debian/patches/gcc44-libgomp-omp_h-multilib.patch
- patch -p0 -b < debian/patches/gcc44-libtool-no-rpath.patch
- patch -p1 -b < debian/patches/gcc45-pr43572.patch
- patch -p1 -b < debian/patches/gcc45-pr43698.patch
- patch -p1 -b < debian/patches/gcc45-use-atom.patch
-# patch -p0 -b < debian/patches/libgcc_post_upgrade.c.arm.patch
- patch -p0 -b < debian/patches/gcc45-pr45094.patch
- patch -p1 -b < debian/patches/gcc44-ARM-boehm-gc-stack-qemu.patch
-
-
- echo 'MeeGo $(version)-$(gcc_release)' > gcc/DEV-PHASE
+ echo 'MeeGo $(gcc_version)-$(gcc_release)' > gcc/DEV-PHASE
# Default to -gdwarf-3 rather than -gdwarf-2
sed -i '/UInteger Var(dwarf_version)/s/Init(2)/Init(3)/' gcc/common.opt
@@ -62,25 +26,24 @@
mkdir obj
cd obj; ../configure \
- --prefix=$(_prefix) \
+ --prefix=$(install_prefix) \
--enable-languages=c \
--disable-nls --disable-shared \
--enable-version-specific-runtime-libs \
- --with-sysroot=$(_prefix)/$(TARGET)/sys-root \
- --target=$(TARGET) \
+ --with-sysroot=$(install_prefix)/$(target)/sys-root \
+ --target=$(target) \
--enable-ssp --disable-libssp \
--disable-libmudflap \
--disable-__cxa_atexit --disable-checking --disable-threads \
- --without-newlib --enable-fp
+ --without-newlib --enable-fp \
+ --with-mpc=/opt/meego/mpc
override_dh_auto_build:
- cd obj; $(MAKE) $(NJOBS) all-gcc
- cd obj; $(MAKE) $(NJOBS) all-target-libgcc
+ $(MAKE) -C obj all-gcc
+ $(MAKE) -C obj all-target-libgcc
override_dh_auto_install:
- cd obj; $(MAKE) install-gcc DESTDIR=$(CURDIR)/debian/$(pkgname)
- cd obj; $(MAKE) install-target-libgcc DESTDIR=$(CURDIR)/debian/$(pkgname)
-# rm -rf %{buildroot}%{_infodir}
-# rm -rf %{buildroot}%{_mandir}
+ $(MAKE) -C obj install-gcc DESTDIR=$(CURDIR)/debian/$(pkg_name)
+ $(MAKE) -C obj install-target-libgcc DESTDIR=$(CURDIR)/debian/$(pkg_name)
.PHONY: override_dh_auto_test
More information about the MeeGo-commits
mailing list