1 files changed, 1944 insertions, 0 deletions

<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">

<!-- Dummy chapter -->
<appendix id='ref-variables-glos'>

<title>Reference: Variables Glossary</title>

<para>
    This section lists common variables used in Poky and gives an overview
    of their function and contents.
</para>

<glossary id='ref-variables-glossary'>


    <para>
       <link linkend='var-glossary-a'>A</link> 
       <link linkend='var-glossary-b'>B</link> 
       <link linkend='var-glossary-c'>C</link> 
       <link linkend='var-glossary-d'>D</link> 
       <link linkend='var-glossary-e'>E</link> 
       <link linkend='var-glossary-f'>F</link> 
<!--               <link linkend='var-glossary-g'>G</link> -->
       <link linkend='var-glossary-h'>H</link> 
       <link linkend='var-glossary-i'>I</link> 
<!--               <link linkend='var-glossary-j'>J</link> -->
       <link linkend='var-glossary-k'>K</link>
       <link linkend='var-glossary-l'>L</link> 
       <link linkend='var-glossary-m'>M</link> 
<!--               <link linkend='var-glossary-n'>N</link> -->
<!--               <link linkend='var-glossary-o'>O</link> -->
       <link linkend='var-glossary-p'>P</link> 
<!--               <link linkend='var-glossary-q'>Q</link> -->
       <link linkend='var-glossary-r'>R</link> 
       <link linkend='var-glossary-s'>S</link> 
       <link linkend='var-glossary-t'>T</link> 
<!--               <link linkend='var-glossary-u'>U</link> -->
<!--               <link linkend='var-glossary-v'>V</link> -->
       <link linkend='var-glossary-w'>W</link> 
<!--               <link linkend='var-glossary-x'>X</link> -->
<!--               <link linkend='var-glossary-y'>Y</link> -->
<!--               <link linkend='var-glossary-z'>Z</link>-->
    </para>

    <glossdiv id='var-glossary-a'><title>A</title>

         <glossentry id='var-AUTHOR'><glossterm>AUTHOR</glossterm>
            <glossdef>
                <para>E-mail address to contact original author(s) - to
                send patches, forward bugs...</para>
            </glossdef>
         </glossentry>

        <glossentry id='var-AUTOREV'><glossterm>AUTOREV</glossterm>
            <glossdef>
                <para>Use current (newest) source revision - used with
                    <glossterm><link linkend='var-SRCREV'>SRCREV</link></glossterm>
                    variable.</para>
            </glossdef>
        </glossentry>

    </glossdiv>

    <glossdiv id='var-glossary-b'><title>B</title>

        <glossentry id='var-BB_NUMBER_THREADS'><glossterm>BB_NUMBER_THREADS</glossterm>
            <glossdef>
                <para>Number of BitBake threads</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-BBFILES'><glossterm>BBFILES</glossterm>
            <glossdef>
                <para>List of recipes used by BitBake to build software</para>
            </glossdef>
        </glossentry>

        <!-- BBPATH is not a usable variable in .bb files and should not be listed here -->

        <glossentry id='var-BBINCLUDELOGS'><glossterm>BBINCLUDELOGS</glossterm>
            <glossdef>
                <para>Variable which controls how BitBake displays logs on build failure.</para>
            </glossdef>
        </glossentry>

    </glossdiv>

    <glossdiv id='var-glossary-c'><title>C</title>

        <glossentry id='var-CFLAGS'><glossterm>CFLAGS</glossterm>
            <glossdef>
                <para>
                    Flags passed to C compiler for the target system. Evaluates to the same 
                    as <link linkend='var-TARGET_CFLAGS'>TARGET_CFLAGS</link>.
                </para>
            </glossdef>
        </glossentry>

        <glossentry id='var-COMPATIBLE_MACHINE'><glossterm>COMPATIBLE_MACHINE</glossterm>
            <glossdef>
                <para>A regular expression which evalutates to match the machines the recipe 
                works with. It stops recipes being run on machines they're incompatible with 
                which is partciuarly useful with kernels. It also helps to to increase parsing 
                speed as if its found the current machine is not compatible, further parsing 
                of the recipe is skipped.</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-CONFIG_SITE'><glossterm>CONFIG_SITE</glossterm>
            <glossdef>
                <para>
                    Contains a list of files which containing autoconf test results relevant 
                    to the current build. This variable is used by the autotools utilities 
                    when running configure.
                </para>
            </glossdef>
        </glossentry>


        <glossentry id='var-CVS_TARBALL_STASH'><glossterm>CVS_TARBALL_STASH</glossterm>
            <glossdef>
                <para>Location to search for
                pre-generated tarballs when fetching from remote SCM
                repositories (CVS/SVN/GIT)</para>
            </glossdef>
        </glossentry>

    </glossdiv>

    <glossdiv id='var-glossary-d'><title>D</title>

        <glossentry id='var-D'><glossterm>D</glossterm>
            <glossdef>
                <para>Destination directory</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-DEBUG_BUILD'><glossterm>DEBUG_BUILD</glossterm>
            <glossdef>
                <para>
                    Build packages with debugging information. This influences the value 
                    <link linkend='var-SELECTED_OPTIMIZATION'>SELECTED_OPTIMIZATION</link> 
                    takes.
                </para>
            </glossdef>
        </glossentry>

        <glossentry id='var-DEBUG_OPTIMIZATION'><glossterm>DEBUG_OPTIMIZATION</glossterm>
            <glossdef>
                <para>
                    The options to pass in <link linkend='var-TARGET_CFLAGS'>TARGET_CFLAGS</link>
                    and <link linkend='var-CFLAGS'>CFLAGS</link> when compiling a system for debugging.
                    This defaults to "-O -fno-omit-frame-pointer -g".
                </para>
            </glossdef>
        </glossentry>

        <glossentry id='var-DEFAULT_PREFERENCE'><glossterm>DEFAULT_PREFERENCE</glossterm>
            <glossdef>
                <para>Priority of recipe</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-DEPENDS'><glossterm>DEPENDS</glossterm>
            <glossdef>
                <para>
                    A list of build time dependencies for a given recipe. These indicate 
                    recipes that must have staged before this recipe can configure.
                </para>
            </glossdef>
        </glossentry>

        <glossentry id='var-DESCRIPTION'><glossterm>DESCRIPTION</glossterm>
            <glossdef>
                <para>Package description used by package
                    managers</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-DESTDIR'><glossterm>DESTDIR</glossterm>
            <glossdef>
                <para>Destination directory</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-DISTRO'><glossterm>DISTRO</glossterm>
            <glossdef>
                <para>Short name of distribution</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-DISTRO_EXTRA_RDEPENDS'><glossterm>DISTRO_EXTRA_RDEPENDS</glossterm>
            <glossdef>
                <para>List of packages required by distribution.</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-DISTRO_EXTRA_RRECOMMENDS'><glossterm>DISTRO_EXTRA_RRECOMMENDS</glossterm>
            <glossdef>
                <para>List of packages which extend usability of
                    image. Those packages will be automatically
                    installed but can be removed by user.</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-DISTRO_FEATURES'><glossterm>DISTRO_FEATURES</glossterm>
            <glossdef>
                <para>Features of the distribution.</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-DISTRO_NAME'><glossterm>DISTRO_NAME</glossterm>
            <glossdef>
                <para>Long name of distribution</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-DISTRO_VERSION'><glossterm>DISTRO_VERSION</glossterm>
            <glossdef>
                <para>Version of distribution</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-DL_DIR'><glossterm>DL_DIR</glossterm>
            <glossdef>
                <para>Directory where all fetched sources will be stored</para>
            </glossdef>

        </glossentry>
    </glossdiv>

    <glossdiv id='var-glossary-e'><title>E</title>

        <glossentry id='var-ENABLE_BINARY_LOCALE_GENERATION'><glossterm>ENABLE_BINARY_LOCALE_GENERATION</glossterm>
            <glossdef>
                <para>Variable which control which locales for glibc are
                to be generated during build (useful if target device
                has 64M RAM or less)</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-EXTRA_OECONF'><glossterm>EXTRA_OECONF</glossterm>
            <glossdef>
                <para>Additional 'configure' script options</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-EXTRA_OEMAKE'><glossterm>EXTRA_OEMAKE</glossterm>
            <glossdef>
                <para>Additional GNU make options</para>
            </glossdef>
        </glossentry>

    </glossdiv>

    <glossdiv id='var-glossary-f'><title>F</title>

        <glossentry id='var-FILES'><glossterm>FILES</glossterm>
            <glossdef>
                <para>list of directories/files which will be placed
                    in packages</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-FULL_OPTIMIZATION'><glossterm>FULL_OPTIMIZATION</glossterm>
            <glossdef>
                <para>
                    The options to pass in <link linkend='var-TARGET_CFLAGS'>TARGET_CFLAGS</link>
                    and <link linkend='var-CFLAGS'>CFLAGS</link> when compiling an optimised system.
                    This defaults to "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2".
                </para>
            </glossdef>
        </glossentry>

    </glossdiv>

<!--            <glossdiv id='var-glossary-g'><title>G</title>-->
<!--            </glossdiv>-->

    <glossdiv id='var-glossary-h'><title>H</title>

        <glossentry id='var-HOMEPAGE'><glossterm>HOMEPAGE</glossterm>
            <glossdef>
                <para>Website where more info about package can be found</para>
            </glossdef>
        </glossentry>

    </glossdiv>

    <glossdiv id='var-glossary-i'><title>I</title>

        <glossentry id='var-IMAGE_FEATURES'><glossterm>IMAGE_FEATURES</glossterm>
            <glossdef>
                <para><link linkend="ref-features-image">List of
                features</link> present in resulting images</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-IMAGE_FSTYPES'><glossterm>IMAGE_FSTYPES</glossterm>
            <glossdef>
                <para>Formats of rootfs images which we want to have
                    created</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-IMAGE_INSTALL'><glossterm>IMAGE_INSTALL</glossterm>
            <glossdef>
                <para>List of packages used to build image</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-INHIBIT_PACKAGE_STRIP'><glossterm>INHIBIT_PACKAGE_STRIP</glossterm>
            <glossdef>
                <para>
                    This variable causes the build to not strip binaries in
                    resulting packages.
                </para>
            </glossdef>
        </glossentry>


        <glossentry id='var-INHERIT'><glossterm>INHERIT</glossterm>
            <glossdef>
                <para>
                    This variable causes the named class to be inherited at 
                    this point during parsing. Its only valid in configuration 
                    files.
                </para>
            </glossdef>
        </glossentry>


        <glossentry id='var-INITSCRIPT_PACKAGES'><glossterm>INITSCRIPT_PACKAGES</glossterm>
            <glossdef>
                <para>
                    Scope: Used in recipes when using update-rc.d.bbclass. Optional, defaults to PN.
                </para>
                <para>
                    A list of the packages which contain initscripts. If multiple 
                    packages are specified you need to append the package name 
                    to the other INITSCRIPT_* as an override.
                </para>
            </glossdef>
        </glossentry>

        <glossentry id='var-INITSCRIPT_NAME'><glossterm>INITSCRIPT_NAME</glossterm>
            <glossdef>
                <para>
                    Scope: Used in recipes when using update-rc.d.bbclass. Mandatory.
                </para>
                <para>
                    The filename of the initscript (as installed to ${etcdir}/init.d).
                </para>
            </glossdef>
        </glossentry>

        <glossentry id='var-INITSCRIPT_PARAMS'><glossterm>INITSCRIPT_PARAMS</glossterm>
            <glossdef>
                <para>
                    Scope: Used in recipes when using update-rc.d.bbclass. Mandatory.
                </para>
                <para>
                    Specifies the options to pass to update-rc.d. An example is
                     "start 99 5 2 . stop 20 0 1 6 ." which gives the script a 
                    runlevel of 99, starts the script in initlevels 2 and 5 and 
                     stops it in levels 0, 1 and 6. 
                </para>
            </glossdef>
        </glossentry>


    </glossdiv>

<!--            <glossdiv id='var-glossary-j'><title>J</title>-->
<!--            </glossdiv>-->

   <glossdiv id='var-glossary-k'><title>K</title>

        <glossentry id='var-KERNEL_IMAGETYPE'><glossterm>KERNEL_IMAGETYPE</glossterm>
            <glossdef>
                <para>The type of kernel to build for a device, usually set by the 
                machine configuration files and defaults to "zImage". This is used 
                when building the kernel and is passed to "make" as the target to 
                build.</para>
            </glossdef>
        </glossentry>

   </glossdiv>

    <glossdiv id='var-glossary-l'><title>L</title>

        <glossentry id='var-LICENSE'><glossterm>LICENSE</glossterm>
            <glossdef>
                <para>List of package source licenses.</para>
            </glossdef>
        </glossentry>

    </glossdiv>

    <glossdiv id='var-glossary-m'><title>M</title>

         <glossentry id='var-MACHINE'><glossterm>MACHINE</glossterm>
            <glossdef>
                <para>Target device</para>
            </glossdef>
         </glossentry>

         <glossentry id='var-MACHINE_ESSENTIAL_RDEPENDS'><glossterm>MACHINE_ESSENTIAL_RDEPENDS</glossterm>
            <glossdef>
                <para>List of packages required to boot device</para>
            </glossdef>
         </glossentry>

         <glossentry id='var-MACHINE_ESSENTIAL_RRECOMMENDS'><glossterm>MACHINE_ESSENTIAL_RRECOOMENDS</glossterm>
            <glossdef>
                <para>List of packages required to boot device (usually
                    additional kernel modules)</para>
            </glossdef>
        </glossentry>

         <glossentry id='var-MACHINE_EXTRA_RDEPENDS'><glossterm>MACHINE_EXTRA_RDEPENDS</glossterm>
            <glossdef>
                <para>List of packages required to use device</para>
            </glossdef>
         </glossentry>

         <glossentry id='var-MACHINE_EXTRA_RRECOMMENDS'><glossterm>MACHINE_EXTRA_RRECOMMNEDS</glossterm>
            <glossdef>
                <para>List of packages useful to use device (for example
                    additional kernel modules)</para>
            </glossdef>
         </glossentry>

         <glossentry id='var-MACHINE_FEATURES'><glossterm>MACHINE_FEATURES</glossterm>
            <glossdef>
                <para>List of device features - defined in <link
                    linkend='ref-features-machine'>machine
                    features section</link></para>
            </glossdef>
         </glossentry>

        <glossentry id='var-MAINTAINER'><glossterm>MAINTAINER</glossterm>
            <glossdef>
                <para>E-mail of distribution maintainer</para>
            </glossdef>
        </glossentry>
    </glossdiv>

<!--            <glossdiv id='var-glossary-n'><title>N</title>-->
<!--            </glossdiv>-->

<!--            <glossdiv id='var-glossary-o'><title>O</title>-->
<!--            </glossdiv>-->

    <glossdiv id='var-glossary-p'><title>P</title>

        <glossentry id='var-PACKAGE_ARCH'><glossterm>PACKAGE_ARCH</glossterm>
            <glossdef>
                <para>Architecture of resulting package</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-PACKAGE_CLASSES'><glossterm>PACKAGE_CLASSES</glossterm>
            <glossdef>
                <para>List of resulting packages formats</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-PACKAGE_EXTRA_ARCHS'><glossterm>PACKAGE_EXTRA_ARCHS</glossterm>
            <glossdef>
                <para>List of architectures compatible with device
                    CPU. Usable when build is done for few different
                    devices with misc processors (like XScale and
                    ARM926-EJS)</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-PACKAGES'><glossterm>PACKAGES</glossterm>
            <glossdef>
                <para>List of packages to be created from recipe.
                    The default value is "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev"</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-PN'><glossterm>PN</glossterm>
            <glossdef>
                <para>Name of package.
                    </para>
            </glossdef>
        </glossentry>

        <glossentry id='var-PR'><glossterm>PR</glossterm>
            <glossdef>
                <para>Revision of package.
                    </para>
            </glossdef>
        </glossentry>

        <glossentry id='var-PV'><glossterm>PV</glossterm>
            <glossdef>
                <para>Version of package.
                    The default value is "1.0"</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-PE'><glossterm>PE</glossterm>
            <glossdef>
                <para>
                    Epoch of the package. The default value is "1". The field is used 
                    to make upgrades possible when the versioning scheme changes in 
                    some backwards incompatible way.
                </para>
            </glossdef>
        </glossentry>

        <glossentry id='var-PREFERRED_PROVIDER'><glossterm>PREFERRED_PROVIDER</glossterm>
            <glossdef>
                <para>If multiple recipes provide an item, this variable
                    determines which one should be given preference. It 
                    should be set to the "$PN" of the recipe to be preferred.</para>
            </glossdef>
        </glossentry>

        <glossentry id='var-PREFERRED_VERSION'><glossterm>PREFERRED_VERSION</glossterm>
            <glossdef>
                <para>
                    If there are multiple versions of recipe available, this
                    variable determines which one should be given preference. It
                    should be set to the "$PV" of the recipe to be preferred.
                </para>
            </glossdef>
        </glossentry>

        <glossentry id='var-POKYLIBC'><glossterm>POKYLIBC</glossterm>
+       align = this->align_->eval_with_dot(symtab, layout, true, *dot_value,
+-					  NULL, &align_section, NULL);
++					  NULL, &align_section, NULL, false);
+       if (align_section != NULL)
+ 	gold_warning(_("alignment of section %s is not absolute"),
+ 		     this->name_.c_str());
+@@ -2401,7 +2413,7 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
+       laddr = this->load_address_->eval_with_dot(symtab, layout, true,
+ 						 *dot_value,
+ 						 this->output_section_,
+-						 NULL, NULL);
++						 NULL, NULL, false);
+       if (this->output_section_ != NULL)
+         this->output_section_->set_load_address(laddr);
+     }
+@@ -2416,7 +2428,8 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
+       Output_section* subalign_section;
+       subalign = this->subalign_->eval_with_dot(symtab, layout, true,
+ 						*dot_value, NULL,
+-						&subalign_section, NULL);
++						&subalign_section, NULL,
++						false);
+       if (subalign_section != NULL)
+ 	gold_warning(_("subalign of section %s is not absolute"),
+ 		     this->name_.c_str());
+@@ -2431,7 +2444,7 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
+       uint64_t fill_val = this->fill_->eval_with_dot(symtab, layout, true,
+ 						     *dot_value,
+ 						     NULL, &fill_section,
+-						     NULL);
++						     NULL, false);
+       if (fill_section != NULL)
+ 	gold_warning(_("fill of section %s is not absolute"),
+ 		     this->name_.c_str());
+diff --git a/gold/script.cc b/gold/script.cc
+index 7df0c9e..b471cf9 100644
+--- a/gold/script.cc
++++ b/gold/script.cc
+@@ -983,18 +983,20 @@ Symbol_assignment::sized_finalize(Symbol_table* symtab, const Layout* layout,
+   uint64_t final_val = this->val_->eval_maybe_dot(symtab, layout, true,
+ 						  is_dot_available,
+ 						  dot_value, dot_section,
+-						  &section, NULL);
++						  &section, NULL, false);
+   Sized_symbol<size>* ssym = symtab->get_sized_symbol<size>(this->sym_);
+   ssym->set_value(final_val);
+   if (section != NULL)
+     ssym->set_output_section(section);
+ }
+ 
+-// Set the symbol value if the expression yields an absolute value.
++// Set the symbol value if the expression yields an absolute value or
++// a value relative to DOT_SECTION.
+ 
+ void
+ Symbol_assignment::set_if_absolute(Symbol_table* symtab, const Layout* layout,
+-				   bool is_dot_available, uint64_t dot_value)
++				   bool is_dot_available, uint64_t dot_value,
++				   Output_section* dot_section)
+ {
+   if (this->sym_ == NULL)
+     return;
+@@ -1002,8 +1004,9 @@ Symbol_assignment::set_if_absolute(Symbol_table* symtab, const Layout* layout,
+   Output_section* val_section;
+   uint64_t val = this->val_->eval_maybe_dot(symtab, layout, false,
+ 					    is_dot_available, dot_value,
+-					    NULL, &val_section, NULL);
+-  if (val_section != NULL)
++					    dot_section, &val_section, NULL,
++					    false);
++  if (val_section != NULL && val_section != dot_section)
+     return;
+ 
+   if (parameters->target().get_size() == 32)
+@@ -1026,6 +1029,8 @@ Symbol_assignment::set_if_absolute(Symbol_table* symtab, const Layout* layout,
+     }
+   else
+     gold_unreachable();
++  if (val_section != NULL)
++    this->sym_->set_output_section(val_section);
+ }
+ 
+ // Print for debugging.
+@@ -1215,7 +1220,7 @@ Script_options::set_section_addresses(Symbol_table* symtab, Layout* layout)
+   for (Symbol_assignments::iterator p = this->symbol_assignments_.begin();
+        p != this->symbol_assignments_.end();
+        ++p)
+-    (*p)->set_if_absolute(symtab, layout, false, 0);
++    (*p)->set_if_absolute(symtab, layout, false, 0, NULL);
+ 
+   return this->script_sections_.set_section_addresses(symtab, layout);
+ }
+diff --git a/gold/script.h b/gold/script.h
+index 73079a4..f41f438 100644
+--- a/gold/script.h
++++ b/gold/script.h
+@@ -90,20 +90,28 @@ class Expression
+   // the section address.  If RESULT_ALIGNMENT is not NULL, this sets
+   // *RESULT_ALIGNMENT to the alignment of the value of that alignment
+   // is larger than *RESULT_ALIGNMENT; this will only be non-zero if
+-  // this is an ALIGN expression.
++  // this is an ALIGN expression.  If IS_SECTION_DOT_ASSIGMENT is true,
++  // we are evaluating an assignment to dot within an output section,
++  // and an absolute value should be interpreted as an offset within
++  // the section.
+   uint64_t
+   eval_with_dot(const Symbol_table*, const Layout*, bool check_assertions,
+ 		uint64_t dot_value, Output_section* dot_section,
+-		Output_section** result_section, uint64_t* result_alignment);
++		Output_section** result_section, uint64_t* result_alignment,
++		bool is_section_dot_assignment);
+ 
+   // Return the value of an expression which may or may not be
+   // permitted to refer to the dot symbol, depending on
+-  // is_dot_available.
++  // is_dot_available.  If IS_SECTION_DOT_ASSIGMENT is true,
++  // we are evaluating an assignment to dot within an output section,
++  // and an absolute value should be interpreted as an offset within
++  // the section.
+   uint64_t
+   eval_maybe_dot(const Symbol_table*, const Layout*, bool check_assertions,
+ 		 bool is_dot_available, uint64_t dot_value,
+ 		 Output_section* dot_section,
+-		 Output_section** result_section, uint64_t* result_alignment);
++		 Output_section** result_section, uint64_t* result_alignment,
++		 bool is_section_dot_assignment);
+ 
+   // Print the expression to the FILE.  This is for debugging.
+   virtual void
+@@ -339,12 +347,12 @@ class Symbol_assignment
+   finalize_with_dot(Symbol_table*, const Layout*, uint64_t dot_value,
+ 		    Output_section* dot_section);
+ 
+-  // Set the symbol value, but only if the value is absolute.  This is
+-  // used while processing a SECTIONS clause.  We assume that dot is
+-  // an absolute value here.  We do not check assertions.
++  // Set the symbol value, but only if the value is absolute or relative to
++  // DOT_SECTION.  This is used while processing a SECTIONS clause.
++  // We assume that dot is an absolute value here.  We do not check assertions.
+   void
+   set_if_absolute(Symbol_table*, const Layout*, bool is_dot_available,
+-		  uint64_t dot_value);
++		  uint64_t dot_value, Output_section* dot_section);
+ 
+   const std::string&
+   name() const
+diff --git a/gold/sparc.cc b/gold/sparc.cc
+index 5f67a4e..12e1dee 100644
+--- a/gold/sparc.cc
++++ b/gold/sparc.cc
+@@ -1855,7 +1855,7 @@ Target_sparc<size, big_endian>::Scan::local(
+           rela_dyn->add_local_relative(object, r_sym, elfcpp::R_SPARC_RELATIVE,
+ 				       output_section, data_shndx,
+ 				       reloc.get_r_offset(),
+-				       reloc.get_r_addend());
++				       reloc.get_r_addend(), false);
+         }
+       break;
+ 
+@@ -1946,7 +1946,7 @@ Target_sparc<size, big_endian>::Scan::local(
+ 		object->set_local_got_offset(r_sym, GOT_TYPE_STANDARD, off);
+ 		rela_dyn->add_local_relative(object, r_sym,
+ 					     elfcpp::R_SPARC_RELATIVE,
+-					     got, off, 0);
++					     got, off, 0, false);
+ 	      }
+ 	  }
+ 	else
+diff --git a/gold/symtab.cc b/gold/symtab.cc
+index ff1b5ca..f0ba1d5 100644
+--- a/gold/symtab.cc
++++ b/gold/symtab.cc
+@@ -602,20 +602,16 @@ Symbol_table::gc_mark_undef_symbols(Layout* layout)
+ }
+ 
+ void
+-Symbol_table::gc_mark_symbol_for_shlib(Symbol* sym)
++Symbol_table::gc_mark_symbol(Symbol* sym)
+ {
+-  if (!sym->is_from_dynobj() 
+-      && sym->is_externally_visible())
++  // Add the object and section to the work list.
++  Relobj* obj = static_cast<Relobj*>(sym->object());
++  bool is_ordinary;
++  unsigned int shndx = sym->shndx(&is_ordinary);
++  if (is_ordinary && shndx != elfcpp::SHN_UNDEF)
+     {
+-      //Add the object and section to the work list.
+-      Relobj* obj = static_cast<Relobj*>(sym->object());
+-      bool is_ordinary;
+-      unsigned int shndx = sym->shndx(&is_ordinary);
+-      if (is_ordinary && shndx != elfcpp::SHN_UNDEF)
+-        {
+-          gold_assert(this->gc_!= NULL);
+-          this->gc_->worklist().push(Section_id(obj, shndx));
+-        }
++      gold_assert(this->gc_!= NULL);
++      this->gc_->worklist().push(Section_id(obj, shndx));
+     }
+ }
+ 
+@@ -626,16 +622,7 @@ Symbol_table::gc_mark_dyn_syms(Symbol* sym)
+ {
+   if (sym->in_dyn() && sym->source() == Symbol::FROM_OBJECT
+       && !sym->object()->is_dynamic())
+-    {
+-      Relobj* obj = static_cast<Relobj*>(sym->object()); 
+-      bool is_ordinary;
+-      unsigned int shndx = sym->shndx(&is_ordinary);
+-      if (is_ordinary && shndx != elfcpp::SHN_UNDEF)
+-        {
+-          gold_assert(this->gc_ != NULL);
+-          this->gc_->worklist().push(Section_id(obj, shndx));
+-        }
+-    }
++    this->gc_mark_symbol(sym);
+ }
+ 
+ // Make TO a symbol which forwards to FROM.
+@@ -1143,6 +1130,14 @@ Symbol_table::add_from_relobj(
+       bool is_default_version = false;
+       bool is_forced_local = false;
+ 
++      // FIXME: For incremental links, we don't store version information,
++      // so we need to ignore version symbols for now.
++      if (parameters->incremental_update() && ver != NULL)
++	{
++	  namelen = ver - name;
++	  ver = NULL;
++	}
++
+       if (ver != NULL)
+         {
+           // The symbol name is of the form foo@VERSION or foo@@VERSION
+@@ -1243,11 +1238,16 @@ Symbol_table::add_from_relobj(
+       if (is_forced_local)
+ 	this->force_local(res);
+ 
+-      // If building a shared library using garbage collection, do not 
+-      // treat externally visible symbols as garbage.
+-      if (parameters->options().gc_sections() 
+-          && parameters->options().shared())
+-        this->gc_mark_symbol_for_shlib(res);
++      // Do not treat this symbol as garbage if this symbol will be
++      // exported to the dynamic symbol table.  This is true when
++      // building a shared library or using --export-dynamic and
++      // the symbol is externally visible.
++      if (parameters->options().gc_sections()
++	  && res->is_externally_visible()
++	  && !res->is_from_dynobj()
++          && (parameters->options().shared()
++	      || parameters->options().export_dynamic()))
++        this->gc_mark_symbol(res);
+ 
+       if (is_defined_in_discarded_section)
+ 	res->set_is_defined_in_discarded_section();
+@@ -1346,6 +1346,11 @@ Symbol_table::add_from_dynobj(
+       return;
+     }
+ 
++  // FIXME: For incremental links, we don't store version information,
++  // so we need to ignore version symbols for now.
++  if (parameters->incremental_update())
++    versym = NULL;
++
+   if (versym != NULL && versym_size / 2 < count)
+     {
+       dynobj->error(_("too few symbol versions"));
+@@ -2809,6 +2814,12 @@ Symbol_table::sized_write_globals(const Stringpool* sympool,
+       typename elfcpp::Elf_types<size>::Elf_Addr sym_value = sym->value();
+       typename elfcpp::Elf_types<size>::Elf_Addr dynsym_value = sym_value;
+       elfcpp::STB binding = sym->binding();
++
++      // If --no-gnu-unique is set, change STB_GNU_UNIQUE to STB_GLOBAL.
++      if (binding == elfcpp::STB_GNU_UNIQUE
++	  && !parameters->options().gnu_unique())
++	binding = elfcpp::STB_GLOBAL;
++
+       switch (sym->source())
+ 	{
+ 	case Symbol::FROM_OBJECT:
+diff --git a/gold/symtab.h b/gold/symtab.h
+index b9b9e00..427f72f 100644
+--- a/gold/symtab.h
++++ b/gold/symtab.h
+@@ -1308,10 +1308,9 @@ class Symbol_table
+   void
+   gc_mark_undef_symbols(Layout*);
+ 
+-  // During garbage collection, this ensures externally visible symbols
+-  // are not treated as garbage while building shared objects.
++  // This tells garbage collection that this symbol is referenced.
+   void
+-  gc_mark_symbol_for_shlib(Symbol* sym);
++  gc_mark_symbol(Symbol* sym);
+ 
+   // During garbage collection, this keeps sections that correspond to 
+   // symbols seen in dynamic objects.
+diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
+index 67149fb..785dcdd 100644
+--- a/gold/testsuite/Makefile.in
++++ b/gold/testsuite/Makefile.in
+@@ -1844,6 +1844,8 @@ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ GENCAT = @GENCAT@
+ GMSGFMT = @GMSGFMT@
++GOLD_LDADD = @GOLD_LDADD@
++GOLD_LDFLAGS = @GOLD_LDFLAGS@
+ GREP = @GREP@
+ INCINTL = @INCINTL@
+ INSTALL = @INSTALL@
+diff --git a/gold/testsuite/plugin_test_2.sh b/gold/testsuite/plugin_test_2.sh
+index a47d22a..293b1f0 100755
+--- a/gold/testsuite/plugin_test_2.sh
++++ b/gold/testsuite/plugin_test_2.sh
+@@ -45,7 +45,7 @@ check plugin_test_2.err "two_file_test_main.o: claim file hook called"
+ check plugin_test_2.err "two_file_test_1.syms: claim file hook called"
+ check plugin_test_2.err "two_file_test_1b.syms: claim file hook called"
+ check plugin_test_2.err "two_file_shared_2.so: claim file hook called"
+-check plugin_test_2.err "two_file_test_1.syms: _Z4f13iv: PREVAILING_DEF_REG"
++check plugin_test_2.err "two_file_test_1.syms: _Z4f13iv: PREVAILING_DEF_IRONLY_EXP"
+ check plugin_test_2.err "two_file_test_1.syms: _Z2t2v: PREVAILING_DEF_REG"
+ check plugin_test_2.err "two_file_test_1.syms: v2: RESOLVED_DYN"
+ check plugin_test_2.err "two_file_test_1.syms: t17data: RESOLVED_DYN"
+diff --git a/gold/testsuite/script_test_2.t b/gold/testsuite/script_test_2.t
+index 73d39df..6a0188f 100644
+--- a/gold/testsuite/script_test_2.t
++++ b/gold/testsuite/script_test_2.t
+@@ -49,7 +49,7 @@ SECTIONS
+     /* This should match the remaining sections.  */
+     *(.gold_test)
+ 
+-    . = . + 4;
++    . = 60;
+     start_data = .;
+     BYTE(1)
+     SHORT(2)
+diff --git a/gold/x86_64.cc b/gold/x86_64.cc
+index e6b0021..e7c981b 100644
+--- a/gold/x86_64.cc
++++ b/gold/x86_64.cc
+@@ -1549,7 +1549,7 @@ Target_x86_64::reserve_local_got_entry(
+     case GOT_TYPE_STANDARD:
+       if (parameters->options().output_is_position_independent())
+ 	rela_dyn->add_local_relative(obj, r_sym, elfcpp::R_X86_64_RELATIVE,
+-				     this->got_, got_offset, 0);
++				     this->got_, got_offset, 0, false);
+       break;
+     case GOT_TYPE_TLS_OFFSET:
+       rela_dyn->add_local(obj, r_sym, elfcpp::R_X86_64_TPOFF64,
+@@ -1953,8 +1953,8 @@ Target_x86_64::Scan::local(Symbol_table* symtab,
+                            const elfcpp::Sym<64, false>& lsym)
+ {
+   // A local STT_GNU_IFUNC symbol may require a PLT entry.
+-  if (lsym.get_st_type() == elfcpp::STT_GNU_IFUNC
+-      && this->reloc_needs_plt_for_ifunc(object, r_type))
++  bool is_ifunc = lsym.get_st_type() == elfcpp::STT_GNU_IFUNC;
++  if (is_ifunc && this->reloc_needs_plt_for_ifunc(object, r_type))
+     {
+       unsigned int r_sym = elfcpp::elf_r_sym<64>(reloc.get_r_info());
+       target->make_local_ifunc_plt_entry(symtab, layout, object, r_sym);
+@@ -1982,7 +1982,7 @@ Target_x86_64::Scan::local(Symbol_table* symtab,
+ 				       elfcpp::R_X86_64_RELATIVE,
+ 				       output_section, data_shndx,
+ 				       reloc.get_r_offset(),
+-				       reloc.get_r_addend());
++				       reloc.get_r_addend(), is_ifunc);
+         }
+       break;
+ 
+@@ -2058,7 +2058,7 @@ Target_x86_64::Scan::local(Symbol_table* symtab,
+ 	// lets function pointers compare correctly with shared
+ 	// libraries.  Otherwise we would need an IRELATIVE reloc.
+ 	bool is_new;
+-	if (lsym.get_st_type() == elfcpp::STT_GNU_IFUNC)
++	if (is_ifunc)
+ 	  is_new = got->add_local_plt(object, r_sym, GOT_TYPE_STANDARD);
+ 	else
+ 	  is_new = got->add_local(object, r_sym, GOT_TYPE_STANDARD);
+@@ -2076,7 +2076,7 @@ Target_x86_64::Scan::local(Symbol_table* symtab,
+ 		      object->local_got_offset(r_sym, GOT_TYPE_STANDARD);
+ 		    rela_dyn->add_local_relative(object, r_sym,
+ 						 elfcpp::R_X86_64_RELATIVE,
+-						 got, got_offset, 0);
++						 got, got_offset, 0, is_ifunc);
+ 		  }
+                 else
+                   {
+@@ -3181,12 +3181,6 @@ Target_x86_64::Relocate::relocate_tls(const Relocate_info<64, false>* relinfo,
+             }
+           if (optimized_type == tls::TLSOPT_TO_IE)
+             {
+-	      if (tls_segment == NULL)
+-		{
+-		  gold_assert(parameters->errors()->error_count() > 0
+-			      || issue_undefined_symbol_error(gsym));
+-		  return;
+-		}
+               value = target->got_plt_section()->address() + got_offset;
+               this->tls_gd_to_ie(relinfo, relnum, tls_segment, rela, r_type,
+                                  value, view, address, view_size);
+@@ -3867,42 +3861,51 @@ Target_x86_64::do_code_fill(section_size_type length) const
+     }
+ 
+   // Nop sequences of various lengths.
+-  const char nop1[1] = { 0x90 };                   // nop
+-  const char nop2[2] = { 0x66, 0x90 };             // xchg %ax %ax
+-  const char nop3[3] = { 0x0f, 0x1f, 0x00 };       // nop (%rax)
+-  const char nop4[4] = { 0x0f, 0x1f, 0x40, 0x00};  // nop 0(%rax)
+-  const char nop5[5] = { 0x0f, 0x1f, 0x44, 0x00,   // nop 0(%rax,%rax,1)
+-                         0x00 };
+-  const char nop6[6] = { 0x66, 0x0f, 0x1f, 0x44,   // nopw 0(%rax,%rax,1)
+-                         0x00, 0x00 };
+-  const char nop7[7] = { 0x0f, 0x1f, 0x80, 0x00,   // nopl 0L(%rax)
+-                         0x00, 0x00, 0x00 };
+-  const char nop8[8] = { 0x0f, 0x1f, 0x84, 0x00,   // nopl 0L(%rax,%rax,1)
+-                         0x00, 0x00, 0x00, 0x00 };
+-  const char nop9[9] = { 0x66, 0x0f, 0x1f, 0x84,   // nopw 0L(%rax,%rax,1)
+-                         0x00, 0x00, 0x00, 0x00,
+-                         0x00 };
+-  const char nop10[10] = { 0x66, 0x2e, 0x0f, 0x1f, // nopw %cs:0L(%rax,%rax,1)
+-                           0x84, 0x00, 0x00, 0x00,
+-                           0x00, 0x00 };
+-  const char nop11[11] = { 0x66, 0x66, 0x2e, 0x0f, // data16
+-                           0x1f, 0x84, 0x00, 0x00, // nopw %cs:0L(%rax,%rax,1)
+-                           0x00, 0x00, 0x00 };
+-  const char nop12[12] = { 0x66, 0x66, 0x66, 0x2e, // data16; data16
+-                           0x0f, 0x1f, 0x84, 0x00, // nopw %cs:0L(%rax,%rax,1)
+-                           0x00, 0x00, 0x00, 0x00 };
+-  const char nop13[13] = { 0x66, 0x66, 0x66, 0x66, // data16; data16; data16
+-                           0x2e, 0x0f, 0x1f, 0x84, // nopw %cs:0L(%rax,%rax,1)
+-                           0x00, 0x00, 0x00, 0x00,
+-                           0x00 };
+-  const char nop14[14] = { 0x66, 0x66, 0x66, 0x66, // data16; data16; data16
+-                           0x66, 0x2e, 0x0f, 0x1f, // data16
+-                           0x84, 0x00, 0x00, 0x00, // nopw %cs:0L(%rax,%rax,1)
+-                           0x00, 0x00 };
+-  const char nop15[15] = { 0x66, 0x66, 0x66, 0x66, // data16; data16; data16
+-                           0x66, 0x66, 0x2e, 0x0f, // data16; data16
+-                           0x1f, 0x84, 0x00, 0x00, // nopw %cs:0L(%rax,%rax,1)
+-                           0x00, 0x00, 0x00 };
++  const char nop1[1] = { '\x90' };                 // nop
++  const char nop2[2] = { '\x66', '\x90' };         // xchg %ax %ax
++  const char nop3[3] = { '\x0f', '\x1f', '\x00' }; // nop (%rax)
++  const char nop4[4] = { '\x0f', '\x1f', '\x40',   // nop 0(%rax)
++  			 '\x00'};
++  const char nop5[5] = { '\x0f', '\x1f', '\x44',   // nop 0(%rax,%rax,1)
++			 '\x00', '\x00' };
++  const char nop6[6] = { '\x66', '\x0f', '\x1f',   // nopw 0(%rax,%rax,1)
++  			 '\x44', '\x00', '\x00' };
++  const char nop7[7] = { '\x0f', '\x1f', '\x80',   // nopl 0L(%rax)
++  			 '\x00', '\x00', '\x00',
++			 '\x00' };
++  const char nop8[8] = { '\x0f', '\x1f', '\x84',   // nopl 0L(%rax,%rax,1)
++  			 '\x00', '\x00', '\x00',
++			 '\x00', '\x00' };
++  const char nop9[9] = { '\x66', '\x0f', '\x1f',   // nopw 0L(%rax,%rax,1)
++  			 '\x84', '\x00', '\x00',
++			 '\x00', '\x00', '\x00' };
++  const char nop10[10] = { '\x66', '\x2e', '\x0f', // nopw %cs:0L(%rax,%rax,1)
++  			   '\x1f', '\x84', '\x00',
++			   '\x00', '\x00', '\x00',
++			   '\x00' };
++  const char nop11[11] = { '\x66', '\x66', '\x2e', // data16
++  			   '\x0f', '\x1f', '\x84', // nopw %cs:0L(%rax,%rax,1)
++			   '\x00', '\x00', '\x00',
++			   '\x00', '\x00' };
++  const char nop12[12] = { '\x66', '\x66', '\x66', // data16; data16
++  			   '\x2e', '\x0f', '\x1f', // nopw %cs:0L(%rax,%rax,1)
++			   '\x84', '\x00', '\x00',
++			   '\x00', '\x00', '\x00' };
++  const char nop13[13] = { '\x66', '\x66', '\x66', // data16; data16; data16
++  			   '\x66', '\x2e', '\x0f', // nopw %cs:0L(%rax,%rax,1)
++			   '\x1f', '\x84', '\x00',
++			   '\x00', '\x00', '\x00',
++                           '\x00' };
++  const char nop14[14] = { '\x66', '\x66', '\x66', // data16; data16; data16
++  			   '\x66', '\x66', '\x2e', // data16
++			   '\x0f', '\x1f', '\x84', // nopw %cs:0L(%rax,%rax,1)
++			   '\x00', '\x00', '\x00',
++                           '\x00', '\x00' };
++  const char nop15[15] = { '\x66', '\x66', '\x66', // data16; data16; data16
++  			   '\x66', '\x66', '\x66', // data16; data16
++			   '\x2e', '\x0f', '\x1f', // nopw %cs:0L(%rax,%rax,1)
++			   '\x84', '\x00', '\x00',
++                           '\x00', '\x00', '\x00' };
+ 
+   const char* nops[16] = {
+     NULL,
+-- 
+1.7.9.5
+