Commit de859f6b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

toolchain: Add uClibc 0.9.30.3, remove older 0.9.30.x 



As the 0.9.30.x stable releases only contain bugfixes, there isn't much
sense in using the older 0.9.30.x releases instead of .3, so use a single
0.9.30.x config similar to how we do it for the kernel headers.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 12ebf571

CHANGES

+5 −3
Original line number Diff line number Diff line 
2010.05, Not yet released



	Toolchain: uClibc 0.9.30.3, older 0.9.30.x removed.



	X.org updated to 7.5.



	Updated/fixed packages: busybox, dosfstools, e2fsprogs,

toolchain/uClibc/Config.in

+2 −14
Original line number Diff line number Diff line
@@ -20,15 +20,7 @@ choice 
		bool "uClibc 0.9.29"



	config BR2_UCLIBC_VERSION_0_9_30

		depends on BR2_DEPRECATED

		bool "uClibc 0.9.30"



	config BR2_UCLIBC_VERSION_0_9_30_1

		depends on BR2_RECENT || BR2_DEPRECATED

		bool "uClibc 0.9.30.1"



	config BR2_UCLIBC_VERSION_0_9_30_2

		bool "uClibc 0.9.30.2"

		bool "uClibc 0.9.30.x"



	config BR2_UCLIBC_VERSION_SNAPSHOT

		bool "daily snapshot"
@@ -46,9 +38,7 @@ config BR2_UCLIBC_VERSION_STRING 
	string

	default 0.9.28.3	if BR2_UCLIBC_VERSION_0_9_28_3

	default 0.9.29		if BR2_UCLIBC_VERSION_0_9_29

	default 0.9.30		if BR2_UCLIBC_VERSION_0_9_30

	default 0.9.30.1	if BR2_UCLIBC_VERSION_0_9_30_1

	default 0.9.30.2	if BR2_UCLIBC_VERSION_0_9_30_2

	default 0.9.30.3	if BR2_UCLIBC_VERSION_0_9_30

	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT



config BR2_UCLIBC_CONFIG
@@ -56,8 +46,6 @@ config BR2_UCLIBC_CONFIG 
	default "toolchain/uClibc/uClibc-0.9.28.config" if BR2_UCLIBC_VERSION_0_9_28_3

	default "toolchain/uClibc/uClibc-0.9.29.config" if BR2_UCLIBC_VERSION_0_9_29

	default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30

	default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30_1

	default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30_2

	default "toolchain/uClibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT

	help

	  Some people may wish to use their own modified uClibc configuration

toolchain/uClibc/uClibc-0.9.30-64bit-strtouq.patch

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
[PATCH]: Add strtouq alias (to strtoul) for 64bit



The strtouq alias was only available on 32bit, breaking compilation of stuff

using strtouq on 64bit machines. At the same time use the correct return

type (u_quad_t).



Signed-of-by: Peter Korsgaard <jacmet@sunsite.dk>

---

 include/stdlib.h     |    4 +++-

 libc/stdlib/stdlib.c |    1 +

 2 files changed, 4 insertions(+), 1 deletion(-)



Index: uClibc-0.9.30.1/libc/stdlib/stdlib.c

===================================================================

--- uClibc-0.9.30.1.orig/libc/stdlib/stdlib.c

+++ uClibc-0.9.30.1/libc/stdlib/stdlib.c

@@ -401,6 +401,9 @@

 libc_hidden_proto(__XL_NPP(strtoull))

 strong_alias(__XL_NPP(strtoul),__XL_NPP(strtoull))

 libc_hidden_def(__XL_NPP(strtoull))

+#if !defined(L_strtoul_l)

+strong_alias(strtoul,strtouq)

+#endif

 #endif

 

 

Index: uClibc-0.9.30.1/include/stdlib.h

===================================================================

--- uClibc-0.9.30.1.orig/include/stdlib.h

+++ uClibc-0.9.30.1/include/stdlib.h

@@ -203,6 +203,8 @@

 __END_NAMESPACE_STD

 

 #ifdef __USE_BSD

+#include <sys/types.h> /* for u_quad_t */

+

 /* Convert a string to a quadword integer.  */

 __extension__

 extern long long int strtoq (__const char *__restrict __nptr,

@@ -210,7 +212,7 @@

      __THROW __nonnull ((1)) __wur;

 /* Convert a string to an unsigned quadword integer.  */

 __extension__

-extern unsigned long long int strtouq (__const char *__restrict __nptr,

+extern u_quad_t strtouq (__const char *__restrict __nptr,

 				       char **__restrict __endptr, int __base)

      __THROW __nonnull ((1)) __wur;

 #endif /* GCC and use BSD.  */

toolchain/uClibc/uClibc-0.9.30-arm-fix-linuxthreads-sysdep.patch

deleted100644 → 0
+0 −177
Original line number Diff line number Diff line 
From 1b6e90090da7194a8f94277aa132873044f7e8e7 Mon Sep 17 00:00:00 2001

From: carmelo <carmelo@69ca8d6d-28ef-0310-b511-8ec308f3f277>

Date: Wed, 28 Jan 2009 15:23:51 +0000

Subject: [PATCH] Added sysdep.h and sysdep-cancel.h for linuxthreads ARM



Signed-off-by: Will Wagner <will_wagner@carallon.com>







git-svn-id: svn+ssh://uclibc.org/svn/trunk/uClibc@25099 69ca8d6d-28ef-0310-b511-8ec308f3f277

---

 .../linuxthreads/sysdeps/arm/sysdep-cancel.h       |    8 +

 libpthread/linuxthreads/sysdeps/arm/sysdep.h       |  137 ++++++++++++++++++++

 2 files changed, 145 insertions(+), 0 deletions(-)

 create mode 100644 libpthread/linuxthreads/sysdeps/arm/sysdep-cancel.h

 create mode 100644 libpthread/linuxthreads/sysdeps/arm/sysdep.h



diff --git a/libpthread/linuxthreads/sysdeps/arm/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/arm/sysdep-cancel.h

new file mode 100644

index 0000000..ba6a1e0

--- /dev/null

+++ b/libpthread/linuxthreads/sysdeps/arm/sysdep-cancel.h

@@ -0,0 +1,8 @@

+#include <sysdep.h>

+

+/* No multi-thread handling enabled.  */

+#define SINGLE_THREAD_P (1)

+#define RTLD_SINGLE_THREAD_P (1)

+#define LIBC_CANCEL_ASYNC()	0 /* Just a dummy value.  */

+#define LIBC_CANCEL_RESET(val)	((void)(val)) /* Nothing, but evaluate it.  */

+#define LIBC_CANCEL_HANDLED()	/* Nothing.  */

diff --git a/libpthread/linuxthreads/sysdeps/arm/sysdep.h b/libpthread/linuxthreads/sysdeps/arm/sysdep.h

new file mode 100644

index 0000000..15d951c

--- /dev/null

+++ b/libpthread/linuxthreads/sysdeps/arm/sysdep.h

@@ -0,0 +1,137 @@

+/* Generic asm macros used on many machines.

+   Copyright (C) 1991,92,93,96,98,2002,2003 Free Software Foundation, Inc.

+   This file is part of the GNU C Library.

+

+   The GNU C Library is free software; you can redistribute it and/or

+   modify it under the terms of the GNU Lesser General Public

+   License as published by the Free Software Foundation; either

+   version 2.1 of the License, or (at your option) any later version.

+

+   The GNU C Library is distributed in the hope that it will be useful,

+   but WITHOUT ANY WARRANTY; without even the implied warranty of

+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+   Lesser General Public License for more details.

+

+   You should have received a copy of the GNU Lesser General Public

+   License along with the GNU C Library; if not, write to the Free

+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA

+   02111-1307 USA.  */

+

+#ifndef C_LABEL

+

+/* Define a macro we can use to construct the asm name for a C symbol.  */

+#ifdef	NO_UNDERSCORES

+#ifdef	__STDC__

+#define C_LABEL(name)		name##:

+#else

+#define C_LABEL(name)		name/**/:

+#endif

+#else

+#ifdef	__STDC__

+#define C_LABEL(name)		_##name##:

+#else

+#define C_LABEL(name)		_/**/name/**/:

+#endif

+#endif

+

+#endif

+

+#ifdef __ASSEMBLER__

+/* Mark the end of function named SYM.  This is used on some platforms

+   to generate correct debugging information.  */

+#ifndef END

+#define END(sym)

+#endif

+

+#ifndef JUMPTARGET

+#define JUMPTARGET(sym)		sym

+#endif

+

+/* Makros to generate eh_frame unwind information.  */

+# ifdef HAVE_ASM_CFI_DIRECTIVES

+#  define cfi_startproc			.cfi_startproc

+#  define cfi_endproc			.cfi_endproc

+#  define cfi_def_cfa(reg, off)		.cfi_def_cfa reg, off

+#  define cfi_def_cfa_register(reg)	.cfi_def_cfa_register reg

+#  define cfi_def_cfa_offset(off)	.cfi_def_cfa_offset off

+#  define cfi_adjust_cfa_offset(off)	.cfi_adjust_cfa_offset off

+#  define cfi_offset(reg, off)		.cfi_offset reg, off

+#  define cfi_rel_offset(reg, off)	.cfi_rel_offset reg, off

+#  define cfi_register(r1, r2)		.cfi_register r1, r2

+#  define cfi_return_column(reg)	.cfi_return_column reg

+#  define cfi_restore(reg)		.cfi_restore reg

+#  define cfi_same_value(reg)		.cfi_same_value reg

+#  define cfi_undefined(reg)		.cfi_undefined reg

+#  define cfi_remember_state		.cfi_remember_state

+#  define cfi_restore_state		.cfi_restore_state

+#  define cfi_window_save		.cfi_window_save

+# else

+#  define cfi_startproc

+#  define cfi_endproc

+#  define cfi_def_cfa(reg, off)

+#  define cfi_def_cfa_register(reg)

+#  define cfi_def_cfa_offset(off)

+#  define cfi_adjust_cfa_offset(off)

+#  define cfi_offset(reg, off)

+#  define cfi_rel_offset(reg, off)

+#  define cfi_register(r1, r2)

+#  define cfi_return_column(reg)

+#  define cfi_restore(reg)

+#  define cfi_same_value(reg)

+#  define cfi_undefined(reg)

+#  define cfi_remember_state

+#  define cfi_restore_state

+#  define cfi_window_save

+# endif

+

+#else /* ! ASSEMBLER */

+# ifdef HAVE_ASM_CFI_DIRECTIVES

+#  define CFI_STRINGIFY(Name) CFI_STRINGIFY2 (Name)

+#  define CFI_STRINGIFY2(Name) #Name

+#  define CFI_STARTPROC	".cfi_startproc"

+#  define CFI_ENDPROC	".cfi_endproc"

+#  define CFI_DEF_CFA(reg, off)	\

+   ".cfi_def_cfa " CFI_STRINGIFY(reg) "," CFI_STRINGIFY(off)

+#  define CFI_DEF_CFA_REGISTER(reg) \

+   ".cfi_def_cfa_register " CFI_STRINGIFY(reg)

+#  define CFI_DEF_CFA_OFFSET(off) \

+   ".cfi_def_cfa_offset " CFI_STRINGIFY(off)

+#  define CFI_ADJUST_CFA_OFFSET(off) \

+   ".cfi_adjust_cfa_offset " CFI_STRINGIFY(off)

+#  define CFI_OFFSET(reg, off) \

+   ".cfi_offset " CFI_STRINGIFY(reg) "," CFI_STRINGIFY(off)

+#  define CFI_REL_OFFSET(reg, off) \

+   ".cfi_rel_offset " CFI_STRINGIFY(reg) "," CFI_STRINGIFY(off)

+#  define CFI_REGISTER(r1, r2) \

+   ".cfi_register " CFI_STRINGIFY(r1) "," CFI_STRINGIFY(r2)

+#  define CFI_RETURN_COLUMN(reg) \

+   ".cfi_return_column " CFI_STRINGIFY(reg)

+#  define CFI_RESTORE(reg) \

+   ".cfi_restore " CFI_STRINGIFY(reg)

+#  define CFI_UNDEFINED(reg) \

+   ".cfi_undefined " CFI_STRINGIFY(reg)

+#  define CFI_REMEMBER_STATE \

+   ".cfi_remember_state"

+#  define CFI_RESTORE_STATE \

+   ".cfi_restore_state"

+#  define CFI_WINDOW_SAVE \

+   ".cfi_window_save"

+# else

+#  define CFI_STARTPROC

+#  define CFI_ENDPROC

+#  define CFI_DEF_CFA(reg, off)

+#  define CFI_DEF_CFA_REGISTER(reg)

+#  define CFI_DEF_CFA_OFFSET(off)

+#  define CFI_ADJUST_CFA_OFFSET(off)

+#  define CFI_OFFSET(reg, off)

+#  define CFI_REL_OFFSET(reg, off)

+#  define CFI_REGISTER(r1, r2)

+#  define CFI_RETURN_COLUMN(reg)

+#  define CFI_RESTORE(reg)

+#  define CFI_UNDEFINED(reg)

+#  define CFI_REMEMBER_STATE

+#  define CFI_RESTORE_STATE

+#  define CFI_WINDOW_SAVE

+# endif

+

+#endif /* __ASSEMBLER__ */

-- 

1.5.6.5

toolchain/uClibc/uClibc-0.9.30-unifdef-getline.patch

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
--- uClibc-0.9.30.1.orig/extra/scripts/unifdef.c

+++ uClibc-0.9.30.1/extra/scripts/unifdef.c

@@ -206,7 +206,7 @@ static void             done(void);

 static void             error(const char *);

 static int              findsym(const char *);

 static void             flushline(bool);

-static Linetype         getline(void);

+static Linetype         get_line(void);

 static Linetype         ifeval(const char **);

 static void             ignoreoff(void);

 static void             ignoreon(void);

@@ -512,7 +512,7 @@ process(void)

 

 	for (;;) {

 		linenum++;

-		lineval = getline();

+		lineval = get_line();

 		trans_table[ifstate[depth]][lineval]();

 		debug("process %s -> %s depth %d",

 		    linetype_name[lineval],

@@ -526,7 +526,7 @@ process(void)

  * help from skipcomment().

  */

 static Linetype

-getline(void)

+get_line(void)

 {

 	const char *cp;

 	int cursym;