Author: adconrad Date: 2013-11-23 18:59:44 +0000 (Sat, 23 Nov 2013) New Revision: 5788
Added: glibc-package/branches/eglibc-2.18/debian/patches/any/local-use-glibc-predef.diff Modified: glibc-package/branches/eglibc-2.18/debian/changelog glibc-package/branches/eglibc-2.18/debian/patches/series Log: debian/patches/any/local-use-glibc-predef.diff: Backport stdc-predef.h from glibc instead of eglibc, avoiding bits/predefs.h (closes: #717557) Modified: glibc-package/branches/eglibc-2.18/debian/changelog =================================================================== --- glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-23 11:49:20 UTC (rev 5787) +++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-23 18:59:44 UTC (rev 5788) @@ -69,6 +69,8 @@ on recent versions of gcc in nptl/tst-cleanup2 and nptl/tst-cleanupx2. * debian/patches/any/unsubmitted-tst-tlsmod-as-needed.diff: Fix linking tst-tlsmod5.so and tst-tlsmod6.so with an as-needed default toolchain. + * debian/patches/any/local-use-glibc-predef.diff: Backport stdc-predef.h + from glibc instead of eglibc, avoiding bits/predefs.h (closes: #717557) [ Samuel Thibault ] * patches/hurd-i386/libpthread_hurd_cond_timedwait.diff: Rebased. Added: glibc-package/branches/eglibc-2.18/debian/patches/any/local-use-glibc-predef.diff =================================================================== --- glibc-package/branches/eglibc-2.18/debian/patches/any/local-use-glibc-predef.diff (rev 0) +++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-use-glibc-predef.diff 2013-11-23 18:59:44 UTC (rev 5788) @@ -0,0 +1,56 @@ +Description: Use stdc-predef.h from glibc instead of eglibc +Author: Adam Conrad <adcon...@ubuntu.com> +Bug-Debian: http://bugs.debian.org/717557 + +--- eglibc-2.18.orig/Makefile ++++ eglibc-2.18/Makefile +@@ -59,7 +59,7 @@ endif # $(AUTOCONF) = no + $(addprefix install-, no-libc.a bin lib data headers others) + + headers := limits.h values.h features.h gnu-versions.h bits/libc-lock.h \ +- bits/xopen_lim.h gnu/libc-version.h stdc-predef.h bits/predefs.h ++ bits/xopen_lim.h gnu/libc-version.h stdc-predef.h + + echo-headers: subdir_echo-headers + +--- eglibc-2.18.orig/include/stdc-predef.h ++++ eglibc-2.18/include/stdc-predef.h +@@ -26,8 +26,36 @@ + explicitly includes a system header. GCC knows the name of this + header in order to preinclude it. */ + +-/* Define __STDC_IEC_559__ and other similar macros. */ +-#include <bits/predefs.h> ++/* glibc's intent is to support the IEC 559 math functionality, real ++ and complex. If the GCC (4.9 and later) predefined macros ++ specifying compiler intent are available, use them to determine ++ whether the overall intent is to support these features; otherwise, ++ presume an older compiler has intent to support these features and ++ define these macros by default. */ ++ ++#ifdef __GCC_IEC_559 ++# if __GCC_IEC_559 > 0 ++# define __STDC_IEC_559__ 1 ++# endif ++#elif defined (__arm__) ++# if defined (__VFP_FP__) && !defined (__SOFTFP__) ++# define __STDC_IEC_559__ 1 ++# endif ++#else ++# define __STDC_IEC_559__ 1 ++#endif ++ ++#ifdef __GCC_IEC_559_COMPLEX ++# if __GCC_IEC_559_COMPLEX > 0 ++# define __STDC_IEC_559_COMPLEX__ 1 ++# endif ++#elif defined (__arm__) ++# if defined (__VFP_FP__) && !defined (__SOFTFP__) ++# define __STDC_IEC_559_COMPLEX__ 1 ++# endif ++#else ++# define __STDC_IEC_559_COMPLEX__ 1 ++#endif + + /* wchar_t uses ISO/IEC 10646 (2nd ed., published 2011-03-15) / + Unicode 6.0. */ Modified: glibc-package/branches/eglibc-2.18/debian/patches/series =================================================================== --- glibc-package/branches/eglibc-2.18/debian/patches/series 2013-11-23 11:49:20 UTC (rev 5787) +++ glibc-package/branches/eglibc-2.18/debian/patches/series 2013-11-23 18:59:44 UTC (rev 5788) @@ -187,6 +187,7 @@ all/local-nis-shadow.diff any/local-rtlddir-cross.diff +any/local-use-glibc-predef.diff any/local-asserth-decls.diff any/local-bindresvport_blacklist.diff any/local-allocalim-header.diff -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vkiqj-0007ju...@moszumanska.debian.org