From 9098b1e1c0f170b51620b8bc63118b89a038dfc6 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 4 Dec 2015 21:22:30 +0000 Subject: [PATCH] glibc: Fix headers to build with new GCC Signed-off-by: Michael Tremer --- lfs/glibc | 1 + src/patches/glibc/glibc-mq_open.patch | 34 +++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 src/patches/glibc/glibc-mq_open.patch diff --git a/lfs/glibc b/lfs/glibc index d7d51cf8cb..bbf58e8097 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -292,6 +292,7 @@ endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-nss_test1.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-libgcc_s.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.12-accept-make-versions-4.0-and-greater.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-mq_open.patch # Fixes: # Makefile:235: *** mixed implicit and normal rules. Stop. diff --git a/src/patches/glibc/glibc-mq_open.patch b/src/patches/glibc/glibc-mq_open.patch new file mode 100644 index 0000000000..a7a0f11ede --- /dev/null +++ b/src/patches/glibc/glibc-mq_open.patch @@ -0,0 +1,34 @@ +From: https://sourceware.org/bugzilla/show_bug.cgi?id=12841 + +--- libc/rt/bits/mqueue2.h 2009-05-16 19:23:37.000000000 +0200 ++++ libc/rt/bits/mqueue2.h 2011-06-04 19:05:38.322333773 +0200 +@@ -1,5 +1,5 @@ + /* Checking macros for mq functions. +- Copyright (C) 2007 Free Software Foundation, Inc. ++ Copyright (C) 2007, 2011 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 +@@ -25,16 +25,18 @@ + parameter. */ + extern mqd_t mq_open (__const char *__name, int __oflag, ...) + __THROW __nonnull ((1)); +-extern mqd_t __mq_open_2 (__const char *__name, int __oflag) __nonnull ((1)); +-extern mqd_t __REDIRECT (__mq_open_alias, (__const char *__name, int __oflag, ...), +- mq_open) __nonnull ((1)); ++extern mqd_t __mq_open_2 (__const char *__name, int __oflag) ++ __THROW __nonnull ((1)); ++extern mqd_t __REDIRECT_NTH (__mq_open_alias, (__const char *__name, ++ int __oflag, ...), mq_open) ++ __nonnull ((1)); + __errordecl (__mq_open_wrong_number_of_args, + "mq_open can be called either with 2 or 4 arguments"); + __errordecl (__mq_open_missing_mode_and_attr, + "mq_open with O_CREAT in second argument needs 4 arguments"); + + __extern_always_inline mqd_t +-mq_open (__const char *__name, int __oflag, ...) ++__NTH (mq_open (__const char *__name, int __oflag, ...)) + { + if (__va_arg_pack_len () != 0 && __va_arg_pack_len () != 2) + __mq_open_wrong_number_of_args (); -- 2.39.5