From 587d7092180a5f2053906b87ea2b25b2bf6b34c6 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Wed, 2 Mar 2011 22:42:47 +0100 Subject: make it possible to compile with -std=gnu99/c99 and use extern inlines When compiled with -std=gnu99/c99 __GNUC_GNU_INLINE__ is not defined Signed-off-by: Peter S. Mazinger --- include/features.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/features.h') diff --git a/include/features.h b/include/features.h index 1d47b5660..f4d70d70f 100644 --- a/include/features.h +++ b/include/features.h @@ -433,7 +433,7 @@ uClibc was built without large file support enabled. */ #if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \ && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__ \ - && (defined __extern_inline || defined __GNUC_GNU_INLINE__) + && (defined __extern_inline || defined __GNUC_GNU_INLINE__ || defined __GNUC_STDC_INLINE__) # define __USE_EXTERN_INLINES 1 #endif -- cgit v1.2.3 From 82098ab9b853c33ee8ade61c9510b295cc696de1 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Wed, 9 Mar 2011 09:23:48 +0100 Subject: guard *_chk() related stuff with UCLIBC_HAS_FORTIFY Guard x86_64 memset_chk/memcpy_chk be guarded by UCLIBC_HAS_FORTIFY. Compile ssp.c if one of SSP/FORTIFY is defined. Guard __chk_fail() with UCLIBC_HAS_FORTIFY and move its prototype to libc-internal.h. Disable _FORTIFY_SOURCE if UCLIBC_HAS_FORTIFY is not set. The config option itself is omitted on purpose, headers need to be reviewed and generic *_chk() functions need to be first provided. Signed-off-by: Peter S. Mazinger --- include/features.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/features.h') diff --git a/include/features.h b/include/features.h index f4d70d70f..41e83a93f 100644 --- a/include/features.h +++ b/include/features.h @@ -198,9 +198,12 @@ # define __OPTIMIZE_SIZE__ 1 /* disable unsupported features */ -# undef _FORTIFY_SOURCE # undef __LDBL_COMPAT +# ifndef __UCLIBC_HAS_FORTIFY__ +# undef _FORTIFY_SOURCE +# endif + # ifndef __UCLIBC_HAS_THREADS__ # if defined _REENTRANT || defined _THREAD_SAFE # warning requested reentrant code, but thread support was disabled -- cgit v1.2.3