diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-05-26 20:22:12 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-05-26 20:22:12 +0000 |
| commit | 7f3ba18d20185cdea0ff71dc92e41119b1719e37 (patch) | |
| tree | 1354ef97555e7c6ecf75d5b601c7b64cef9b8d5a /patches | |
| parent | f76246f3a2f757f21544dd7b3aaa473de5502ac8 (diff) | |
| download | OSELAS.Toolchain-7f3ba18d20185cdea0ff71dc92e41119b1719e37.tar.gz OSELAS.Toolchain-7f3ba18d20185cdea0ff71dc92e41119b1719e37.tar.xz | |
git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/branches/OSELAS.Toolchain-mkl@6478 f8d472c7-5700-0410-ac5a-87979cec3adf
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/glibc-2.7/generic/cross_timezone.diff | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/patches/glibc-2.7/generic/cross_timezone.diff b/patches/glibc-2.7/generic/cross_timezone.diff index 75ea2ab..d85d241 100644 --- a/patches/glibc-2.7/generic/cross_timezone.diff +++ b/patches/glibc-2.7/generic/cross_timezone.diff @@ -11,7 +11,7 @@ Description: Adds native compile support to the build system then uses that for creating the locale-archive. --- - Makeconfig | 14 ++++++++++++++ + Makeconfig | 13 +++++++++++++ Makerules | 9 ++++++++- Rules | 9 ++++++++- iconv/Makefile | 4 ++++ @@ -20,15 +20,16 @@ Description: Adds native compile support to the build system then uses that include-native/config.h | 1 + include-native/gnu/stubs.h | 1 + include-native/intl/loadinfo.h | 4 ++++ - include-native/libintl.h | 13 +++++++++++++ + include-native/libintl.h | 11 +++++++++++ include-native/symbol-hacks.h | 1 + + include-native/sys/types.h | 9 +++++++++ include-native/tls.h | 11 +++++++++++ locale/Makefile | 9 +++++++++ localedata/Makefile | 5 +++++ malloc/Makefile | 5 ----- sunrpc/Makefile | 23 ++++++++++++++++++----- timezone/Makefile | 14 ++++++++++---- - 17 files changed, 120 insertions(+), 24 deletions(-) + 18 files changed, 126 insertions(+), 24 deletions(-) Index: glibc-2.7/iconv/Makefile =================================================================== @@ -123,9 +124,7 @@ Index: glibc-2.7/include-native/libintl.h =================================================================== --- /dev/null +++ glibc-2.7/include-native/libintl.h -@@ -0,0 +1,13 @@ -+#include_next <libintl.h> -+ +@@ -0,0 +1,11 @@ +#ifndef _ +#define _(X) (X) +#endif @@ -208,21 +207,20 @@ Index: glibc-2.7/Makeconfig =================================================================== --- glibc-2.7.orig/Makeconfig +++ glibc-2.7/Makeconfig -@@ -445,6 +445,13 @@ ifndef +link-static +@@ -445,6 +445,12 @@ ifndef +link-static $(common-objpfx)libc% $(+postinit),$^) \ $(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit) endif +# Command for linking programs against the host system. +ifndef +link-native -++link-native = $(BUILD_CC) -static -g -o $@ $^ \ +++link-native = $(BUILD_CC) -g -o $@ $^ \ + $(LDFLAGS) $(LDFLAGS-$(@F)) \ -+ $(combreloc-LDFLAGS) $(relro-LDFLAGS) \ + $(link-extra-libs) +endif # Command for statically linking bounded-pointer programs with the C library. ifndef +link-bounded +link-bounded = $(CC) -nostdlib -nostartfiles -static -fbounded-pointers -o $@ \ -@@ -658,6 +665,8 @@ endif # $(+cflags) == "" +@@ -658,6 +664,8 @@ endif # $(+cflags) == "" $(+sysdep-includes) $(includes) \ $(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes) @@ -231,7 +229,7 @@ Index: glibc-2.7/Makeconfig # Since libio has several internal header files, we use a -I instead # of many little headers in the include directory. libio-include = -I$(..)libio -@@ -672,10 +681,15 @@ CPPFLAGS = $($(subdir)-CPPFLAGS) $(+incl +@@ -672,10 +680,15 @@ CPPFLAGS = $($(subdir)-CPPFLAGS) $(+incl $(foreach lib,$(libof-$(basename $(@F))) \ $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \ $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F))) @@ -475,3 +473,17 @@ Index: glibc-2.7/timezone/Makefile tz-cflags = -DTZDIR='"$(zonedir)"' \ -DTZDEFAULT='"$(localtime-file)"' \ +Index: glibc-2.7/include-native/sys/types.h +=================================================================== +--- /dev/null ++++ glibc-2.7/include-native/sys/types.h +@@ -0,0 +1,9 @@ ++#include_next <sys/types.h> ++ ++#ifndef __u_char_defined ++# define __u_char_defined ++#endif ++#ifndef __daddr_t_defined ++# define __daddr_t_defined ++#endif ++ |