From 49bdd526aba04608f9658d5c36923e10a2021df3 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 27 Mar 2008 19:57:41 +0000 Subject: [PATCH] * common.cc (Sort_commons::operator): Correct sorting algorithm. * testsuite/common_test_1.c: New file. * testsuite/Makefile.am (check_PROGRAMS): Add common_test_1. (common_test_1_SOURCES): New variable. (common_test_1_DEPENDENCIES): New variable. (common_test_1_LDFLAGS): New variable. --- gold/ChangeLog | 7 ++++ gold/common.cc | 8 +++-- gold/testsuite/Makefile.am | 4 +++ gold/testsuite/Makefile.in | 29 ++++++++++++++-- gold/testsuite/common_test_1.c | 75 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 117 insertions(+), 6 deletions(-) create mode 100644 gold/testsuite/common_test_1.c diff --git a/gold/ChangeLog b/gold/ChangeLog index 098b7e3..492e5c5 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,12 @@ 2008-03-27 Ian Lance Taylor + * common.cc (Sort_commons::operator): Correct sorting algorithm. + * testsuite/common_test_1.c: New file. + * testsuite/Makefile.am (check_PROGRAMS): Add common_test_1. + (common_test_1_SOURCES): New variable. + (common_test_1_DEPENDENCIES): New variable. + (common_test_1_LDFLAGS): New variable. + * symtab.cc (Symbol_table::add_from_object): Handle saw_undefined_ and commons_ correctly when NAME/VERSION does not override NAME/NULL. diff --git a/gold/common.cc b/gold/common.cc index f92637e..54b686d 100644 --- a/gold/common.cc +++ b/gold/common.cc @@ -93,19 +93,21 @@ Sort_commons::operator()(const Symbol* pa, const Symbol* pb) const const Sized_symbol* psa = symtab->get_sized_symbol(pa); const Sized_symbol* psb = symtab->get_sized_symbol(pb); + // Sort by largest size first. typename Sized_symbol::Size_type sa = psa->symsize(); typename Sized_symbol::Size_type sb = psb->symsize(); if (sa < sb) return false; - else if (sb > sa) + else if (sb < sa) return true; - // When the symbols are the same size, we sort them by alignment. + // When the symbols are the same size, we sort them by alignment, + // largest alignment first. typename Sized_symbol::Value_type va = psa->value(); typename Sized_symbol::Value_type vb = psb->value(); if (va < vb) return false; - else if (vb > va) + else if (vb < va) return true; // Otherwise we stabilize the sort by sorting by name. diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am index 4d0f9dc..0016f71 100644 --- a/gold/testsuite/Makefile.am +++ b/gold/testsuite/Makefile.am @@ -277,6 +277,10 @@ two_file_mixed_2_shared_test_LDADD = two_file_shared_mixed_1.so two_file_shared_ endif FN_PTRS_IN_SO_WITHOUT_PIC +check_PROGRAMS += common_test_1 +common_test_1_SOURCES = common_test_1.c +common_test_1_DEPENDENCIES = gcctestdir/ld +common_test_1_LDFLAGS = -Bgcctestdir/ check_PROGRAMS += exception_test check_PROGRAMS += exception_static_test diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in index f9c37f3..bc4f73a 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -102,7 +102,8 @@ check_PROGRAMS = object_unittest$(EXEEXT) binary_unittest$(EXEEXT) \ @FN_PTRS_IN_SO_WITHOUT_PIC_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_separate_shared_21_nonpic_test \ @FN_PTRS_IN_SO_WITHOUT_PIC_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_mixed_shared_test \ @FN_PTRS_IN_SO_WITHOUT_PIC_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_mixed_2_shared_test -@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_3 = exception_test \ +@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_3 = common_test_1 \ +@GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_test \ @GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_static_test \ @GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_shared_1_test \ @GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_shared_2_test \ @@ -110,6 +111,13 @@ check_PROGRAMS = object_unittest$(EXEEXT) binary_unittest$(EXEEXT) \ @GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_separate_shared_12_test \ @GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_separate_shared_21_test \ @GCC_TRUE@@NATIVE_LINKER_TRUE@ weak_test +@GCC_FALSE@common_test_1_DEPENDENCIES = libgoldtest.a ../libgold.a \ +@GCC_FALSE@ ../../libiberty/libiberty.a $(am__DEPENDENCIES_1) \ +@GCC_FALSE@ $(am__DEPENDENCIES_1) +@NATIVE_LINKER_FALSE@common_test_1_DEPENDENCIES = libgoldtest.a \ +@NATIVE_LINKER_FALSE@ ../libgold.a ../../libiberty/libiberty.a \ +@NATIVE_LINKER_FALSE@ $(am__DEPENDENCIES_1) \ +@NATIVE_LINKER_FALSE@ $(am__DEPENDENCIES_1) @GCC_FALSE@exception_test_DEPENDENCIES = libgoldtest.a ../libgold.a \ @GCC_FALSE@ ../../libiberty/libiberty.a $(am__DEPENDENCIES_1) \ @GCC_FALSE@ $(am__DEPENDENCIES_1) @@ -264,7 +272,8 @@ libgoldtest_a_OBJECTS = $(am_libgoldtest_a_OBJECTS) @FN_PTRS_IN_SO_WITHOUT_PIC_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_separate_shared_21_nonpic_test$(EXEEXT) \ @FN_PTRS_IN_SO_WITHOUT_PIC_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_mixed_shared_test$(EXEEXT) \ @FN_PTRS_IN_SO_WITHOUT_PIC_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_mixed_2_shared_test$(EXEEXT) -@GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_3 = exception_test$(EXEEXT) \ +@GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_3 = common_test_1$(EXEEXT) \ +@GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_test$(EXEEXT) \ @GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_static_test$(EXEEXT) \ @GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_shared_1_test$(EXEEXT) \ @GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_shared_2_test$(EXEEXT) \ @@ -327,6 +336,11 @@ binary_unittest_LDADD = $(LDADD) binary_unittest_DEPENDENCIES = libgoldtest.a ../libgold.a \ ../../libiberty/libiberty.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +am__common_test_1_SOURCES_DIST = common_test_1.c +@GCC_TRUE@@NATIVE_LINKER_TRUE@am_common_test_1_OBJECTS = \ +@GCC_TRUE@@NATIVE_LINKER_TRUE@ common_test_1.$(OBJEXT) +common_test_1_OBJECTS = $(am_common_test_1_OBJECTS) +common_test_1_LDADD = $(LDADD) am__constructor_static_test_SOURCES_DIST = constructor_test.cc @GCC_TRUE@@NATIVE_LINKER_TRUE@am__objects_1 = \ @GCC_TRUE@@NATIVE_LINKER_TRUE@ constructor_test.$(OBJEXT) @@ -614,7 +628,8 @@ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ SOURCES = $(libgoldtest_a_SOURCES) basic_pic_test.c \ basic_static_pic_test.c basic_static_test.c basic_test.c \ $(binary_test_SOURCES) $(binary_unittest_SOURCES) \ - $(constructor_static_test_SOURCES) $(constructor_test_SOURCES) \ + $(common_test_1_SOURCES) $(constructor_static_test_SOURCES) \ + $(constructor_test_SOURCES) \ $(exception_same_shared_test_SOURCES) \ $(exception_separate_shared_12_test_SOURCES) \ $(exception_separate_shared_21_test_SOURCES) \ @@ -651,6 +666,7 @@ SOURCES = $(libgoldtest_a_SOURCES) basic_pic_test.c \ DIST_SOURCES = $(libgoldtest_a_SOURCES) basic_pic_test.c \ basic_static_pic_test.c basic_static_test.c basic_test.c \ $(am__binary_test_SOURCES_DIST) $(binary_unittest_SOURCES) \ + $(am__common_test_1_SOURCES_DIST) \ $(am__constructor_static_test_SOURCES_DIST) \ $(am__constructor_test_SOURCES_DIST) \ $(am__exception_same_shared_test_SOURCES_DIST) \ @@ -985,6 +1001,9 @@ binary_unittest_SOURCES = binary_unittest.cc @FN_PTRS_IN_SO_WITHOUT_PIC_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@two_file_mixed_2_shared_test_DEPENDENCIES = gcctestdir/ld two_file_shared_mixed_1.so two_file_shared_2.so @FN_PTRS_IN_SO_WITHOUT_PIC_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@two_file_mixed_2_shared_test_LDFLAGS = -Bgcctestdir/ -Wl,-R,. @FN_PTRS_IN_SO_WITHOUT_PIC_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@two_file_mixed_2_shared_test_LDADD = two_file_shared_mixed_1.so two_file_shared_2.so +@GCC_TRUE@@NATIVE_LINKER_TRUE@common_test_1_SOURCES = common_test_1.c +@GCC_TRUE@@NATIVE_LINKER_TRUE@common_test_1_DEPENDENCIES = gcctestdir/ld +@GCC_TRUE@@NATIVE_LINKER_TRUE@common_test_1_LDFLAGS = -Bgcctestdir/ @GCC_TRUE@@NATIVE_LINKER_TRUE@exception_test_SOURCES = \ @GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_test_main.cc \ @GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_test_1.cc \ @@ -1152,6 +1171,9 @@ binary_test$(EXEEXT): $(binary_test_OBJECTS) $(binary_test_DEPENDENCIES) binary_unittest$(EXEEXT): $(binary_unittest_OBJECTS) $(binary_unittest_DEPENDENCIES) @rm -f binary_unittest$(EXEEXT) $(CXXLINK) $(binary_unittest_LDFLAGS) $(binary_unittest_OBJECTS) $(binary_unittest_LDADD) $(LIBS) +common_test_1$(EXEEXT): $(common_test_1_OBJECTS) $(common_test_1_DEPENDENCIES) + @rm -f common_test_1$(EXEEXT) + $(LINK) $(common_test_1_LDFLAGS) $(common_test_1_OBJECTS) $(common_test_1_LDADD) $(LIBS) constructor_static_test$(EXEEXT): $(constructor_static_test_OBJECTS) $(constructor_static_test_DEPENDENCIES) @rm -f constructor_static_test$(EXEEXT) $(CXXLINK) $(constructor_static_test_LDFLAGS) $(constructor_static_test_OBJECTS) $(constructor_static_test_LDADD) $(LIBS) @@ -1318,6 +1340,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binary_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binary_unittest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common_test_1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constructor_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception_test_1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception_test_2.Po@am__quote@ diff --git a/gold/testsuite/common_test_1.c b/gold/testsuite/common_test_1.c new file mode 100644 index 0000000..f5a28f4 --- /dev/null +++ b/gold/testsuite/common_test_1.c @@ -0,0 +1,75 @@ +/* common_test_1.c -- test common symbol sorting + + Copyright 2008 Free Software Foundation, Inc. + Written by Ian Lance Taylor + + 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. + + This is a test of a common symbol in the main program and a + versioned symbol in a shared library. The common symbol in the + main program should override the shared library symbol. */ + +#include + +/* Common symbols should be sorted by size, largest first, and then by + alignment, largest first. We mix up the names, because gas seems + to sort common symbols roughly by name. */ + +int c9[90]; +int c8[80]; +int c7[70]; +int c6[60]; +int c5[10]; +int c4[20]; +int c3[30]; +int c2[40]; +int c1[50]; + +int a1 __attribute__ ((aligned (1 << 9))); +int a2 __attribute__ ((aligned (1 << 8))); +int a3 __attribute__ ((aligned (1 << 7))); +int a4 __attribute__ ((aligned (1 << 6))); +int a5 __attribute__ ((aligned (1 << 1))); +int a6 __attribute__ ((aligned (1 << 2))); +int a7 __attribute__ ((aligned (1 << 3))); +int a8 __attribute__ ((aligned (1 << 4))); +int a9 __attribute__ ((aligned (1 << 5))); + +int +main (int argc __attribute__ ((unused)), char** argv __attribute__ ((unused))) +{ + assert (c5 > c4); + assert (c4 > c3); + assert (c3 > c2); + assert (c2 > c1); + assert (c1 > c6); + assert (c6 > c7); + assert (c7 > c8); + assert (c8 > c9); + + assert (&a1 < &a2); + assert (&a2 < &a3); + assert (&a3 < &a4); + assert (&a4 < &a9); + assert (&a9 < &a8); + assert (&a8 < &a7); + assert (&a7 < &a6); + assert (&a6 < &a5); + + return 0; +} -- 2.7.4