Commit 5f69d58a authored by Andrey V.Kosteltsev's avatar Andrey V.Kosteltsev

enable libstdc++ dual ABI; set default ABI = gcc4 compatible

git-svn-id: https://svn.radix.pro/svn/toolchains/trunk@140 0df74aab-45ad-4799-93a1-122938110d35
parent d3426ce4
../../../sources/GNU/binutils/patches/binutils-2.26-export-demangle.patch -p0
../../../sources/GNU/binutils/patches/binutils-2.26-no-config-check.patch -p0
../../../sources/GNU/binutils/patches/binutils-2.26-Bsymbolic-PIE.patch -p0
../../../sources/GNU/binutils/patches/binutils-2.26-GOT-offset.patch -p0
../../../sources/GNU/binutils/patches/binutils-2.26-compile-warnings.patch -p0
../../../sources/GNU/binutils/patches/binutils-2.26-lto.patch -p0
../../../sources/GNU/binutils/patches/binutils-2.26-rh1312151.patch -p0
../../../sources/GNU/binutils/patches/binutils-2.26-export-demangle.patch -p0
../../../sources/GNU/binutils/patches/binutils-2.26-no-config-check.patch -p0
......@@ -146,6 +146,9 @@ else
ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_P5600_GLIBC)),)
PATCHES = PATCHES.p5600
else
ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_I486_GLIBC)),)
PATCHES = PATCHES.i386
else
ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_X86_64_EGLIBC) $(TOOLCHAIN_X86_64_GLIBC)),)
PATCHES = PATCHES.x86_64
else
......@@ -160,6 +163,7 @@ endif
endif
endif
endif
endif
build_dir = $(TARGET_BUILD_DIR)/build
......@@ -332,6 +336,8 @@ endif
ifeq ($(FLAVOUR),full)
extra_configure_switches += --with-sysroot=$(sysroot_dir)
extra_configure_switches += --enable-languages=c,c++
extra_configure_switches += --enable-libstdcxx-dual-abi
extra_configure_switches += --with-default-libstdcxx-abi=gcc4-compatible
extra_configure_switches += --enable-interwork
extra_configure_switches += --enable-multilib
extra_configure_switches += --with-extra-multilibs=thumb1,thumb2,armv7-m,armv7e-m
......@@ -387,6 +393,8 @@ endif
ifeq ($(FLAVOUR),full)
extra_configure_switches += --with-sysroot=$(sysroot_dir)
extra_configure_switches += --enable-languages=c,c++,objc,obj-c++,java,fortran,go,lto,ada
extra_configure_switches += --enable-libstdcxx-dual-abi
extra_configure_switches += --with-default-libstdcxx-abi=gcc4-compatible
extra_configure_switches += --enable-__cxa_atexit
extra_configure_switches += --enable-shared
extra_configure_switches += --enable-nls
......@@ -440,6 +448,8 @@ endif
ifeq ($(FLAVOUR),full)
extra_configure_switches += --with-sysroot=$(sysroot_dir)
extra_configure_switches += --enable-languages=c,c++,objc,obj-c++,java,fortran,go,lto,ada
extra_configure_switches += --enable-libstdcxx-dual-abi
extra_configure_switches += --with-default-libstdcxx-abi=gcc4-compatible
extra_configure_switches += --enable-__cxa_atexit
extra_configure_switches += --enable-shared
extra_configure_switches += --enable-nls
......@@ -493,6 +503,8 @@ endif
ifeq ($(FLAVOUR),full)
extra_configure_switches += --with-sysroot=$(sysroot_dir)
extra_configure_switches += --enable-languages=c,c++,objc,obj-c++,java,fortran,go,lto,ada
extra_configure_switches += --enable-libstdcxx-dual-abi
extra_configure_switches += --with-default-libstdcxx-abi=gcc4-compatible
extra_configure_switches += --enable-__cxa_atexit
extra_configure_switches += --enable-shared
extra_configure_switches += --enable-nls
......@@ -547,6 +559,8 @@ endif
ifeq ($(FLAVOUR),full)
extra_configure_switches += --with-sysroot=$(sysroot_dir)
extra_configure_switches += --enable-languages=c,c++,objc,obj-c++,java,fortran,go,lto,ada
extra_configure_switches += --enable-libstdcxx-dual-abi
extra_configure_switches += --with-default-libstdcxx-abi=gcc4-compatible
extra_configure_switches += --enable-__cxa_atexit
extra_configure_switches += --enable-shared
extra_configure_switches += --enable-nls
......@@ -605,6 +619,8 @@ endif
ifeq ($(FLAVOUR),full)
extra_configure_switches += --with-sysroot=$(sysroot_dir)
extra_configure_switches += --enable-languages=c,c++,objc,obj-c++,java,fortran,go,lto,ada
extra_configure_switches += --enable-libstdcxx-dual-abi
extra_configure_switches += --with-default-libstdcxx-abi=gcc4-compatible
extra_configure_switches += --enable-__cxa_atexit
extra_configure_switches += --enable-shared
extra_configure_switches += --enable-nls
......@@ -659,6 +675,8 @@ endif
ifeq ($(FLAVOUR),full)
extra_configure_switches += --with-sysroot=$(sysroot_dir)
extra_configure_switches += --enable-languages=c,c++,objc,obj-c++,java,fortran,go,lto,ada
extra_configure_switches += --enable-libstdcxx-dual-abi
extra_configure_switches += --with-default-libstdcxx-abi=gcc4-compatible
extra_configure_switches += --enable-__cxa_atexit
extra_configure_switches += --enable-shared
extra_configure_switches += --enable-nls
......@@ -712,6 +730,8 @@ endif
ifeq ($(FLAVOUR),full)
extra_configure_switches += --with-sysroot=$(sysroot_dir)
extra_configure_switches += --enable-languages=c,c++,objc,obj-c++,java,fortran,go,lto,ada
extra_configure_switches += --enable-libstdcxx-dual-abi
extra_configure_switches += --with-default-libstdcxx-abi=gcc4-compatible
extra_configure_switches += --enable-__cxa_atexit
extra_configure_switches += --enable-shared
extra_configure_switches += --enable-nls
......@@ -760,6 +780,8 @@ endif
ifeq ($(FLAVOUR),full)
extra_configure_switches += --with-sysroot=$(sysroot_dir)
extra_configure_switches += --enable-languages=c,c++,objc,obj-c++,java,fortran,go,lto,ada
extra_configure_switches += --enable-libstdcxx-dual-abi
extra_configure_switches += --with-default-libstdcxx-abi=gcc4-compatible
extra_configure_switches += --disable-__cxa_atexit
extra_configure_switches += --enable-shared
extra_configure_switches += --enable-threads
......@@ -815,6 +837,8 @@ endif
ifeq ($(FLAVOUR),full)
extra_configure_switches += --with-sysroot=$(sysroot_dir)
extra_configure_switches += --enable-languages=c,c++,objc,obj-c++,java,fortran,go,lto,ada
extra_configure_switches += --enable-libstdcxx-dual-abi
extra_configure_switches += --with-default-libstdcxx-abi=gcc4-compatible
extra_configure_switches += --enable-__cxa_atexit
extra_configure_switches += --enable-shared
extra_configure_switches += --enable-threads
......@@ -870,6 +894,8 @@ endif
ifeq ($(FLAVOUR),full)
extra_configure_switches += --with-sysroot=$(sysroot_dir)
extra_configure_switches += --enable-languages=c,c++,objc,obj-c++,java,fortran,go,lto,ada
extra_configure_switches += --enable-libstdcxx-dual-abi
extra_configure_switches += --with-default-libstdcxx-abi=gcc4-compatible
extra_configure_switches += --enable-__cxa_atexit
extra_configure_switches += --enable-shared
extra_configure_switches += --enable-threads
......@@ -918,6 +944,8 @@ endif
ifeq ($(FLAVOUR),full)
extra_configure_switches += --with-sysroot=$(sysroot_dir)
extra_configure_switches += --enable-languages=c,c++,objc,obj-c++,java,fortran,go,lto,ada
extra_configure_switches += --enable-libstdcxx-dual-abi
extra_configure_switches += --with-default-libstdcxx-abi=gcc4-compatible
extra_configure_switches += --enable-__cxa_atexit
extra_configure_switches += --enable-shared
extra_configure_switches += --enable-nls
......@@ -964,6 +992,8 @@ endif
ifeq ($(FLAVOUR),full)
extra_configure_switches += --with-sysroot=$(sysroot_dir)
extra_configure_switches += --enable-languages=c,c++,objc,obj-c++,java,fortran,go,lto,ada
extra_configure_switches += --enable-libstdcxx-dual-abi
extra_configure_switches += --with-default-libstdcxx-abi=gcc4-compatible
extra_configure_switches += --enable-__cxa_atexit
extra_configure_switches += --enable-shared
extra_configure_switches += --enable-nls
......
../../../sources/GNU/gcc/patches/gcc-5.3.0-i386-66782.patch -p0
../../../sources/GNU/gcc/patches/gcc-5.3.0-i386-69140.patch -p0
../../../sources/GNU/gcc/patches/gcc-5.3.0-x86_64-multilib.patch -p0
../../../sources/GNU/gcc/patches/gcc-5.3.0-i386-66782.patch -p0
../../../sources/GNU/gcc/patches/gcc-5.3.0-i386-69140.patch -p0
......@@ -29,6 +29,11 @@ patches += $(CURDIR)/patches/binutils-2.23.2-x86_64-multilib.patch
patches += $(CURDIR)/patches/binutils-2.24-x86_64-multilib.patch
patches += $(CURDIR)/patches/binutils-2.25.1-export-demangle.patch
patches += $(CURDIR)/patches/binutils-2.25.1-no-config-check.patch
patches += $(CURDIR)/patches/binutils-2.26-Bsymbolic-PIE.patch
patches += $(CURDIR)/patches/binutils-2.26-GOT-offset.patch
patches += $(CURDIR)/patches/binutils-2.26-compile-warnings.patch
patches += $(CURDIR)/patches/binutils-2.26-lto.patch
patches += $(CURDIR)/patches/binutils-2.26-rh1312151.patch
patches += $(CURDIR)/patches/binutils-2.26-export-demangle.patch
patches += $(CURDIR)/patches/binutils-2.26-no-config-check.patch
......@@ -74,6 +79,11 @@ $(patches): $(sha1s)
( cd create-2.24-x86_64-multilib-patch ; ./create.patch.sh ) ; \
( cd create-2.25.1-export-demangle-patch ; ./create.patch.sh ) ; \
( cd create-2.25.1-no-config-check-patch ; ./create.patch.sh ) ; \
( cd create-2.26-Bsymbolic-PIE-patch ; ./create.patch.sh ) ; \
( cd create-2.26-GOT-offset-patch ; ./create.patch.sh ) ; \
( cd create-2.26-compile-warnings-patch ; ./create.patch.sh ) ; \
( cd create-2.26-lto-patch ; ./create.patch.sh ) ; \
( cd create-2.26-rh1312151-patch ; ./create.patch.sh ) ; \
( cd create-2.26-export-demangle-patch ; ./create.patch.sh ) ; \
( cd create-2.26-no-config-check-patch ; ./create.patch.sh ) ; \
echo -e "\n"
......
#as: --32
#ld: -pie -Bsymbolic -E -melf_i386
#readelf: -r --wide --dyn-syms
Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
Offset Info Type Sym. Value Symbol's Name
[0-9a-f]+ +[0-9a-f]+ +R_386_RELATIVE +
Symbol table '.dynsym' contains [0-9]+ entries:
Num: Value Size Type Bind Vis Ndx Name
#...
[ ]*[a-f0-9]+: [a-f0-9]+ 0 FUNC GLOBAL DEFAULT [a-f0-9]+ xyzzy
#...
.text
.globl _start
.type _start, @function
_start:
ret
.globl xyzzy /* This symbol should be exported */
.type xyzzy, @function
xyzzy:
ret
.section ".xyzzy_ptr","aw",%progbits
.dc.a xyzzy
#as: --64
#ld: -pie -Bsymbolic -E -melf_x86_64
#readelf: -r --wide --dyn-syms
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
Offset Info Type Symbol's Value Symbol's Name \+ Addend
[0-9a-f]+ +[0-9a-f]+ +R_X86_64_RELATIVE +[0-9]+
Symbol table '.dynsym' contains [0-9]+ entries:
Num: Value Size Type Bind Vis Ndx Name
#...
[ ]*[a-f0-9]+: [a-f0-9]+ 0 FUNC GLOBAL DEFAULT [a-f0-9]+ xyzzy
#...
.text
.globl _start
.type _start, @function
_start:
ret
.globl xyzzy /* This symbol should be exported */
.type xyzzy, @function
xyzzy:
ret
.section ".xyzzy_ptr","aw",%progbits
.dc.a xyzzy
#!/bin/sh
VERSION=2.26
tar --files-from=file.list -xjvf ../binutils-$VERSION.tar.bz2
mv binutils-$VERSION binutils-$VERSION-orig
cp -rf ./binutils-$VERSION-new ./binutils-$VERSION
diff -b --unified -Nr binutils-$VERSION-orig binutils-$VERSION > binutils-$VERSION-Bsymbolic-PIE.patch
mv binutils-$VERSION-Bsymbolic-PIE.patch ../patches
rm -rf ./binutils-$VERSION
rm -rf ./binutils-$VERSION-orig
binutils-2.26/ld/ld.texinfo
binutils-2.26/ld/lexsup.c
binutils-2.26/ld/testsuite/ld-i386/i386.exp
binutils-2.26/ld/testsuite/ld-x86-64/x86-64.exp
#!/bin/sh
VERSION=2.26
tar --files-from=file.list -xjvf ../binutils-$VERSION.tar.bz2
mv binutils-$VERSION binutils-$VERSION-orig
cp -rf ./binutils-$VERSION-new ./binutils-$VERSION
diff -b --unified -Nr binutils-$VERSION-orig binutils-$VERSION > binutils-$VERSION-GOT-offset.patch
mv binutils-$VERSION-GOT-offset.patch ../patches
rm -rf ./binutils-$VERSION
rm -rf ./binutils-$VERSION-orig
// dirsearch.cc -- directory searching for gold
// Copyright (C) 2006-2015 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@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.
#include "gold.h"
#include <cerrno>
#include <cstring>
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
#include "debug.h"
#include "gold-threads.h"
#include "options.h"
#include "workqueue.h"
#include "dirsearch.h"
namespace
{
// Read all the files in a directory.
class Dir_cache
{
public:
Dir_cache(const char* dirname)
: dirname_(dirname), files_()
{ }
// Read the files in the directory.
void read_files();
// Return whether a file (a base name) is present in the directory.
bool find(const std::string&) const;
private:
// We can not copy this class.
Dir_cache(const Dir_cache&);
Dir_cache& operator=(const Dir_cache&);
const char* dirname_;
Unordered_set<std::string> files_;
};
void
Dir_cache::read_files()
{
DIR* d = opendir(this->dirname_);
if (d == NULL)
{
// We ignore directories which do not exist or are actually file
// names.
if (errno != ENOENT && errno != ENOTDIR)
gold::gold_error(_("%s: can not read directory: %s"),
this->dirname_, strerror(errno));
return;
}
dirent* de;
while ((de = readdir(d)) != NULL)
this->files_.insert(std::string(de->d_name));
if (closedir(d) != 0)
gold::gold_warning("%s: closedir failed: %s", this->dirname_,
strerror(errno));
}
bool
Dir_cache::find(const std::string& basename) const
{
return this->files_.find(basename) != this->files_.end();
}
// A mapping from directory names to caches. A lock permits
// concurrent update. There is no lock for read operations--some
// other mechanism must be used to prevent reads from conflicting with
// writes.
class Dir_caches
{
public:
Dir_caches()
: lock_(), caches_()
{ }
~Dir_caches();
// Add a cache for a directory.
void add(const char*);
// Look up a directory in the cache. This much be locked against
// calls to Add.
Dir_cache* lookup(const char*) const;
private:
// We can not copy this class.
Dir_caches(const Dir_caches&);
Dir_caches& operator=(const Dir_caches&);
typedef Unordered_map<const char*, Dir_cache*> Cache_hash;
gold::Lock lock_;
Cache_hash caches_;
};
#if 0
Dir_caches::~Dir_caches()
{
for (Cache_hash::iterator p = this->caches_.begin();
p != this->caches_.end();
++p)
delete p->second;
}
#endif
void
Dir_caches::add(const char* dirname)
{
{
gold::Hold_lock hl(this->lock_);
if (this->lookup(dirname) != NULL)
return;
}
Dir_cache* cache = new Dir_cache(dirname);
cache->read_files();
{
gold::Hold_lock hl(this->lock_);
std::pair<const char*, Dir_cache*> v(dirname, cache);
std::pair<Cache_hash::iterator, bool> p = this->caches_.insert(v);
gold_assert(p.second);
}
}
Dir_cache*
Dir_caches::lookup(const char* dirname) const
{
Cache_hash::const_iterator p = this->caches_.find(dirname);
if (p == this->caches_.end())
return NULL;
return p->second;
}
// The caches.
Dir_caches* caches;
// A Task to read the directory.
class Dir_cache_task : public gold::Task
{
public:
Dir_cache_task(const char* dir, gold::Task_token& token)
: dir_(dir), token_(token)
{ }
gold::Task_token*
is_runnable();
void
locks(gold::Task_locker*);
void
run(gold::Workqueue*);
std::string
get_name() const
{ return std::string("Dir_cache_task ") + this->dir_; }
private:
const char* dir_;
gold::Task_token& token_;
};
// We can always run the task to read the directory.
gold::Task_token*
Dir_cache_task::is_runnable()
{
return NULL;
}
// Return the locks to hold. We use a blocker lock to prevent file
// lookups from starting until the directory contents have been read.
void
Dir_cache_task::locks(gold::Task_locker* tl)
{
tl->add(this, &this->token_);
}
// Run the task--read the directory contents.
void
Dir_cache_task::run(gold::Workqueue*)
{
caches->add(this->dir_);
}
}
namespace gold
{
// Initialize.
void
Dirsearch::initialize(Workqueue* workqueue,
const General_options::Dir_list* directories)
{
gold_assert(caches == NULL);
caches = new Dir_caches;
this->directories_ = directories;
this->token_.add_blockers(directories->size());
for (General_options::Dir_list::const_iterator p = directories->begin();
p != directories->end();
++p)
workqueue->queue(new Dir_cache_task(p->name().c_str(), this->token_));
}
// Search for a file. NOTE: we only log failed file-lookup attempts
// here. Successfully lookups will eventually get logged in
// File_read::open.
std::string
Dirsearch::find(const std::vector<std::string>& names,
bool* is_in_sysroot, int* pindex,
std::string *found_name) const
{
gold_assert(!this->token_.is_blocked());
gold_assert(*pindex >= 0);
for (unsigned int i = static_cast<unsigned int>(*pindex);
i < this->directories_->size();
++i)
{
const Search_directory* p = &this->directories_->at(i);
Dir_cache* pdc = caches->lookup(p->name().c_str());
gold_assert(pdc != NULL);
for (std::vector<std::string>::const_iterator n = names.begin();
n != names.end();
++n)
{
if (pdc->find(*n))
{
*is_in_sysroot = p->is_in_sysroot();
*pindex = i;
*found_name = *n;
return p->name() + '/' + *n;
}
else
gold_debug(DEBUG_FILES, "Attempt to open %s/%s failed",
p->name().c_str(), (*n).c_str());
}
}
*pindex = -2;
return std::string();
}
// Search for a file in a directory list. This is a low-level function and
// therefore can be used before options and parameters are set.
std::string
Dirsearch::find_file_in_dir_list(const std::string& name,
const General_options::Dir_list& directories,
const std::string& extra_search_dir)
{
struct stat buf;
std::string extra_name = extra_search_dir + '/' + name;
if (stat(extra_name.c_str(), &buf) == 0)
return extra_name;
for (General_options::Dir_list::const_iterator dir = directories.begin();
dir != directories.end();
++dir)
{
std::string full_name = dir->name() + '/' + name;
if (stat(full_name.c_str(), &buf) == 0)
return full_name;
}
return name;
}
} // End namespace gold.
#!/bin/sh
VERSION=2.26
tar --files-from=file.list -xjvf ../binutils-$VERSION.tar.bz2
mv binutils-$VERSION binutils-$VERSION-orig
cp -rf ./binutils-$VERSION-new ./binutils-$VERSION
diff -b --unified -Nr binutils-$VERSION-orig binutils-$VERSION > binutils-$VERSION-compile-warnings.patch
mv binutils-$VERSION-compile-warnings.patch ../patches
rm -rf ./binutils-$VERSION
rm -rf ./binutils-$VERSION-orig
binutils-2.26/gas/config/tc-arm.c
binutils-2.26/gold/arm.cc
binutils-2.26/gold/dirsearch.cc
/* Plugin support for BFD.
Copyright (C) 2009-2015 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
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. */
#ifndef _PLUGIN_H_
#define _PLUGIN_H_
#include "bfd.h"
void bfd_plugin_set_program_name (const char *);
void bfd_plugin_set_plugin (const char *);
bfd_boolean bfd_plugin_target_p (const bfd_target *);
bfd_boolean bfd_plugin_specified_p (void);
void register_ld_plugin_object_p (const bfd_target *(*object_p) (bfd *));