diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-08-11 01:49:56 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-08-11 01:49:56 +0000 |
| commit | 76573f21a1da685ba71ae23fbe81d9814a95e210 (patch) | |
| tree | 81356d4195c6ec323c1279f4081dd2df36384cbd | |
| parent | be57becf8444305defaa5456d26172b1a84659d8 (diff) | |
| download | uClibc-alpine-76573f21a1da685ba71ae23fbe81d9814a95e210.tar.bz2 uClibc-alpine-76573f21a1da685ba71ae23fbe81d9814a95e210.tar.xz | |
Sync with trunk.
| -rw-r--r-- | Rules.mak | 2 | ||||
| -rw-r--r-- | include/features.h | 10 | ||||
| -rw-r--r-- | ldso/ldso/sh/dl-startup.h | 3 |
3 files changed, 9 insertions, 6 deletions
@@ -61,7 +61,7 @@ HOSTCFLAGS = -O2 -Wall # probably leave all this stuff alone. MAJOR_VERSION := 0 MINOR_VERSION := 9 -SUBLEVEL := 27 +SUBLEVEL := 28 VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL) # Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc. LC_ALL := C diff --git a/include/features.h b/include/features.h index 5189c9d7d..92b839c39 100644 --- a/include/features.h +++ b/include/features.h @@ -259,11 +259,6 @@ #define __STDC_IEC_559__ 1 #define __STDC_IEC_559_COMPLEX__ 1 -#ifdef __UCLIBC_HAS_WCHAR__ -/* wchar_t uses ISO 10646-1 (2nd ed., published 2000-09-15) / Unicode 3.0. */ -#define __STDC_ISO_10646__ 200009L -#endif - /* This macro indicates that the installed library is uClibc. Use * __UCLIBC_MAJOR__ and __UCLIBC_MINOR__ to test for the features in * specific releases. */ @@ -280,6 +275,11 @@ #include <bits/uClibc_config.h> #undef __need_uClibc_config_h +#ifdef __UCLIBC_HAS_WCHAR__ +/* wchar_t uses ISO 10646-1 (2nd ed., published 2000-09-15) / Unicode 3.0. */ +# define __STDC_ISO_10646__ 200009L +#endif + /* There is an unwholesomely huge amount of code out there that depends on the * presence of GNU libc header files. We have GNU libc header files. So here * we commit a horrible sin. At this point, we _lie_ and claim to be GNU libc diff --git a/ldso/ldso/sh/dl-startup.h b/ldso/ldso/sh/dl-startup.h index 1ddfb1f12..60808f2df 100644 --- a/ldso/ldso/sh/dl-startup.h +++ b/ldso/ldso/sh/dl-startup.h @@ -26,6 +26,9 @@ asm( */ #define GET_ARGV(ARGVP, ARGS) ARGVP = ((unsigned long*) ARGS) +/* We can't call functions earlier in the dl startup process */ +#define NO_FUNCS_BEFORE_BOOTSTRAP + /* * Here is a macro to perform a relocation. This is only used when * bootstrapping the dynamic loader. RELP is the relocation that we |