Skip to contentSkip to conversation

m4: bump to 1.4.15

PATCH New Martin Banky 1 participant 2 messages Sep 20, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 m4: bump to 1.4.15

---
 package/m4/m4-1.4.15-00-MB_CUR_MAX.patch        |   13 ++++++++++++
 package/m4/m4-1.4.15-01-spawn-sched_param.patch |   20 +++++++++++++++++++
 package/m4/m4-1.4.8-001-MB_CUR_MAX.patch        |   13 ------------
 package/m4/m4-1.4.9-002-no-wchar.patch          |   24 -----------------------
 package/m4/m4.mk                                |    6 +----
 5 files changed, 34 insertions(+), 42 deletions(-)
 create mode 100644 package/m4/m4-1.4.15-00-MB_CUR_MAX.patch
 create mode 100644 package/m4/m4-1.4.15-01-spawn-sched_param.patch
 delete mode 100644 package/m4/m4-1.4.8-001-MB_CUR_MAX.patch
 delete mode 100644 package/m4/m4-1.4.9-002-no-wchar.patch
package/m4/m4-1.4.15-00-MB_CUR_MAX.patch new file +13 -0
new file mode 100644
index 0000000..fce3673
@@ -0,0 +1,13 @@
+--- m4-1.4.8.orig/lib/regcomp.c	2006-09-24 06:28:37.000000000 +0200
++++ m4-1.4.8/lib/regcomp.c	2007-01-06 20:53:10.000000000 +0100
+@@ -871,6 +871,10 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
+   dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size);
+   dfa->state_hash_mask = table_size - 1;
+ 
++#ifndef MB_CUR_MAX
++#define MB_CUR_MAX (0)
++#endif
++
+   dfa->mb_cur_max = MB_CUR_MAX;
+ #ifdef _LIBC
+   if (dfa->mb_cur_max == 6
package/m4/m4-1.4.15-01-spawn-sched_param.patch new file +20 -0
new file mode 100644
index 0000000..d43db9f
@@ -0,0 +1,20 @@
+"Apparently, glibc's headers expose the full definition of "struct
+sched_param" in cases not required by the standard, and gnulib attempts to
+optimize based on this. uClibc does not share glibc's behavior in this one
+case, but since it defines __GLIBC__, gnulib sees no need for caution."
+
+Per Michael Deutschmann
+
+See http://lists.busybox.net/pipermail/uclibc/2010-March/043721.html
+
+--- bison-2.4.3-orig/lib/spawn.in.h	2010-04-11 11:31:37.000000000 -0700
++++ bison-2.4.3/lib/spawn.in.h	2010-09-18 15:42:05.000000000 -0700
+@@ -31,7 +31,7 @@
+ 
+ /* Get definitions of 'struct sched_param' and 'sigset_t'.
+    But avoid namespace pollution on glibc systems.  */
+-#ifndef __GLIBC__
++#if defined __UCLIBC__ || !defined __GLIBC__
+ # include <sched.h>
+ # include <signal.h>
+ #endif
package/m4/m4-1.4.8-001-MB_CUR_MAX.patch deleted +0 -13
deleted file mode 100644
index fce3673..0000000
@@ -1,13 +0,0 @@
---- m4-1.4.8.orig/lib/regcomp.c	2006-09-24 06:28:37.000000000 +0200
-+++ m4-1.4.8/lib/regcomp.c	2007-01-06 20:53:10.000000000 +0100
-@@ -871,6 +871,10 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
-   dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size);
-   dfa->state_hash_mask = table_size - 1;
- 
-+#ifndef MB_CUR_MAX
-+#define MB_CUR_MAX (0)
-+#endif
-+
-   dfa->mb_cur_max = MB_CUR_MAX;
- #ifdef _LIBC
-   if (dfa->mb_cur_max == 6
package/m4/m4-1.4.9-002-no-wchar.patch deleted +0 -24
deleted file mode 100644
index 7b67295..0000000
@@ -1,24 +0,0 @@
---- m4-1.4.9/lib/printf-args-orig.h	2007-03-23 05:50:53.000000000 -0700
-+++ m4-1.4.9/lib/printf-args.h	2010-09-18 19:09:21.000000000 -0700
-@@ -29,6 +29,9 @@
- /* Get wint_t.  */
- #if HAVE_WINT_T
- # include <wchar.h>
-+# ifndef __UCLIBC_HAS_WCHAR__
-+typedef int wint_t;
-+# endif
- #endif
- 
- /* Get va_list.  */
---- m4-1.4.9/lib/wctype_-orig.h	2010-09-18 19:13:07.000000000 -0700
-+++ m4-1.4.9/lib/wctype_.h	2010-09-18 19:09:21.000000000 -0700
-@@ -39,6 +39,9 @@
- # include <stdio.h>
- # include <time.h>
- # include <wchar.h>
-+# ifndef __UCLIBC_HAS_WCHAR__
-+typedef int wint_t;
-+# endif
- typedef wint_t __wctype_wint_t;
- #else
- typedef int __wctype_wint_t;
package/m4/m4.mk +1 -5
index a0b56c4..da38ce4 100644
@@ -3,7 +3,7 @@
 # m4
 #
 #############################################################
-M4_VERSION = 1.4.9
+M4_VERSION = 1.4.15
 M4_SOURCE = m4-$(M4_VERSION).tar.bz2
 M4_SITE = $(BR2_GNU_MIRROR)/m4
 
@@ -13,10 +13,6 @@ endif
 
 M4_CONF_ENV = gl_cv_func_gettimeofday_clobber=no
 
-ifneq ($(BR2_USE_WCHAR),y)
-M4_CONF_ENV += gt_cv_c_wchar_t=no gl_cv_absolute_wchar_h=__fpending.h
-endif
-
 HOST_M4_CONF_OPT = --disable-static
 
 $(eval $(call AUTOTARGETS,package,m4))
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 3/3 Added gcc 4.5.1 to buildroot

mpc: gcc 4.5.1 requires this now.

gcc: The patches from gcc 4.4.4 are still needed

---
 package/Config.in                                  |    1 +
 package/mpc/Config.in                              |   20 +++
 package/mpc/mpc.mk                                 |  111 ++++++++++++++++
 toolchain/binutils/binutils.mk                     |   16 +++
 toolchain/gcc/4.5.1/100-uclibc-conf.patch          |   33 +++++
 toolchain/gcc/4.5.1/301-missing-execinfo_h.patch   |   11 ++
 toolchain/gcc/4.5.1/302-c99-snprintf.patch         |   13 ++
 .../gcc/4.5.1/305-libmudflap-susv3-legacy.patch    |   49 +++++++
 toolchain/gcc/4.5.1/810-arm-softfloat-libgcc.patch |   38 ++++++
 .../powerpc-link-with-math-lib.patch.conditional   |  137 ++++++++++++++++++++
 toolchain/gcc/Config.in                            |    5 +
 toolchain/gcc/gcc-uclibc-4.x.mk                    |   14 ++-
 12 files changed, 447 insertions(+), 1 deletions(-)
 create mode 100644 package/mpc/Config.in
 create mode 100644 package/mpc/mpc.mk
 create mode 100644 toolchain/gcc/4.5.1/100-uclibc-conf.patch
 create mode 100644 toolchain/gcc/4.5.1/301-missing-execinfo_h.patch
 create mode 100644 toolchain/gcc/4.5.1/302-c99-snprintf.patch
 create mode 100644 toolchain/gcc/4.5.1/305-libmudflap-susv3-legacy.patch
 create mode 100644 toolchain/gcc/4.5.1/810-arm-softfloat-libgcc.patch
 create mode 100644 toolchain/gcc/4.5.1/powerpc-link-with-math-lib.patch.conditional
package/Config.in +1 -0
index ce6057b..7a38e7d 100644
@@ -61,6 +61,7 @@ source "package/grep/Config.in"
 endif
 source "package/intltool/Config.in"
 source "package/make/Config.in"
+source "package/mpc/Config.in"
 source "package/mpfr/Config.in"
 source "package/libtool/Config.in"
 source "package/m4/Config.in"
package/mpc/Config.in new file +20 -0
new file mode 100644
index 0000000..d7cd4cc
@@ -0,0 +1,20 @@
+config BR2_PACKAGE_LIBMPC
+	bool "mpc"
+	select BR2_PACKAGE_LIBMPFR
+	select BR2_PACKAGE_LIBGMP
+	help
+	  Mpc is a C library for the arithmetic of complex numbers with
+	  arbitrarily high precision and correct rounding of the result.
+	  It is built upon and follows the same principles as Mpfr.
+	  
+	  http://www.multiprecision.org/
+
+
+config BR2_PACKAGE_LIBMPC_HEADERS
+	bool "mpc headers for target"
+	depends on BR2_PACKAGE_LIBMPC
+	select BR2_PACKAGE_LIBMPFR_HEADERS
+	select BR2_PACKAGE_LIBGMP_HEADERS
+	help
+	  Install the mpc headers for the target.
+
package/mpc/mpc.mk new file +111 -0

111 lines not on this page · raw message

toolchain/binutils/binutils.mk +16 -0
index 85b605e..ef9f644 100644
@@ -29,6 +29,22 @@ EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_HOST_DIR)"
 BINUTILS_TARGET_CONFIG_OPTIONS=--with-gmp="$(GMP_TARGET_DIR)"
 BINUTILS_TARGET_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_TARGET_DIR)"
 
+ifeq ($(BR2_PACKAGE_LIBMPC),y)
+BINUTILS_ADD_MPC = y
+endif
+
+ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.)
+BINUTILS_ADD_MPC = y
+endif
+
+ifeq ($(BINUTILS_ADD_MPC),y)
+BINUTILS_HOST_PREREQ += $(TOOLCHAIN_DIR)/mpc/lib/libmpc$(HOST_LIBEXT)
+HOST_SOURCE += host-libmpc-source
+BINUTILS_TARGET_PREREQ += $(TARGET_DIR)/usr/lib/libmpc$(LIBTGTEXT)
+EXTRA_BINUTILS_CONFIG_OPTIONS += --with-mpc="$(MPC_HOST_DIR)"
+BINUTILS_TARGET_CONFIG_OPTIONS += --with-mpc="$(MPC_TARGET_DIR)"
+endif
+
 BINUTILS_PATCH_DIR:=toolchain/binutils/$(BINUTILS_VERSION)
 
 ifneq ($(filter xtensa%,$(ARCH)),)
toolchain/gcc/4.5.1/100-uclibc-conf.patch new file +33 -0
new file mode 100644
index 0000000..cca8c82
@@ -0,0 +1,33 @@
+--- gcc/gcc/config/--- gcc/contrib/regression/objs-gcc.sh
++++ gcc/contrib/regression/objs-gcc.sh
+@@ -105,6 +105,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+--- gcc/libjava/classpath/ltconfig
++++ gcc/libjava/classpath/ltconfig
+@@ -603,7 +603,7 @@
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1251,7 +1251,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
toolchain/gcc/4.5.1/301-missing-execinfo_h.patch new file +11 -0
new file mode 100644
index 0000000..0e2092f
@@ -0,0 +1,11 @@
+--- gcc-4.0.0/boehm-gc/include/gc.h-orig	2005-04-28 22:28:57.000000000 -0500
++++ gcc-4.0.0/boehm-gc/include/gc.h	2005-04-28 22:30:38.000000000 -0500
+@@ -500,7 +500,7 @@
+ #ifdef __linux__
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
++     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
toolchain/gcc/4.5.1/302-c99-snprintf.patch new file +13 -0
new file mode 100644
index 0000000..ba51a0e
@@ -0,0 +1,13 @@
+Index: gcc-4.3.0/libstdc++-v3/include/c_global/cstdio
+===================================================================
+--- gcc-4.3.0/libstdc++-v3/include/c_global/cstdio	(revision 129202)
++++ gcc-4.3.0/libstdc++-v3/include/c_global/cstdio	(working copy)
+@@ -144,7 +144,7 @@
+ 
+ _GLIBCXX_END_NAMESPACE
+ 
+-#if _GLIBCXX_USE_C99
++#if _GLIBCXX_USE_C99 || defined __UCLIBC__
+ 
+ #undef snprintf
+ #undef vfscanf
toolchain/gcc/4.5.1/305-libmudflap-susv3-legacy.patch new file +49 -0

49 lines not on this page · raw message

toolchain/gcc/4.5.1/810-arm-softfloat-libgcc.patch new file +38 -0
new file mode 100644
index 0000000..e6a30a3
@@ -0,0 +1,38 @@
+[PATCH] add the correct symbols to libgcc for uclibc arm softfloat
+
+Signed-off-by: Peter Korsgaard <[email protected]>
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ gcc/config/arm/t-linux     |    6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+Index: gcc-4.4.0/gcc/config/arm/t-linux
+===================================================================
+--- gcc-4.4.0.orig/gcc/config/arm/t-linux
++++ gcc-4.4.0/gcc/config/arm/t-linux
+@@ -4,7 +4,11 @@
+ 
+ LIB1ASMSRC = arm/lib1funcs.asm
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_arm_addsubdf3 _arm_addsubsf3
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # MULTILIB_OPTIONS = mhard-float/msoft-float
+ # MULTILIB_DIRNAMES = hard-float soft-float
+Index: gcc-4.4.0/gcc/config/arm/linux-elf.h
+===================================================================
+--- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h
++++ gcc-4.4.0/gcc/config/arm/linux-elf.h
+@@ -60,7 +60,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
toolchain/gcc/4.5.1/powerpc-link-with-math-lib.patch.conditional new file +137 -0

137 lines not on this page · raw message

toolchain/gcc/Config.in +5 -0
index 70d8de9..2d10dda 100644
@@ -25,6 +25,10 @@ choice
 		depends on !BR2_avr32
 		bool "gcc 4.4.x"
 
+	config BR2_GCC_VERSION_4_5_X
+		depends on !BR2_avr32
+		bool "gcc 4.5.x"
+
 	config BR2_GCC_VERSION_SNAP
 		depends on !BR2_avr32
 		bool "gcc snapshot"
@@ -48,6 +52,7 @@ config BR2_GCC_VERSION
 	default "4.2.4"     if BR2_GCC_VERSION_4_2_4
 	default "4.3.5"     if BR2_GCC_VERSION_4_3_X
 	default "4.4.4"     if BR2_GCC_VERSION_4_4_X
+	default "4.5.1"     if BR2_GCC_VERSION_4_5_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
toolchain/gcc/gcc-uclibc-4.x.mk +13 -1
index f17b73f..bc9928a 100644
@@ -101,12 +101,20 @@ GCC_WITH_HOST_GMP=--with-gmp=$(GMP_HOST_DIR)
 GCC_WITH_HOST_MPFR=--with-mpfr=$(MPFR_HOST_DIR)
 HOST_SOURCE += host-libgmp-source host-libmpfr-source
 
+ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.)
+GCC_WITH_HOST_MPC=--with-mpc=$(MPC_HOST_DIR)
+HOST_SOURCE += host-libmpc-source
+endif
+
 ifeq ($(BR2_INSTALL_FORTRAN),y)
 GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),fortran
 #GCC_TARGET_PREREQ+=$(TARGET_DIR)/usr/lib/libmpfr.so $(TARGET_DIR)/usr/lib/libgmp.so
 #GCC_STAGING_PREREQ+=$(TOOLCHAIN_DIR)/mpfr/lib/libmpfr.so
 GCC_WITH_TARGET_GMP=--with-gmp="$(GMP_TARGET_DIR)"
 GCC_WITH_TARGET_MPFR=--with-mpfr="$(MPFR_TARGET_DIR)"
+ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.)
+GCC_WITH_TARGET_MPC=--with-mpc="$(MPC_TARGET_DIR)"
+endif
 endif
 
 ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
@@ -207,6 +215,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		$(GCC_TLS) \
 		$(GCC_WITH_HOST_GMP) \
 		$(GCC_WITH_HOST_MPFR) \
+		$(GCC_WITH_HOST_MPC) \
 		$(DISABLE_NLS) \
 		$(THREADS) \
 		$(GCC_DECIMAL_FLOAT) \
@@ -282,6 +291,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 		$(GCC_TLS) \
 		$(GCC_WITH_HOST_GMP) \
 		$(GCC_WITH_HOST_MPFR) \
+		$(GCC_WITH_HOST_MPC) \
 		$(DISABLE_NLS) \
 		$(THREADS) \
 		$(MULTILIB) \
@@ -358,6 +368,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 		$(GCC_SHARED_LIBGCC) \
 		$(GCC_WITH_HOST_GMP) \
 		$(GCC_WITH_HOST_MPFR) \
+		$(GCC_WITH_HOST_MPC) \
 		$(DISABLE_NLS) \
 		$(THREADS) \
 		$(GCC_DECIMAL_FLOAT) \
@@ -462,7 +473,7 @@ gcc-dirclean: gcc_initial-dirclean
 GCC_BUILD_DIR4:=$(BUILD_DIR)/gcc-$(GCC_VERSION)-target
 
 $(GCC_BUILD_DIR4)/.prepared: $(STAMP_DIR)/gcc_libs_target_installed $(GCC_TARGET_PREREQ)
-	mkdir -p $(GCC_BUILD_DIR3)
+	mkdir -p $(GCC_BUILD_DIR4)
 	touch $@
 
 $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared
@@ -491,6 +502,7 @@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared
 		$(GCC_SHARED_LIBGCC) \
 		$(GCC_WITH_TARGET_GMP) \
 		$(GCC_WITH_TARGET_MPFR) \
+		$(GCC_WITH_TARGET_MPC) \
 		$(DISABLE_NLS) \
 		$(THREADS) \
 		$(GCC_DECIMAL_FLOAT) \
Signature · 1 line
1.7.2.3