[PATCH] Use "|" instead of "+" when combine the _IO_LINE_BUF and _IO_UNBUFFERED flags

[Feng Gao]

Hi Siddhesh,

Does it mean you have accepted my change ?

The results of "make check" are same whatever apply my change or not
in the last email.

The following are the platform details:
1. gcc version: (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3
2. Linux kernel vesion: 3.2.0-80
3. cpu info:Intel(R) Core(TM) i7-2600

When I run "make check" on another platform (32bits), I get different results.
1. Without my change:
FAIL: elf/check-abi-libc
FAIL: elf/tst-protected1a
FAIL: elf/tst-protected1b
XPASS: elf/tst-tlsalign
XPASS: elf/tst-tlsalign-static
FAIL: localedata/sort-test
FAIL: nptl/tst-cond21
FAIL: nptl/tst-setuid3
FAIL: stdlib/tst-makecontext
Summary of test results:
      7 FAIL
   2278 PASS
     87 XFAIL
      5 XPASS

2. With my change:
FAIL: elf/check-abi-libc
FAIL: elf/tst-protected1a
FAIL: elf/tst-protected1b
XPASS: elf/tst-tlsalign
XPASS: elf/tst-tlsalign-static
FAIL: malloc/tst-malloc-backtrace
FAIL: nptl/tst-setuid3
FAIL: stdlib/tst-makecontext
Summary of test results:
      6 FAIL
   2279 PASS
     87 XFAIL
      5 XPASS

The details of this platform are following:
1. gcc version:(Ubuntu 4.8.2-19ubuntu1) 4.8.2
2. Linux kernel version: Linux ubuntu 4.0.6+
3. cpu info: Intel(R) Core(TM) i5-4200U CPU

On Wed, Jul 8, 2015 at 4:22 PM, Siddhesh Poyarekar <siddhesh@redhat.com> wrote:
> On Wed, Jul 08, 2015 at 04:11:19PM +0800, Feng Gao wrote:
>> Now I get the reason why the "make check" hang.
>> The "make check" need start after make. (I am a little curious why it
>> will hang if not make )
>>
>> But the result is same whatever apply my change or not, it stops the
>> same step following:
>
> That is strange - I don't see that.  In any case, the generated
> libc.so with or without the patch is identical (tested by comparing
> outputs of objdump -d libc.so), so I'm going to push this change.
>
> Thanks,
> Siddhesh