[v3] Fix -Os related build and test failures.

Message ID 5238d7ae-3e33-741b-3e96-61aa0d85f45b@redhat.com
State Committed
Headers

Commit Message

Carlos O'Donell Oct. 31, 2016, 8:50 p.m. UTC
  On 10/31/2016 03:56 PM, Steve Ellcey wrote:
> On Mon, 2016-10-31 at 15:50 -0400, Carlos O'Donell wrote:
>>  
>> I have fix and I'm just testing it again on x86_64.
>>
>> Thank you for your patience :-)
>>
>> Cheers,
>> Carlos.
> 
> Sounds good.  FYI: I ran into this problem with nptl_db/thread_dbP.h,
> in addition to the files I mentioned.  I think those are the only
> instances of this problem.
> 
> Steve Ellcey
> 

This should fix it. Sorry for the lack of non-x86/x86_64 testing.

Like I said I'll set about setting up more crosses like the kernel
people do.

commit bb5badf17087099dd9140f812778f7a8615b2111
Author: Carlos O'Donell <carlos@redhat.com>
Date:   Mon Oct 31 16:46:57 2016 -0400

    Bug 20729: Include libc-internal.h where required.
    
    The original fix for bug 20729 failed to include
    libc-internal.h in the files that needed them and
    this caused build failures on machines that don't
    implicitly include this header. This commit fixes
    that by following the consensus rule that a header,
    if needed, should always be directly included.

---

Cheers,
Carlos.
  

Comments

Steve Ellcey Oct. 31, 2016, 8:59 p.m. UTC | #1
On Mon, 2016-10-31 at 16:50 -0400, Carlos O'Donell wrote:

> > 
> This should fix it. Sorry for the lack of non-x86/x86_64 testing.
> 
> Like I said I'll set about setting up more crosses like the kernel
> people do.


I checked out the new Top-of-tree and everything built fine.

Thanks,
Steve Ellcey
  

Patch

diff --git a/locale/weight.h b/locale/weight.h
index 1f61f01..19b8e4a 100644
--- a/locale/weight.h
+++ b/locale/weight.h
@@ -19,6 +19,8 @@ 
 #ifndef _WEIGHT_H_
 #define _WEIGHT_H_	1
 
+#include <libc-internal.h>
+
 /* Find index of weight.  */
 static inline int32_t __attribute__ ((always_inline))
 findidx (const int32_t *table,
diff --git a/locale/weightwc.h b/locale/weightwc.h
index e42ce13..ae18965 100644
--- a/locale/weightwc.h
+++ b/locale/weightwc.h
@@ -19,6 +19,8 @@ 
 #ifndef _WEIGHTWC_H_
 #define _WEIGHTWC_H_	1
 
+#include <libc-internal.h>
+
 /* Find index of weight.  */
 static inline int32_t __attribute__ ((always_inline))
 findidx (const int32_t *table,
diff --git a/nptl_db/thread_dbP.h b/nptl_db/thread_dbP.h
index b53f1c1..f448547 100644
--- a/nptl_db/thread_dbP.h
+++ b/nptl_db/thread_dbP.h
@@ -30,6 +30,7 @@ 
 #include "../nptl/pthreadP.h"  	/* This is for *_BITMASK only.  */
 #include <list.h>
 #include <gnu/lib-names.h>
+#include <libc-internal.h>
 
 /* Indeces for the symbol names.  */
 enum