This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] add section alignment/size hooks to gold plugin interface, revised


On Wed, Mar 9, 2016 at 8:16 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Wed, Mar 9, 2016 at 8:00 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> On Fri, Mar 4, 2016 at 2:22 PM, Cary Coutant <ccoutant@gmail.com> wrote:
>>>> I checked in this:
>>>>
>>>> commit 3f1f41f55f2fa5d390e57074477b6407302c8c46
>>>> Author: H.J. Lu <hjl.tools@gmail.com>
>>>> Date:   Fri Mar 4 08:28:12 2016 -0800
>>>>
>>>>     Add missing ChangeLog entries for commit 82838
>>>>
>>>>     Fix gold/testsuite/plugin_layout_with_alignment.sh permission.
>>>
>>> Thanks. I've also pushed this patch to fix a few "2015" entries that
>>> should have been "2016".
>>>
>>
>> The test failed with GCC 4.2:
>>
>> FAIL: plugin_layout_with_alignment.sh (exit: 1)
>> ===============================================
>>
>> incorrect ordering:
>> was: bss_item1 bss_item2 bss_item3 bss_item4
>> should have been: bss_item3 bss_item1 bss_item4 bss_item2
>>
>> Does GCC 4.2 support plugin?
>
> GCC 4.2 generates
>
>
>   [10] .data.v1_a2       PROGBITS        0000000000000000 000264
> 000002 00  WA  0   0  2
>   [11] .data.v2_a1       PROGBITS        0000000000000000 000266
> 000001 00  WA  0   0  1
>   [12] .data.v3_a8       PROGBITS        0000000000000000 000268
> 000008 00  WA  0   0  8
>   [13] .data.v4_a1       PROGBITS        0000000000000000 000270
> 000003 00  WA  0   0  1
>   [14] .bss.v1_a2        NOBITS          0000000000000000 000274
> 000002 00  WA  0   0  2
>   [15] .bss.v2_a1        NOBITS          0000000000000000 000274
> 000001 00  WA  0   0  1
>   [16] .bss.v3_a8        NOBITS          0000000000000000 000278
> 000008 00  WA  0   0  8
>   [17] .bss.v4_a1        NOBITS          0000000000000000 000278
> 000003 00  WA  0   0  1
>
> and GCC 5 generates
>
>  [ 4] .rodata.v1_a2     PROGBITS        0000000000000000 000040 000002
> 00   A  0   0  2
>   [ 5] .rodata.v2_a1     PROGBITS        0000000000000000 000042
> 000001 00   A  0   0  1
>   [ 6] .rodata.v3_a8     PROGBITS        0000000000000000 000048
> 000008 00   A  0   0  8
>   [ 7] .rodata.v4_a1     PROGBITS        0000000000000000 000050
> 000007 00   A  0   0  1
>   [ 8] .data.v1_a2       PROGBITS        0000000000000000 000058
> 000002 00  WA  0   0  2
>   [ 9] .data.v2_a1       PROGBITS        0000000000000000 00005a
> 000001 00  WA  0   0  1
>   [10] .data.v3_a8       PROGBITS        0000000000000000 000060
> 000008 00  WA  0   0  8
>   [11] .data.v4_a1       PROGBITS        0000000000000000 000068
> 000003 00  WA  0   0  1
>   [12] .bss.v1_a2        NOBITS          0000000000000000 00006c
> 000002 00  WA  0   0  2
>   [13] .bss.v2_a1        NOBITS          0000000000000000 00006c
> 000001 00  WA  0   0  1
>   [14] .bss.v3_a8        NOBITS          0000000000000000 000070
> 000008 00  WA  0   0  8
>   [15] .bss.v4_a1        NOBITS          0000000000000000 000070
> 000003 00  WA  0   0  1
>
> I got
>
> Expected 12 sections, found 8 sections
>
> with GCC 4.2.
>

I am checking this workaround.

-- 
H.J.
From f4b39cbe1ef51793c524584bf43a109b0d91ce3b Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Wed, 9 Mar 2016 08:27:03 -0800
Subject: [PATCH] Workaround a C++ bug in GCC 4.2 in gold test

G++ in GCC 4.2 silently ignores

---
__attribute__ ((section(".rodata.v1_a2")))
const short rodata_item1 = 101;
---

which leads to plugin_layout_with_alignment test failure with

Expected 12 sections, found 8 sections

since 4 .rodata sections are missing.  As a workaround, this patch
changes plugin_layout_with_alignment test from C++ to C.

	* testsuite/plugin_layout_with_alignment.cc: Renamed to ..
	* testsuite/plugin_layout_with_alignment.c: This.
	* testsuite/Makefile.am (plugin_layout_with_alignment.o): Updated.
	(plugin_layout_with_alignment): Likewise.
	* testsuite/Makefile.in: Regenerated.
---
 gold/ChangeLog                                 |  8 +++
 gold/testsuite/Makefile.am                     |  6 +--
 gold/testsuite/Makefile.in                     |  6 +--
 gold/testsuite/plugin_layout_with_alignment.c  | 72 ++++++++++++++++++++++++++
 gold/testsuite/plugin_layout_with_alignment.cc | 72 --------------------------
 5 files changed, 86 insertions(+), 78 deletions(-)
 create mode 100644 gold/testsuite/plugin_layout_with_alignment.c
 delete mode 100644 gold/testsuite/plugin_layout_with_alignment.cc

diff --git a/gold/ChangeLog b/gold/ChangeLog
index e1748b1..d2b6433 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,11 @@
+2016-03-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* testsuite/plugin_layout_with_alignment.cc: Renamed to ..
+	* testsuite/plugin_layout_with_alignment.c: This.
+	* testsuite/Makefile.am (plugin_layout_with_alignment.o): Updated.
+	(plugin_layout_with_alignment): Likewise.
+	* testsuite/Makefile.in: Regenerated.
+
 2016-03-08  Cary Coutant  <ccoutant@gmail.com>
 
         PR 19751
diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index 2920587..f5528d1 100644
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -2110,10 +2110,10 @@ plugin_section_order.o: plugin_section_order.c
 check_SCRIPTS += plugin_layout_with_alignment.sh
 check_DATA += plugin_layout_with_alignment.stdout
 MOSTLYCLEANFILES += plugin_layout_with_alignment
-plugin_layout_with_alignment.o: plugin_layout_with_alignment.cc
-	$(CXXCOMPILE) -O0 -c -ffunction-sections  -fdata-sections -g -o $@ $<
+plugin_layout_with_alignment.o: plugin_layout_with_alignment.c
+	$(COMPILE) -O0 -c -ffunction-sections  -fdata-sections -g -o $@ $<
 plugin_layout_with_alignment: plugin_layout_with_alignment.o plugin_section_alignment.so gcctestdir/ld
-	$(CXXLINK) -Bgcctestdir/ -Wl,--plugin,"./plugin_section_alignment.so" plugin_layout_with_alignment.o
+	$(LINK) -Bgcctestdir/ -Wl,--plugin,"./plugin_section_alignment.so" plugin_layout_with_alignment.o
 plugin_layout_with_alignment.stdout: plugin_layout_with_alignment
 	$(TEST_NM) -n --synthetic plugin_layout_with_alignment > plugin_layout_with_alignment.stdout
 
diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index 4eafa54..988d6f7 100644
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -6146,10 +6146,10 @@ uninstall-am:
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	$(LINK) -Bgcctestdir/ -shared plugin_section_order.o
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@plugin_section_order.o: plugin_section_order.c
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	$(COMPILE) -O0 -c -fpic -o $@ $<
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@plugin_layout_with_alignment.o: plugin_layout_with_alignment.cc
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	$(CXXCOMPILE) -O0 -c -ffunction-sections  -fdata-sections -g -o $@ $<
+@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@plugin_layout_with_alignment.o: plugin_layout_with_alignment.c
+@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	$(COMPILE) -O0 -c -ffunction-sections  -fdata-sections -g -o $@ $<
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@plugin_layout_with_alignment: plugin_layout_with_alignment.o plugin_section_alignment.so gcctestdir/ld
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	$(CXXLINK) -Bgcctestdir/ -Wl,--plugin,"./plugin_section_alignment.so" plugin_layout_with_alignment.o
+@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	$(LINK) -Bgcctestdir/ -Wl,--plugin,"./plugin_section_alignment.so" plugin_layout_with_alignment.o
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@plugin_layout_with_alignment.stdout: plugin_layout_with_alignment
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	$(TEST_NM) -n --synthetic plugin_layout_with_alignment > plugin_layout_with_alignment.stdout
 
diff --git a/gold/testsuite/plugin_layout_with_alignment.c b/gold/testsuite/plugin_layout_with_alignment.c
new file mode 100644
index 0000000..5d6ff1f
--- /dev/null
+++ b/gold/testsuite/plugin_layout_with_alignment.c
@@ -0,0 +1,72 @@
+// plugin_layout_with_alignment.cc -- a test case for gold
+
+// Copyright (C) 2016 Free Software Foundation, Inc.
+// Written by Than McIntosh <thanm@google.com>.
+
+// This file is part of gold.
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+// MA 02110-1301, USA.
+
+// Verify that plugin interfaces for section size and alignment work
+// correctly, and that section ordering via plugins is working
+// for .bss/.rodata/.data sections.
+
+// --- Initialized .rodata items
+
+__attribute__ ((section(".rodata.v1_a2")))
+const short rodata_item1 = 101;
+
+__attribute__ ((section(".rodata.v2_a1")))
+const char rodata_item2 = 'a';
+
+__attribute__ ((section(".rodata.v3_a8")))
+const double rodata_item3 = 777.777;
+
+__attribute__ ((section(".rodata.v4_a1")))
+const char rodata_item4[7] = {'1', '2', '3', '4', '5', '6', '7'};
+
+// --- Initialized .data items
+
+__attribute__ ((section(".data.v1_a2")))
+short rwdata_item1 = 101;
+
+__attribute__ ((section(".data.v2_a1")))
+char rwdata_item2 = 'a';
+
+__attribute__ ((section(".data.v3_a8")))
+double rwdata_item3 = 'b';
+
+__attribute__ ((section(".data.v4_a1")))
+char rwdata_item4[3] = {'a', 'b', 'c'};
+
+// --- Uninitialized .data items
+
+__attribute__ ((section(".bss.v1_a2")))
+short bss_item1;
+
+__attribute__ ((section(".bss.v2_a1")))
+char bss_item2;
+
+__attribute__ ((section(".bss.v3_a8")))
+struct blah { union { double d; char c; } u; } bss_item3;
+
+__attribute__ ((section(".bss.v4_a1")))
+char bss_item4[3];
+
+int main (void)
+{
+  return 0;
+}
diff --git a/gold/testsuite/plugin_layout_with_alignment.cc b/gold/testsuite/plugin_layout_with_alignment.cc
deleted file mode 100644
index 0824d74..0000000
--- a/gold/testsuite/plugin_layout_with_alignment.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// plugin_layout_with_alignment.cc -- a test case for gold
-
-// Copyright (C) 2016 Free Software Foundation, Inc.
-// Written by Than McIntosh <thanm@google.com>.
-
-// This file is part of gold.
-
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-// MA 02110-1301, USA.
-
-// Verify that plugin interfaces for section size and alignment work
-// correctly, and that section ordering via plugins is working
-// for .bss/.rodata/.data sections.
-
-// --- Initialized .rodata items
-
-__attribute__ ((section(".rodata.v1_a2")))
-const short rodata_item1 = 101;
-
-__attribute__ ((section(".rodata.v2_a1")))
-const char rodata_item2 = 'a';
-
-__attribute__ ((section(".rodata.v3_a8")))
-const double rodata_item3 = 777.777;
-
-__attribute__ ((section(".rodata.v4_a1")))
-const char rodata_item4[7] = {'1', '2', '3', '4', '5', '6', '7'};
-
-// --- Initialized .data items
-
-__attribute__ ((section(".data.v1_a2")))
-short rwdata_item1 = 101;
-
-__attribute__ ((section(".data.v2_a1")))
-char rwdata_item2 = 'a';
-
-__attribute__ ((section(".data.v3_a8")))
-double rwdata_item3 = 'b';
-
-__attribute__ ((section(".data.v4_a1")))
-char rwdata_item4[3] = {'a', 'b', 'c'};
-
-// --- Uninitialized .data items
-
-__attribute__ ((section(".bss.v1_a2")))
-short bss_item1;
-
-__attribute__ ((section(".bss.v2_a1")))
-char bss_item2;
-
-__attribute__ ((section(".bss.v3_a8")))
-struct blah { union { double d; char c; } u; } bss_item3;
-
-__attribute__ ((section(".bss.v4_a1")))
-char bss_item4[3];
-
-int main ()
-{
-  return 0;
-}
-- 
2.5.0


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]