2006-09-20 13:35:11 +02:00
|
|
|
|
# This shell script emits a C file. -*- C -*-
|
|
|
|
|
# It does some substitutions.
|
|
|
|
|
if [ -z "$MACHINE" ]; then
|
|
|
|
|
OUTPUT_ARCH=${ARCH}
|
|
|
|
|
else
|
|
|
|
|
OUTPUT_ARCH=${ARCH}:${MACHINE}
|
|
|
|
|
fi
|
|
|
|
|
rm -f e${EMULATION_NAME}.c
|
|
|
|
|
(echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-)
|
2007-07-19 21:56:10 +02:00
|
|
|
|
fragment <<EOF
|
PR ld/12356
* ldexp.h (exp_assop): Delete.
(exp_assign, exp_defsym): Declare.
* ldexp.c (exp_assop): Make static, handle all assignment variations.
(exp_assign, exp_defsym): New functions.
(exp_provide): Use exp_assop.
* ldgram.y (defsym_expr): Use exp_defsym.
* ldctor.c, * ldgram.y, * ldlang.c, * mri.c, * emultempl/beos.em,
* emultempl/pe.em, * emultempl/pep.em, * emultempl/spuelf.em,
* emultempl/xtensaelf.em: Update exp_assop -> exp_assign.
2011-01-13 14:06:22 +01:00
|
|
|
|
/* Copyright 2006, 2007, 2008, 2009, 2010, 2011
|
|
|
|
|
Free Software Foundation, Inc.
|
2007-07-06 16:09:45 +02:00
|
|
|
|
Written by Kai Tietz, OneVision Software GmbH&CoKg.
|
|
|
|
|
|
|
|
|
|
This file is part of the GNU Binutils.
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
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
|
2007-07-06 16:09:45 +02:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
2006-09-20 13:35:11 +02:00
|
|
|
|
(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
|
2007-07-06 16:09:45 +02:00
|
|
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
|
|
|
MA 02110-1301, USA. */
|
|
|
|
|
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
/* For WINDOWS_XP64 and higher */
|
|
|
|
|
/* Based on pe.em, but modified for 64 bit support. */
|
|
|
|
|
|
|
|
|
|
#define TARGET_IS_${EMULATION_NAME}
|
|
|
|
|
|
|
|
|
|
#define COFF_IMAGE_WITH_PE
|
|
|
|
|
#define COFF_WITH_PE
|
|
|
|
|
#define COFF_WITH_pex64
|
|
|
|
|
|
|
|
|
|
#include "sysdep.h"
|
2007-04-26 16:47:00 +02:00
|
|
|
|
#include "bfd.h"
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#include "bfdlink.h"
|
|
|
|
|
#include "getopt.h"
|
|
|
|
|
#include "libiberty.h"
|
2011-02-28 19:34:52 +01:00
|
|
|
|
#include "filenames.h"
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#include "ld.h"
|
|
|
|
|
#include "ldmain.h"
|
|
|
|
|
#include "ldexp.h"
|
|
|
|
|
#include "ldlang.h"
|
|
|
|
|
#include "ldfile.h"
|
|
|
|
|
#include "ldemul.h"
|
|
|
|
|
#include <ldgram.h>
|
|
|
|
|
#include "ldlex.h"
|
|
|
|
|
#include "ldmisc.h"
|
|
|
|
|
#include "ldctor.h"
|
|
|
|
|
#include "coff/internal.h"
|
|
|
|
|
|
|
|
|
|
/* FIXME: See bfd/peXXigen.c for why we include an architecture specific
|
|
|
|
|
header in generic PE code. */
|
|
|
|
|
#include "coff/x86_64.h"
|
|
|
|
|
#include "coff/pe.h"
|
|
|
|
|
|
|
|
|
|
/* FIXME: This is a BFD internal header file, and we should not be
|
|
|
|
|
using it here. */
|
|
|
|
|
#include "../bfd/libcoff.h"
|
|
|
|
|
|
|
|
|
|
#undef AOUTSZ
|
|
|
|
|
#define AOUTSZ PEPAOUTSZ
|
|
|
|
|
#define PEAOUTHDR PEPAOUTHDR
|
|
|
|
|
|
|
|
|
|
#include "deffile.h"
|
|
|
|
|
#include "pep-dll.h"
|
|
|
|
|
#include "safe-ctype.h"
|
|
|
|
|
|
|
|
|
|
/* Permit the emulation parameters to override the default section
|
|
|
|
|
alignment by setting OVERRIDE_SECTION_ALIGNMENT. FIXME: This makes
|
|
|
|
|
it seem that include/coff/internal.h should not define
|
|
|
|
|
PE_DEF_SECTION_ALIGNMENT. */
|
|
|
|
|
#if PE_DEF_SECTION_ALIGNMENT != ${OVERRIDE_SECTION_ALIGNMENT:-PE_DEF_SECTION_ALIGNMENT}
|
|
|
|
|
#undef PE_DEF_SECTION_ALIGNMENT
|
|
|
|
|
#define PE_DEF_SECTION_ALIGNMENT ${OVERRIDE_SECTION_ALIGNMENT}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef TARGET_IS_i386pep
|
|
|
|
|
#define DLL_SUPPORT
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if defined(TARGET_IS_i386pep) || ! defined(DLL_SUPPORT)
|
|
|
|
|
#define PE_DEF_SUBSYSTEM 3
|
|
|
|
|
#else
|
|
|
|
|
#undef NT_EXE_IMAGE_BASE
|
|
|
|
|
#define NT_EXE_IMAGE_BASE 0x00010000
|
|
|
|
|
#undef PE_DEF_SECTION_ALIGNMENT
|
|
|
|
|
#define PE_DEF_SUBSYSTEM 2
|
|
|
|
|
#undef PE_DEF_FILE_ALIGNMENT
|
|
|
|
|
#define PE_DEF_FILE_ALIGNMENT 0x00000200
|
|
|
|
|
#define PE_DEF_SECTION_ALIGNMENT 0x00000400
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
static struct internal_extra_pe_aouthdr pep;
|
|
|
|
|
static int dll;
|
2009-11-04 19:13:05 +01:00
|
|
|
|
static int pep_subsystem = ${SUBSYSTEM};
|
2006-09-20 13:35:11 +02:00
|
|
|
|
static flagword real_flags = IMAGE_FILE_LARGE_ADDRESS_AWARE;
|
|
|
|
|
static int support_old_code = 0;
|
|
|
|
|
static lang_assignment_statement_type *image_base_statement = 0;
|
include/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
* coff/internal.h (struct internal_extra_pe_aouthdr): Correct type
of DllCharacteristics flags field to unsigned.
* coff/pe.h (IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_NX_COMPAT,
IMAGE_DLLCHARACTERISTICS_NO_ISOLATION,
IMAGE_DLLCHARACTERISTICS_NO_SEH,
IMAGE_DLLCHARACTERISTICS_NO_BIND,
IMAGE_DLLCHARACTERISTICS_WDM_DRIVER,
IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE): New macros to
define flag bit values for DllCharacteristics field of PEAOUTHDR,
PEPAOUTHDR.
ld/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
Danny Smith <dannysmith@users.sourceforge.net>
* emultmpl/pe.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flag bits.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat, no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* emultmpl/pep.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flags.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat,no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* ldtexinfo : Document dynamicbase, forceinteg, nxcompat,
no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
2009-03-14 04:30:26 +01:00
|
|
|
|
static unsigned short pe_dll_characteristics = 0;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
#ifdef DLL_SUPPORT
|
2007-08-06 16:32:08 +02:00
|
|
|
|
static int pep_enable_stdcall_fixup = 1; /* 0=disable 1=enable (default). */
|
2006-09-20 13:35:11 +02:00
|
|
|
|
static char * pep_out_def_filename = NULL;
|
|
|
|
|
static char * pep_implib_filename = NULL;
|
|
|
|
|
static int pep_enable_auto_image_base = 0;
|
|
|
|
|
static char * pep_dll_search_prefix = NULL;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
extern const char *output_filename;
|
|
|
|
|
|
2010-05-15 21:50:44 +02:00
|
|
|
|
static int is_underscoring (void)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{
|
2010-05-15 21:50:44 +02:00
|
|
|
|
int u = 0;
|
|
|
|
|
if (pep_leading_underscore != -1)
|
|
|
|
|
return pep_leading_underscore;
|
|
|
|
|
if (!bfd_get_target_info ("${OUTPUT_FORMAT}", NULL, NULL, &u, NULL))
|
2010-05-11 19:46:22 +02:00
|
|
|
|
bfd_get_target_info ("${RELOCATEABLE_OUTPUT_FORMAT}", NULL, NULL, &u, NULL);
|
|
|
|
|
|
|
|
|
|
if (u == -1)
|
|
|
|
|
abort ();
|
2010-05-15 21:50:44 +02:00
|
|
|
|
pep_leading_underscore = (u != 0 ? 1 : 0);
|
|
|
|
|
return pep_leading_underscore;
|
|
|
|
|
}
|
2010-05-11 19:46:22 +02:00
|
|
|
|
|
2010-05-15 21:50:44 +02:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
gld_${EMULATION_NAME}_before_parse (void)
|
|
|
|
|
{
|
|
|
|
|
is_underscoring ();
|
2006-09-20 13:35:11 +02:00
|
|
|
|
ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`);
|
|
|
|
|
output_filename = "${EXECUTABLE_NAME:-a.exe}";
|
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
config.dynamic_link = TRUE;
|
|
|
|
|
config.has_shared = 1;
|
2010-05-25 12:03:01 +02:00
|
|
|
|
link_info.pei386_auto_import = 1;
|
2008-11-14 16:13:05 +01:00
|
|
|
|
link_info.pei386_runtime_pseudo_reloc = 2; /* Use by default version 2. */
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* PE format extra command line options. */
|
|
|
|
|
|
|
|
|
|
/* Used for setting flags in the PE header. */
|
|
|
|
|
enum options
|
|
|
|
|
{
|
|
|
|
|
OPTION_BASE_FILE = 300 + 1,
|
|
|
|
|
OPTION_DLL,
|
|
|
|
|
OPTION_FILE_ALIGNMENT,
|
|
|
|
|
OPTION_IMAGE_BASE,
|
|
|
|
|
OPTION_MAJOR_IMAGE_VERSION,
|
|
|
|
|
OPTION_MAJOR_OS_VERSION,
|
|
|
|
|
OPTION_MAJOR_SUBSYSTEM_VERSION,
|
|
|
|
|
OPTION_MINOR_IMAGE_VERSION,
|
|
|
|
|
OPTION_MINOR_OS_VERSION,
|
|
|
|
|
OPTION_MINOR_SUBSYSTEM_VERSION,
|
|
|
|
|
OPTION_SECTION_ALIGNMENT,
|
|
|
|
|
OPTION_STACK,
|
|
|
|
|
OPTION_SUBSYSTEM,
|
|
|
|
|
OPTION_HEAP,
|
|
|
|
|
OPTION_SUPPORT_OLD_CODE,
|
|
|
|
|
OPTION_OUT_DEF,
|
|
|
|
|
OPTION_EXPORT_ALL,
|
|
|
|
|
OPTION_EXCLUDE_SYMBOLS,
|
2009-10-16 17:15:39 +02:00
|
|
|
|
OPTION_EXCLUDE_ALL_SYMBOLS,
|
2006-09-20 13:35:11 +02:00
|
|
|
|
OPTION_KILL_ATS,
|
|
|
|
|
OPTION_STDCALL_ALIASES,
|
|
|
|
|
OPTION_ENABLE_STDCALL_FIXUP,
|
|
|
|
|
OPTION_DISABLE_STDCALL_FIXUP,
|
|
|
|
|
OPTION_IMPLIB_FILENAME,
|
|
|
|
|
OPTION_WARN_DUPLICATE_EXPORTS,
|
|
|
|
|
OPTION_IMP_COMPAT,
|
|
|
|
|
OPTION_ENABLE_AUTO_IMAGE_BASE,
|
|
|
|
|
OPTION_DISABLE_AUTO_IMAGE_BASE,
|
|
|
|
|
OPTION_DLL_SEARCH_PREFIX,
|
|
|
|
|
OPTION_NO_DEFAULT_EXCLUDES,
|
|
|
|
|
OPTION_DLL_ENABLE_AUTO_IMPORT,
|
|
|
|
|
OPTION_DLL_DISABLE_AUTO_IMPORT,
|
|
|
|
|
OPTION_ENABLE_EXTRA_PE_DEBUG,
|
|
|
|
|
OPTION_EXCLUDE_LIBS,
|
|
|
|
|
OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC,
|
2008-11-14 16:13:05 +01:00
|
|
|
|
OPTION_DLL_DISABLE_RUNTIME_PSEUDO_RELOC,
|
2009-01-03 19:04:16 +01:00
|
|
|
|
OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V2,
|
2009-01-08 14:28:48 +01:00
|
|
|
|
OPTION_EXCLUDE_MODULES_FOR_IMPLIB,
|
2009-02-18 19:23:08 +01:00
|
|
|
|
OPTION_USE_NUL_PREFIXED_IMPORT_TABLES,
|
2010-04-05 11:04:09 +02:00
|
|
|
|
OPTION_NO_LEADING_UNDERSCORE,
|
|
|
|
|
OPTION_LEADING_UNDERSCORE,
|
2009-02-18 19:23:08 +01:00
|
|
|
|
OPTION_ENABLE_LONG_SECTION_NAMES,
|
include/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
* coff/internal.h (struct internal_extra_pe_aouthdr): Correct type
of DllCharacteristics flags field to unsigned.
* coff/pe.h (IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_NX_COMPAT,
IMAGE_DLLCHARACTERISTICS_NO_ISOLATION,
IMAGE_DLLCHARACTERISTICS_NO_SEH,
IMAGE_DLLCHARACTERISTICS_NO_BIND,
IMAGE_DLLCHARACTERISTICS_WDM_DRIVER,
IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE): New macros to
define flag bit values for DllCharacteristics field of PEAOUTHDR,
PEPAOUTHDR.
ld/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
Danny Smith <dannysmith@users.sourceforge.net>
* emultmpl/pe.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flag bits.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat, no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* emultmpl/pep.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flags.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat,no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* ldtexinfo : Document dynamicbase, forceinteg, nxcompat,
no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
2009-03-14 04:30:26 +01:00
|
|
|
|
OPTION_DISABLE_LONG_SECTION_NAMES,
|
|
|
|
|
OPTION_DYNAMIC_BASE,
|
|
|
|
|
OPTION_FORCE_INTEGRITY,
|
|
|
|
|
OPTION_NX_COMPAT,
|
|
|
|
|
OPTION_NO_ISOLATION,
|
|
|
|
|
OPTION_NO_SEH,
|
|
|
|
|
OPTION_NO_BIND,
|
|
|
|
|
OPTION_WDM_DRIVER,
|
|
|
|
|
OPTION_TERMINAL_SERVER_AWARE
|
2006-09-20 13:35:11 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
gld${EMULATION_NAME}_add_options
|
|
|
|
|
(int ns ATTRIBUTE_UNUSED,
|
|
|
|
|
char **shortopts ATTRIBUTE_UNUSED,
|
|
|
|
|
int nl,
|
|
|
|
|
struct option **longopts,
|
|
|
|
|
int nrl ATTRIBUTE_UNUSED,
|
|
|
|
|
struct option **really_longopts ATTRIBUTE_UNUSED)
|
|
|
|
|
{
|
|
|
|
|
static const struct option xtra_long[] =
|
|
|
|
|
{
|
|
|
|
|
/* PE options */
|
|
|
|
|
{"base-file", required_argument, NULL, OPTION_BASE_FILE},
|
|
|
|
|
{"dll", no_argument, NULL, OPTION_DLL},
|
|
|
|
|
{"file-alignment", required_argument, NULL, OPTION_FILE_ALIGNMENT},
|
|
|
|
|
{"heap", required_argument, NULL, OPTION_HEAP},
|
|
|
|
|
{"image-base", required_argument, NULL, OPTION_IMAGE_BASE},
|
|
|
|
|
{"major-image-version", required_argument, NULL, OPTION_MAJOR_IMAGE_VERSION},
|
|
|
|
|
{"major-os-version", required_argument, NULL, OPTION_MAJOR_OS_VERSION},
|
|
|
|
|
{"major-subsystem-version", required_argument, NULL, OPTION_MAJOR_SUBSYSTEM_VERSION},
|
|
|
|
|
{"minor-image-version", required_argument, NULL, OPTION_MINOR_IMAGE_VERSION},
|
|
|
|
|
{"minor-os-version", required_argument, NULL, OPTION_MINOR_OS_VERSION},
|
|
|
|
|
{"minor-subsystem-version", required_argument, NULL, OPTION_MINOR_SUBSYSTEM_VERSION},
|
|
|
|
|
{"section-alignment", required_argument, NULL, OPTION_SECTION_ALIGNMENT},
|
|
|
|
|
{"stack", required_argument, NULL, OPTION_STACK},
|
|
|
|
|
{"subsystem", required_argument, NULL, OPTION_SUBSYSTEM},
|
|
|
|
|
{"support-old-code", no_argument, NULL, OPTION_SUPPORT_OLD_CODE},
|
2009-01-08 14:28:48 +01:00
|
|
|
|
{"use-nul-prefixed-import-tables", no_argument, NULL,
|
|
|
|
|
OPTION_USE_NUL_PREFIXED_IMPORT_TABLES},
|
2010-04-05 11:04:09 +02:00
|
|
|
|
{"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE},
|
|
|
|
|
{"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE},
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
/* getopt allows abbreviations, so we do this to stop it
|
|
|
|
|
from treating -o as an abbreviation for this option. */
|
|
|
|
|
{"output-def", required_argument, NULL, OPTION_OUT_DEF},
|
|
|
|
|
{"output-def", required_argument, NULL, OPTION_OUT_DEF},
|
|
|
|
|
{"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL},
|
|
|
|
|
{"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS},
|
2009-10-16 17:15:39 +02:00
|
|
|
|
{"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS},
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS},
|
2009-01-03 19:04:16 +01:00
|
|
|
|
{"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB},
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{"kill-at", no_argument, NULL, OPTION_KILL_ATS},
|
|
|
|
|
{"add-stdcall-alias", no_argument, NULL, OPTION_STDCALL_ALIASES},
|
|
|
|
|
{"enable-stdcall-fixup", no_argument, NULL, OPTION_ENABLE_STDCALL_FIXUP},
|
|
|
|
|
{"disable-stdcall-fixup", no_argument, NULL, OPTION_DISABLE_STDCALL_FIXUP},
|
|
|
|
|
{"out-implib", required_argument, NULL, OPTION_IMPLIB_FILENAME},
|
|
|
|
|
{"warn-duplicate-exports", no_argument, NULL, OPTION_WARN_DUPLICATE_EXPORTS},
|
|
|
|
|
/* getopt() allows abbreviations, so we do this to stop it from
|
|
|
|
|
treating -c as an abbreviation for these --compat-implib. */
|
|
|
|
|
{"compat-implib", no_argument, NULL, OPTION_IMP_COMPAT},
|
|
|
|
|
{"compat-implib", no_argument, NULL, OPTION_IMP_COMPAT},
|
|
|
|
|
{"enable-auto-image-base", no_argument, NULL, OPTION_ENABLE_AUTO_IMAGE_BASE},
|
|
|
|
|
{"disable-auto-image-base", no_argument, NULL, OPTION_DISABLE_AUTO_IMAGE_BASE},
|
|
|
|
|
{"dll-search-prefix", required_argument, NULL, OPTION_DLL_SEARCH_PREFIX},
|
|
|
|
|
{"no-default-excludes", no_argument, NULL, OPTION_NO_DEFAULT_EXCLUDES},
|
|
|
|
|
{"enable-auto-import", no_argument, NULL, OPTION_DLL_ENABLE_AUTO_IMPORT},
|
|
|
|
|
{"disable-auto-import", no_argument, NULL, OPTION_DLL_DISABLE_AUTO_IMPORT},
|
|
|
|
|
{"enable-extra-pep-debug", no_argument, NULL, OPTION_ENABLE_EXTRA_PE_DEBUG},
|
|
|
|
|
{"enable-runtime-pseudo-reloc", no_argument, NULL, OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC},
|
|
|
|
|
{"disable-runtime-pseudo-reloc", no_argument, NULL, OPTION_DLL_DISABLE_RUNTIME_PSEUDO_RELOC},
|
2008-11-14 16:13:05 +01:00
|
|
|
|
{"enable-runtime-pseudo-reloc-v2", no_argument, NULL, OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V2},
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#endif
|
2009-02-18 19:23:08 +01:00
|
|
|
|
{"enable-long-section-names", no_argument, NULL, OPTION_ENABLE_LONG_SECTION_NAMES},
|
|
|
|
|
{"disable-long-section-names", no_argument, NULL, OPTION_DISABLE_LONG_SECTION_NAMES},
|
include/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
* coff/internal.h (struct internal_extra_pe_aouthdr): Correct type
of DllCharacteristics flags field to unsigned.
* coff/pe.h (IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_NX_COMPAT,
IMAGE_DLLCHARACTERISTICS_NO_ISOLATION,
IMAGE_DLLCHARACTERISTICS_NO_SEH,
IMAGE_DLLCHARACTERISTICS_NO_BIND,
IMAGE_DLLCHARACTERISTICS_WDM_DRIVER,
IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE): New macros to
define flag bit values for DllCharacteristics field of PEAOUTHDR,
PEPAOUTHDR.
ld/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
Danny Smith <dannysmith@users.sourceforge.net>
* emultmpl/pe.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flag bits.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat, no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* emultmpl/pep.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flags.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat,no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* ldtexinfo : Document dynamicbase, forceinteg, nxcompat,
no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
2009-03-14 04:30:26 +01:00
|
|
|
|
{"dynamicbase",no_argument, NULL, OPTION_DYNAMIC_BASE},
|
|
|
|
|
{"forceinteg", no_argument, NULL, OPTION_FORCE_INTEGRITY},
|
|
|
|
|
{"nxcompat", no_argument, NULL, OPTION_NX_COMPAT},
|
|
|
|
|
{"no-isolation", no_argument, NULL, OPTION_NO_ISOLATION},
|
|
|
|
|
{"no-seh", no_argument, NULL, OPTION_NO_SEH},
|
|
|
|
|
{"no-bind", no_argument, NULL, OPTION_NO_BIND},
|
|
|
|
|
{"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER},
|
ld/
* ldlang.c (lang_output_section_statement_lookup): Add function
comment. Make "name" non-const. Ensure duplicate entries use
the same string, allowing simple comparison in hash bucket loop.
Tweak constraint check.
(next_matching_output_section_statement): New function.
* ldlang.h (lang_output_section_statement_lookup): Update.
(next_matching_output_section_statement): Declare.
* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
combine orphan sections when input sections flags differ in
alloc or load.
* emultempl/pe.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
* emultempl/pep.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
ld/testsuite/
* ld-elf/orphan3.d, * ld-elf/orphan3a.s, * ld-elf/orphan3b.s,
* ld-elf/orphan3c.s, * ld-elf/orphan3d.s, * ld-elf/orphan3e.s,
* ld-elf/orphan3f.s: New test.
* ld-pe/orphan.d, * ld-pe/orphana.s, * ld-pe/orphanb.s,
* ld-pe/orphand.s, * ld-pe/orphane.s: New test.
* ld-pe/direct.exp: Use is_pecoff_format.
* ld-pe/longsecn.exp: Delete.
* ld-pe/pe.exp: Run new test and longsecn tests.
2009-05-15 16:22:36 +02:00
|
|
|
|
{"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE},
|
|
|
|
|
{NULL, no_argument, NULL, 0}
|
2006-09-20 13:35:11 +02:00
|
|
|
|
};
|
|
|
|
|
|
ld/
* ldlang.c (lang_output_section_statement_lookup): Add function
comment. Make "name" non-const. Ensure duplicate entries use
the same string, allowing simple comparison in hash bucket loop.
Tweak constraint check.
(next_matching_output_section_statement): New function.
* ldlang.h (lang_output_section_statement_lookup): Update.
(next_matching_output_section_statement): Declare.
* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
combine orphan sections when input sections flags differ in
alloc or load.
* emultempl/pe.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
* emultempl/pep.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
ld/testsuite/
* ld-elf/orphan3.d, * ld-elf/orphan3a.s, * ld-elf/orphan3b.s,
* ld-elf/orphan3c.s, * ld-elf/orphan3d.s, * ld-elf/orphan3e.s,
* ld-elf/orphan3f.s: New test.
* ld-pe/orphan.d, * ld-pe/orphana.s, * ld-pe/orphanb.s,
* ld-pe/orphand.s, * ld-pe/orphane.s: New test.
* ld-pe/direct.exp: Use is_pecoff_format.
* ld-pe/longsecn.exp: Delete.
* ld-pe/pe.exp: Run new test and longsecn tests.
2009-05-15 16:22:36 +02:00
|
|
|
|
*longopts
|
|
|
|
|
= xrealloc (*longopts, nl * sizeof (struct option) + sizeof (xtra_long));
|
2006-09-20 13:35:11 +02:00
|
|
|
|
memcpy (*longopts + nl, &xtra_long, sizeof (xtra_long));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* PE/WIN32; added routines to get the subsystem type, heap and/or stack
|
|
|
|
|
parameters which may be input from the command line. */
|
|
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
|
{
|
|
|
|
|
void *ptr;
|
|
|
|
|
int size;
|
2008-05-09 13:56:31 +02:00
|
|
|
|
bfd_vma value;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
char *symbol;
|
|
|
|
|
int inited;
|
2010-04-05 11:04:09 +02:00
|
|
|
|
/* FALSE for an assembly level symbol and TRUE for a C visible symbol.
|
|
|
|
|
C visible symbols can be prefixed by underscore dependent on target's
|
|
|
|
|
settings. */
|
|
|
|
|
bfd_boolean is_c_symbol;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
} definfo;
|
|
|
|
|
|
2010-04-05 11:04:09 +02:00
|
|
|
|
#define GET_INIT_SYMBOL_NAME(IDX) \
|
|
|
|
|
(init[(IDX)].symbol \
|
2010-05-15 21:50:44 +02:00
|
|
|
|
+ ((init[(IDX)].is_c_symbol == FALSE || (is_underscoring () == 1)) ? 0 : 1))
|
2010-04-05 11:04:09 +02:00
|
|
|
|
|
|
|
|
|
/* Decorates the C visible symbol by underscore, if target requires. */
|
|
|
|
|
#define U(CSTR) \
|
2010-05-15 21:50:44 +02:00
|
|
|
|
((is_underscoring () == 0) ? CSTR : "_" CSTR)
|
2010-04-05 11:04:09 +02:00
|
|
|
|
|
|
|
|
|
/* Get size of constant string for a possible underscore prefixed
|
|
|
|
|
C visible symbol. */
|
|
|
|
|
#define U_SIZE(CSTR) \
|
2010-05-15 21:50:44 +02:00
|
|
|
|
(sizeof (CSTR) + (is_underscoring () == 0 ? 0 : 1))
|
2010-04-05 11:04:09 +02:00
|
|
|
|
|
|
|
|
|
#define D(field,symbol,def,usc) {&pep.field,sizeof(pep.field), def, symbol,0, usc}
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
static definfo init[] =
|
|
|
|
|
{
|
|
|
|
|
/* imagebase must be first */
|
|
|
|
|
#define IMAGEBASEOFF 0
|
2010-04-05 11:04:09 +02:00
|
|
|
|
D(ImageBase,"__image_base__", NT_EXE_IMAGE_BASE, FALSE),
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#define DLLOFF 1
|
2010-04-05 11:04:09 +02:00
|
|
|
|
{&dll, sizeof(dll), 0, "__dll__", 0, FALSE},
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#define MSIMAGEBASEOFF 2
|
2010-04-05 11:04:09 +02:00
|
|
|
|
D(ImageBase, "___ImageBase", NT_EXE_IMAGE_BASE, TRUE),
|
|
|
|
|
D(SectionAlignment,"__section_alignment__", PE_DEF_SECTION_ALIGNMENT, FALSE),
|
|
|
|
|
D(FileAlignment,"__file_alignment__", PE_DEF_FILE_ALIGNMENT, FALSE),
|
|
|
|
|
D(MajorOperatingSystemVersion,"__major_os_version__", 4, FALSE),
|
|
|
|
|
D(MinorOperatingSystemVersion,"__minor_os_version__", 0, FALSE),
|
|
|
|
|
D(MajorImageVersion,"__major_image_version__", 0, FALSE),
|
|
|
|
|
D(MinorImageVersion,"__minor_image_version__", 0, FALSE),
|
|
|
|
|
D(MajorSubsystemVersion,"__major_subsystem_version__", 5, FALSE),
|
|
|
|
|
D(MinorSubsystemVersion,"__minor_subsystem_version__", 2, FALSE),
|
|
|
|
|
D(Subsystem,"__subsystem__", ${SUBSYSTEM}, FALSE),
|
|
|
|
|
D(SizeOfStackReserve,"__size_of_stack_reserve__", 0x200000, FALSE),
|
|
|
|
|
D(SizeOfStackCommit,"__size_of_stack_commit__", 0x1000, FALSE),
|
|
|
|
|
D(SizeOfHeapReserve,"__size_of_heap_reserve__", 0x100000, FALSE),
|
|
|
|
|
D(SizeOfHeapCommit,"__size_of_heap_commit__", 0x1000, FALSE),
|
|
|
|
|
D(LoaderFlags,"__loader_flags__", 0x0, FALSE),
|
|
|
|
|
D(DllCharacteristics, "__dll_characteristics__", 0x0, FALSE),
|
|
|
|
|
{ NULL, 0, 0, NULL, 0, FALSE}
|
2006-09-20 13:35:11 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
gld_${EMULATION_NAME}_list_options (FILE *file)
|
|
|
|
|
{
|
|
|
|
|
fprintf (file, _(" --base_file <basefile> Generate a base file for relocatable DLLs\n"));
|
|
|
|
|
fprintf (file, _(" --dll Set image base to the default for DLLs\n"));
|
|
|
|
|
fprintf (file, _(" --file-alignment <size> Set file alignment\n"));
|
|
|
|
|
fprintf (file, _(" --heap <size> Set initial size of the heap\n"));
|
|
|
|
|
fprintf (file, _(" --image-base <address> Set start address of the executable\n"));
|
|
|
|
|
fprintf (file, _(" --major-image-version <number> Set version number of the executable\n"));
|
|
|
|
|
fprintf (file, _(" --major-os-version <number> Set minimum required OS version\n"));
|
|
|
|
|
fprintf (file, _(" --major-subsystem-version <number> Set minimum required OS subsystem version\n"));
|
|
|
|
|
fprintf (file, _(" --minor-image-version <number> Set revision number of the executable\n"));
|
|
|
|
|
fprintf (file, _(" --minor-os-version <number> Set minimum required OS revision\n"));
|
|
|
|
|
fprintf (file, _(" --minor-subsystem-version <number> Set minimum required OS subsystem revision\n"));
|
|
|
|
|
fprintf (file, _(" --section-alignment <size> Set section alignment\n"));
|
|
|
|
|
fprintf (file, _(" --stack <size> Set size of the initial stack\n"));
|
|
|
|
|
fprintf (file, _(" --subsystem <name>[:<version>] Set required OS subsystem [& version]\n"));
|
|
|
|
|
fprintf (file, _(" --support-old-code Support interworking with old code\n"));
|
2010-04-05 11:04:09 +02:00
|
|
|
|
fprintf (file, _(" --[no-]leading-underscore Set explicit symbol underscore prefix mode\n"));
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
fprintf (file, _(" --add-stdcall-alias Export symbols with and without @nn\n"));
|
|
|
|
|
fprintf (file, _(" --disable-stdcall-fixup Don't link _sym to _sym@nn\n"));
|
|
|
|
|
fprintf (file, _(" --enable-stdcall-fixup Link _sym to _sym@nn without warnings\n"));
|
|
|
|
|
fprintf (file, _(" --exclude-symbols sym,sym,... Exclude symbols from automatic export\n"));
|
2009-10-16 17:15:39 +02:00
|
|
|
|
fprintf (file, _(" --exclude-all-symbols Exclude all symbols from automatic export\n"));
|
2006-09-20 13:35:11 +02:00
|
|
|
|
fprintf (file, _(" --exclude-libs lib,lib,... Exclude libraries from automatic export\n"));
|
2009-01-03 19:04:16 +01:00
|
|
|
|
fprintf (file, _(" --exclude-modules-for-implib mod,mod,...\n"));
|
|
|
|
|
fprintf (file, _(" Exclude objects, archive members from auto\n"));
|
|
|
|
|
fprintf (file, _(" export, place into import library instead.\n"));
|
2006-09-20 13:35:11 +02:00
|
|
|
|
fprintf (file, _(" --export-all-symbols Automatically export all globals to DLL\n"));
|
|
|
|
|
fprintf (file, _(" --kill-at Remove @nn from exported symbols\n"));
|
|
|
|
|
fprintf (file, _(" --out-implib <file> Generate import library\n"));
|
|
|
|
|
fprintf (file, _(" --output-def <file> Generate a .DEF file for the built DLL\n"));
|
|
|
|
|
fprintf (file, _(" --warn-duplicate-exports Warn about duplicate exports.\n"));
|
|
|
|
|
fprintf (file, _(" --compat-implib Create backward compatible import libs;\n\
|
|
|
|
|
create __imp_<SYMBOL> as well.\n"));
|
|
|
|
|
fprintf (file, _(" --enable-auto-image-base Automatically choose image base for DLLs\n\
|
|
|
|
|
unless user specifies one\n"));
|
|
|
|
|
fprintf (file, _(" --disable-auto-image-base Do not auto-choose image base. (default)\n"));
|
|
|
|
|
fprintf (file, _(" --dll-search-prefix=<string> When linking dynamically to a dll without\n\
|
|
|
|
|
an importlib, use <string><basename>.dll\n\
|
|
|
|
|
in preference to lib<basename>.dll \n"));
|
2010-11-15 23:01:17 +01:00
|
|
|
|
fprintf (file, _(" --enable-auto-import Do sophisticated linking of _sym to\n\
|
2006-09-20 13:35:11 +02:00
|
|
|
|
__imp_sym for DATA references\n"));
|
|
|
|
|
fprintf (file, _(" --disable-auto-import Do not auto-import DATA items from DLLs\n"));
|
|
|
|
|
fprintf (file, _(" --enable-runtime-pseudo-reloc Work around auto-import limitations by\n\
|
|
|
|
|
adding pseudo-relocations resolved at\n\
|
|
|
|
|
runtime.\n"));
|
|
|
|
|
fprintf (file, _(" --disable-runtime-pseudo-reloc Do not add runtime pseudo-relocations for\n\
|
|
|
|
|
auto-imported DATA.\n"));
|
|
|
|
|
fprintf (file, _(" --enable-extra-pep-debug Enable verbose debug output when building\n\
|
|
|
|
|
or linking to DLLs (esp. auto-import)\n"));
|
2009-02-18 19:23:08 +01:00
|
|
|
|
fprintf (file, _(" --enable-long-section-names Use long COFF section names even in\n\
|
|
|
|
|
executable image files\n"));
|
|
|
|
|
fprintf (file, _(" --disable-long-section-names Never use long COFF section names, even\n\
|
|
|
|
|
in object files\n"));
|
include/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
* coff/internal.h (struct internal_extra_pe_aouthdr): Correct type
of DllCharacteristics flags field to unsigned.
* coff/pe.h (IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_NX_COMPAT,
IMAGE_DLLCHARACTERISTICS_NO_ISOLATION,
IMAGE_DLLCHARACTERISTICS_NO_SEH,
IMAGE_DLLCHARACTERISTICS_NO_BIND,
IMAGE_DLLCHARACTERISTICS_WDM_DRIVER,
IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE): New macros to
define flag bit values for DllCharacteristics field of PEAOUTHDR,
PEPAOUTHDR.
ld/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
Danny Smith <dannysmith@users.sourceforge.net>
* emultmpl/pe.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flag bits.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat, no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* emultmpl/pep.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flags.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat,no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* ldtexinfo : Document dynamicbase, forceinteg, nxcompat,
no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
2009-03-14 04:30:26 +01:00
|
|
|
|
fprintf (file, _(" --dynamicbase Image base address may be relocated using\n\
|
|
|
|
|
address space layout randomization (ASLR)\n"));
|
|
|
|
|
fprintf (file, _(" --forceinteg Code integrity checks are enforced\n"));
|
|
|
|
|
fprintf (file, _(" --nxcompat Image is compatible with data execution prevention\n"));
|
|
|
|
|
fprintf (file, _(" --no-isolation Image understands isolation but do not isolate the image\n"));
|
|
|
|
|
fprintf (file, _(" --no-seh Image does not use SEH. No SE handler may\n\
|
|
|
|
|
be called in this image\n"));
|
ld/
* ldlang.c (lang_output_section_statement_lookup): Add function
comment. Make "name" non-const. Ensure duplicate entries use
the same string, allowing simple comparison in hash bucket loop.
Tweak constraint check.
(next_matching_output_section_statement): New function.
* ldlang.h (lang_output_section_statement_lookup): Update.
(next_matching_output_section_statement): Declare.
* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
combine orphan sections when input sections flags differ in
alloc or load.
* emultempl/pe.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
* emultempl/pep.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
ld/testsuite/
* ld-elf/orphan3.d, * ld-elf/orphan3a.s, * ld-elf/orphan3b.s,
* ld-elf/orphan3c.s, * ld-elf/orphan3d.s, * ld-elf/orphan3e.s,
* ld-elf/orphan3f.s: New test.
* ld-pe/orphan.d, * ld-pe/orphana.s, * ld-pe/orphanb.s,
* ld-pe/orphand.s, * ld-pe/orphane.s: New test.
* ld-pe/direct.exp: Use is_pecoff_format.
* ld-pe/longsecn.exp: Delete.
* ld-pe/pe.exp: Run new test and longsecn tests.
2009-05-15 16:22:36 +02:00
|
|
|
|
fprintf (file, _(" --no-bind Do not bind this image\n"));
|
include/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
* coff/internal.h (struct internal_extra_pe_aouthdr): Correct type
of DllCharacteristics flags field to unsigned.
* coff/pe.h (IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_NX_COMPAT,
IMAGE_DLLCHARACTERISTICS_NO_ISOLATION,
IMAGE_DLLCHARACTERISTICS_NO_SEH,
IMAGE_DLLCHARACTERISTICS_NO_BIND,
IMAGE_DLLCHARACTERISTICS_WDM_DRIVER,
IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE): New macros to
define flag bit values for DllCharacteristics field of PEAOUTHDR,
PEPAOUTHDR.
ld/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
Danny Smith <dannysmith@users.sourceforge.net>
* emultmpl/pe.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flag bits.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat, no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* emultmpl/pep.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flags.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat,no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* ldtexinfo : Document dynamicbase, forceinteg, nxcompat,
no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
2009-03-14 04:30:26 +01:00
|
|
|
|
fprintf (file, _(" --wdmdriver Driver uses the WDM model\n"));
|
2010-04-05 11:04:09 +02:00
|
|
|
|
fprintf (file, _(" --tsaware Image is Terminal Server aware\n"));
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2008-05-09 13:56:31 +02:00
|
|
|
|
set_pep_name (char *name, bfd_vma val)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{
|
2010-05-15 21:50:44 +02:00
|
|
|
|
int i;
|
|
|
|
|
is_underscoring ();
|
2006-09-20 13:35:11 +02:00
|
|
|
|
/* Find the name and set it. */
|
|
|
|
|
for (i = 0; init[i].ptr; i++)
|
|
|
|
|
{
|
2010-04-05 11:04:09 +02:00
|
|
|
|
if (strcmp (name, GET_INIT_SYMBOL_NAME (i)) == 0)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{
|
|
|
|
|
init[i].value = val;
|
|
|
|
|
init[i].inited = 1;
|
|
|
|
|
if (strcmp (name,"__image_base__") == 0)
|
2010-04-05 11:04:09 +02:00
|
|
|
|
set_pep_name (U ("__ImageBase"), val);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
|
2009-11-04 19:13:05 +01:00
|
|
|
|
static void
|
|
|
|
|
set_entry_point (void)
|
|
|
|
|
{
|
|
|
|
|
const char *entry;
|
|
|
|
|
const char *initial_symbol_char;
|
2010-05-15 21:50:44 +02:00
|
|
|
|
int i;
|
2009-11-04 19:13:05 +01:00
|
|
|
|
|
|
|
|
|
static const struct
|
|
|
|
|
{
|
|
|
|
|
const int value;
|
|
|
|
|
const char *entry;
|
|
|
|
|
}
|
|
|
|
|
v[] =
|
|
|
|
|
{
|
|
|
|
|
{ 1, "NtProcessStartup" },
|
|
|
|
|
{ 2, "WinMainCRTStartup" },
|
|
|
|
|
{ 3, "mainCRTStartup" },
|
|
|
|
|
{ 7, "__PosixProcessStartup" },
|
|
|
|
|
{ 9, "WinMainCRTStartup" },
|
|
|
|
|
{14, "mainCRTStartup" },
|
|
|
|
|
{ 0, NULL }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Entry point name for arbitrary subsystem numbers. */
|
|
|
|
|
static const char default_entry[] = "mainCRTStartup";
|
|
|
|
|
|
|
|
|
|
if (link_info.shared || dll)
|
|
|
|
|
{
|
|
|
|
|
entry = "DllMainCRTStartup";
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
for (i = 0; v[i].entry; i++)
|
|
|
|
|
if (v[i].value == pep_subsystem)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* If no match, use the default. */
|
|
|
|
|
if (v[i].entry != NULL)
|
|
|
|
|
entry = v[i].entry;
|
|
|
|
|
else
|
|
|
|
|
entry = default_entry;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-05 11:04:09 +02:00
|
|
|
|
/* Now we check target's default for getting proper symbol_char. */
|
2010-05-15 21:50:44 +02:00
|
|
|
|
initial_symbol_char = (is_underscoring () != 0 ? "_" : "");
|
2010-04-05 11:04:09 +02:00
|
|
|
|
|
2009-11-04 19:13:05 +01:00
|
|
|
|
if (*initial_symbol_char != '\0')
|
|
|
|
|
{
|
|
|
|
|
char *alc_entry;
|
|
|
|
|
|
|
|
|
|
/* lang_default_entry expects its argument to be permanently
|
|
|
|
|
allocated, so we don't free this string. */
|
|
|
|
|
alc_entry = xmalloc (strlen (initial_symbol_char)
|
|
|
|
|
+ strlen (entry)
|
|
|
|
|
+ 1);
|
|
|
|
|
strcpy (alc_entry, initial_symbol_char);
|
|
|
|
|
strcat (alc_entry, entry);
|
|
|
|
|
entry = alc_entry;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
lang_default_entry (entry);
|
|
|
|
|
}
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_pep_subsystem (void)
|
|
|
|
|
{
|
|
|
|
|
const char *sver;
|
|
|
|
|
char *end;
|
|
|
|
|
int len;
|
|
|
|
|
int i;
|
|
|
|
|
unsigned long temp_subsystem;
|
|
|
|
|
static const struct
|
|
|
|
|
{
|
|
|
|
|
const char *name;
|
|
|
|
|
const int value;
|
|
|
|
|
}
|
|
|
|
|
v[] =
|
|
|
|
|
{
|
2009-11-04 19:13:05 +01:00
|
|
|
|
{ "native", 1 },
|
|
|
|
|
{ "windows", 2 },
|
|
|
|
|
{ "console", 3 },
|
|
|
|
|
{ "posix", 7 },
|
|
|
|
|
{ "wince", 9 },
|
|
|
|
|
{ "xbox", 14 },
|
|
|
|
|
{ NULL, 0 }
|
2006-09-20 13:35:11 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Check for the presence of a version number. */
|
|
|
|
|
sver = strchr (optarg, ':');
|
|
|
|
|
if (sver == NULL)
|
|
|
|
|
len = strlen (optarg);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
len = sver - optarg;
|
|
|
|
|
set_pep_name ("__major_subsystem_version__",
|
|
|
|
|
strtoul (sver + 1, &end, 0));
|
|
|
|
|
if (*end == '.')
|
|
|
|
|
set_pep_name ("__minor_subsystem_version__",
|
|
|
|
|
strtoul (end + 1, &end, 0));
|
|
|
|
|
if (*end != '\0')
|
|
|
|
|
einfo (_("%P: warning: bad version number in -subsystem option\n"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check for numeric subsystem. */
|
|
|
|
|
temp_subsystem = strtoul (optarg, & end, 0);
|
|
|
|
|
if ((*end == ':' || *end == '\0') && (temp_subsystem < 65536))
|
|
|
|
|
{
|
|
|
|
|
/* Search list for a numeric match to use its entry point. */
|
|
|
|
|
for (i = 0; v[i].name; i++)
|
|
|
|
|
if (v[i].value == (int) temp_subsystem)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Use this subsystem. */
|
2009-11-04 19:13:05 +01:00
|
|
|
|
pep_subsystem = (int) temp_subsystem;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Search for subsystem by name. */
|
|
|
|
|
for (i = 0; v[i].name; i++)
|
|
|
|
|
if (strncmp (optarg, v[i].name, len) == 0
|
|
|
|
|
&& v[i].name[len] == '\0')
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (v[i].name == NULL)
|
|
|
|
|
{
|
|
|
|
|
einfo (_("%P%F: invalid subsystem type %s\n"), optarg);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2009-11-04 19:13:05 +01:00
|
|
|
|
pep_subsystem = v[i].value;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
2009-11-04 19:13:05 +01:00
|
|
|
|
set_pep_name ("__subsystem__", pep_subsystem);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_pep_value (char *name)
|
|
|
|
|
{
|
|
|
|
|
char *end;
|
|
|
|
|
|
2008-05-09 13:56:31 +02:00
|
|
|
|
set_pep_name (name, (bfd_vma) strtoull (optarg, &end, 0));
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
if (end == optarg)
|
|
|
|
|
einfo (_("%P%F: invalid hex number for PE parameter '%s'\n"), optarg);
|
|
|
|
|
|
|
|
|
|
optarg = end;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_pep_stack_heap (char *resname, char *comname)
|
|
|
|
|
{
|
|
|
|
|
set_pep_value (resname);
|
|
|
|
|
|
|
|
|
|
if (*optarg == ',')
|
|
|
|
|
{
|
|
|
|
|
optarg++;
|
|
|
|
|
set_pep_value (comname);
|
|
|
|
|
}
|
|
|
|
|
else if (*optarg)
|
|
|
|
|
einfo (_("%P%F: strange hex info for PE parameter '%s'\n"), optarg);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
gld${EMULATION_NAME}_handle_option (int optc)
|
|
|
|
|
{
|
2010-05-15 21:50:44 +02:00
|
|
|
|
is_underscoring ();
|
2006-09-20 13:35:11 +02:00
|
|
|
|
switch (optc)
|
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
case OPTION_BASE_FILE:
|
|
|
|
|
link_info.base_file = fopen (optarg, FOPEN_WB);
|
|
|
|
|
if (link_info.base_file == NULL)
|
2011-01-14 13:37:17 +01:00
|
|
|
|
einfo (_("%F%P: cannot open base file %s\n"), optarg);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* PE options. */
|
|
|
|
|
case OPTION_HEAP:
|
|
|
|
|
set_pep_stack_heap ("__size_of_heap_reserve__", "__size_of_heap_commit__");
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_STACK:
|
|
|
|
|
set_pep_stack_heap ("__size_of_stack_reserve__", "__size_of_stack_commit__");
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_SUBSYSTEM:
|
|
|
|
|
set_pep_subsystem ();
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_MAJOR_OS_VERSION:
|
|
|
|
|
set_pep_value ("__major_os_version__");
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_MINOR_OS_VERSION:
|
|
|
|
|
set_pep_value ("__minor_os_version__");
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_MAJOR_SUBSYSTEM_VERSION:
|
|
|
|
|
set_pep_value ("__major_subsystem_version__");
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_MINOR_SUBSYSTEM_VERSION:
|
|
|
|
|
set_pep_value ("__minor_subsystem_version__");
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_MAJOR_IMAGE_VERSION:
|
|
|
|
|
set_pep_value ("__major_image_version__");
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_MINOR_IMAGE_VERSION:
|
|
|
|
|
set_pep_value ("__minor_image_version__");
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_FILE_ALIGNMENT:
|
|
|
|
|
set_pep_value ("__file_alignment__");
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_SECTION_ALIGNMENT:
|
|
|
|
|
set_pep_value ("__section_alignment__");
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_DLL:
|
|
|
|
|
set_pep_name ("__dll__", 1);
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_IMAGE_BASE:
|
|
|
|
|
set_pep_value ("__image_base__");
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_SUPPORT_OLD_CODE:
|
|
|
|
|
support_old_code = 1;
|
|
|
|
|
break;
|
2009-01-08 14:28:48 +01:00
|
|
|
|
case OPTION_USE_NUL_PREFIXED_IMPORT_TABLES:
|
|
|
|
|
pep_use_nul_prefixed_import_tables = TRUE;
|
|
|
|
|
break;
|
2010-04-05 11:04:09 +02:00
|
|
|
|
case OPTION_NO_LEADING_UNDERSCORE:
|
|
|
|
|
pep_leading_underscore = 0;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_LEADING_UNDERSCORE:
|
|
|
|
|
pep_leading_underscore = 1;
|
|
|
|
|
break;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
case OPTION_OUT_DEF:
|
|
|
|
|
pep_out_def_filename = xstrdup (optarg);
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_EXPORT_ALL:
|
|
|
|
|
pep_dll_export_everything = 1;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_EXCLUDE_SYMBOLS:
|
2009-01-03 19:04:16 +01:00
|
|
|
|
pep_dll_add_excludes (optarg, EXCLUDESYMS);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
break;
|
2009-10-16 17:15:39 +02:00
|
|
|
|
case OPTION_EXCLUDE_ALL_SYMBOLS:
|
|
|
|
|
pep_dll_exclude_all_symbols = 1;
|
|
|
|
|
break;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
case OPTION_EXCLUDE_LIBS:
|
2009-01-03 19:04:16 +01:00
|
|
|
|
pep_dll_add_excludes (optarg, EXCLUDELIBS);
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_EXCLUDE_MODULES_FOR_IMPLIB:
|
|
|
|
|
pep_dll_add_excludes (optarg, EXCLUDEFORIMPLIB);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
break;
|
|
|
|
|
case OPTION_KILL_ATS:
|
|
|
|
|
pep_dll_kill_ats = 1;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_STDCALL_ALIASES:
|
|
|
|
|
pep_dll_stdcall_aliases = 1;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_ENABLE_STDCALL_FIXUP:
|
|
|
|
|
pep_enable_stdcall_fixup = 1;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_DISABLE_STDCALL_FIXUP:
|
|
|
|
|
pep_enable_stdcall_fixup = 0;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_IMPLIB_FILENAME:
|
|
|
|
|
pep_implib_filename = xstrdup (optarg);
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_WARN_DUPLICATE_EXPORTS:
|
|
|
|
|
pep_dll_warn_dup_exports = 1;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_IMP_COMPAT:
|
|
|
|
|
pep_dll_compat_implib = 1;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_ENABLE_AUTO_IMAGE_BASE:
|
|
|
|
|
pep_enable_auto_image_base = 1;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_DISABLE_AUTO_IMAGE_BASE:
|
|
|
|
|
pep_enable_auto_image_base = 0;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_DLL_SEARCH_PREFIX:
|
|
|
|
|
pep_dll_search_prefix = xstrdup (optarg);
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_NO_DEFAULT_EXCLUDES:
|
|
|
|
|
pep_dll_do_default_excludes = 0;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_DLL_ENABLE_AUTO_IMPORT:
|
|
|
|
|
link_info.pei386_auto_import = 1;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_DLL_DISABLE_AUTO_IMPORT:
|
|
|
|
|
link_info.pei386_auto_import = 0;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC:
|
2008-11-14 16:13:05 +01:00
|
|
|
|
link_info.pei386_runtime_pseudo_reloc = 2;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
break;
|
|
|
|
|
case OPTION_DLL_DISABLE_RUNTIME_PSEUDO_RELOC:
|
|
|
|
|
link_info.pei386_runtime_pseudo_reloc = 0;
|
|
|
|
|
break;
|
2008-11-14 16:13:05 +01:00
|
|
|
|
case OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V2:
|
|
|
|
|
link_info.pei386_runtime_pseudo_reloc = 2;
|
|
|
|
|
break;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
case OPTION_ENABLE_EXTRA_PE_DEBUG:
|
|
|
|
|
pep_dll_extra_pe_debug = 1;
|
|
|
|
|
break;
|
|
|
|
|
#endif
|
2009-02-18 19:23:08 +01:00
|
|
|
|
case OPTION_ENABLE_LONG_SECTION_NAMES:
|
|
|
|
|
pep_use_coff_long_section_names = 1;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_DISABLE_LONG_SECTION_NAMES:
|
|
|
|
|
pep_use_coff_long_section_names = 0;
|
|
|
|
|
break;
|
include/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
* coff/internal.h (struct internal_extra_pe_aouthdr): Correct type
of DllCharacteristics flags field to unsigned.
* coff/pe.h (IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_NX_COMPAT,
IMAGE_DLLCHARACTERISTICS_NO_ISOLATION,
IMAGE_DLLCHARACTERISTICS_NO_SEH,
IMAGE_DLLCHARACTERISTICS_NO_BIND,
IMAGE_DLLCHARACTERISTICS_WDM_DRIVER,
IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE): New macros to
define flag bit values for DllCharacteristics field of PEAOUTHDR,
PEPAOUTHDR.
ld/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
Danny Smith <dannysmith@users.sourceforge.net>
* emultmpl/pe.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flag bits.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat, no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* emultmpl/pep.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flags.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat,no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* ldtexinfo : Document dynamicbase, forceinteg, nxcompat,
no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
2009-03-14 04:30:26 +01:00
|
|
|
|
/* Get DLLCharacteristics bits */
|
|
|
|
|
case OPTION_DYNAMIC_BASE:
|
|
|
|
|
pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_FORCE_INTEGRITY:
|
|
|
|
|
pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_NX_COMPAT:
|
|
|
|
|
pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_NX_COMPAT;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_NO_ISOLATION:
|
|
|
|
|
pe_dll_characteristics |= IMAGE_DLLCHARACTERISTICS_NO_ISOLATION;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_NO_SEH:
|
|
|
|
|
pe_dll_characteristics |= IMAGE_DLLCHARACTERISTICS_NO_SEH;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_NO_BIND:
|
|
|
|
|
pe_dll_characteristics |= IMAGE_DLLCHARACTERISTICS_NO_BIND;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_WDM_DRIVER:
|
|
|
|
|
pe_dll_characteristics |= IMAGE_DLLCHARACTERISTICS_WDM_DRIVER;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_TERMINAL_SERVER_AWARE:
|
|
|
|
|
pe_dll_characteristics |= IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE;
|
|
|
|
|
break;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
}
|
include/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
* coff/internal.h (struct internal_extra_pe_aouthdr): Correct type
of DllCharacteristics flags field to unsigned.
* coff/pe.h (IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_NX_COMPAT,
IMAGE_DLLCHARACTERISTICS_NO_ISOLATION,
IMAGE_DLLCHARACTERISTICS_NO_SEH,
IMAGE_DLLCHARACTERISTICS_NO_BIND,
IMAGE_DLLCHARACTERISTICS_WDM_DRIVER,
IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE): New macros to
define flag bit values for DllCharacteristics field of PEAOUTHDR,
PEPAOUTHDR.
ld/ChangeLog
2009-03-12 Dave Korn <dave.korn.cygwin@gmail.com>
Danny Smith <dannysmith@users.sourceforge.net>
* emultmpl/pe.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flag bits.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat, no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* emultmpl/pep.em (pe_dll_characteristics): New variable.
(OPTION_DYNAMIC_BASE, OPTION_FORCE_INTEGRITY, OPTION_NX_COMPAT,
OPTION_NO_ISOLATION. OPTION_NO_SEH, OPTION_NO_BIND,
OPTION_WDM_DRIVER, OPTION_TERMINAL_SERVER_AWARE):
New macros for options to set DllCharacteristics flags.
(gld${EMULATION_NAME}_add_options): Add dynamicbase, forceinteg,
nxcompat,no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
(init): Add DllCharacteristics field.
(gld_${EMULATION_NAME}_list_options): List new options.
(gld${EMULATION_NAME}_handle_option): Handle new options.
* ldtexinfo : Document dynamicbase, forceinteg, nxcompat,
no-isolation, no-seh, no-bind, wdmdriver, tsaware options.
2009-03-14 04:30:26 +01:00
|
|
|
|
|
|
|
|
|
/* Set DLLCharacteristics bits */
|
|
|
|
|
set_pep_name ("__dll_characteristics__", pe_dll_characteristics);
|
|
|
|
|
|
2006-09-20 13:35:11 +02:00
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
static unsigned long
|
|
|
|
|
strhash (const char *str)
|
|
|
|
|
{
|
|
|
|
|
const unsigned char *s;
|
|
|
|
|
unsigned long hash;
|
|
|
|
|
unsigned int c;
|
|
|
|
|
unsigned int len;
|
|
|
|
|
|
|
|
|
|
hash = 0;
|
|
|
|
|
len = 0;
|
|
|
|
|
s = (const unsigned char *) str;
|
|
|
|
|
while ((c = *s++) != '\0')
|
|
|
|
|
{
|
|
|
|
|
hash += c + (c << 17);
|
|
|
|
|
hash ^= hash >> 2;
|
|
|
|
|
++len;
|
|
|
|
|
}
|
|
|
|
|
hash += len + (len << 17);
|
|
|
|
|
hash ^= hash >> 2;
|
|
|
|
|
|
|
|
|
|
return hash;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Use the output file to create a image base for relocatable DLLs. */
|
|
|
|
|
|
2008-05-09 13:56:31 +02:00
|
|
|
|
static bfd_vma
|
2006-09-20 13:35:11 +02:00
|
|
|
|
compute_dll_image_base (const char *ofile)
|
|
|
|
|
{
|
2008-05-09 13:56:31 +02:00
|
|
|
|
bfd_vma hash = (bfd_vma) strhash (ofile);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
return 0x61300000 + ((hash << 16) & 0x0FFC0000);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Assign values to the special symbols before the linker script is
|
|
|
|
|
read. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
gld_${EMULATION_NAME}_set_symbols (void)
|
|
|
|
|
{
|
|
|
|
|
/* Run through and invent symbols for all the
|
|
|
|
|
names and insert the defaults. */
|
2010-05-15 21:50:44 +02:00
|
|
|
|
int j;
|
2010-05-11 19:46:22 +02:00
|
|
|
|
|
2010-05-15 21:50:44 +02:00
|
|
|
|
is_underscoring ();
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
if (!init[IMAGEBASEOFF].inited)
|
|
|
|
|
{
|
|
|
|
|
if (link_info.relocatable)
|
|
|
|
|
init[IMAGEBASEOFF].value = 0;
|
|
|
|
|
else if (init[DLLOFF].value || (link_info.shared && !link_info.pie))
|
ld/
* ldlang.c (lang_output_section_statement_lookup): Add function
comment. Make "name" non-const. Ensure duplicate entries use
the same string, allowing simple comparison in hash bucket loop.
Tweak constraint check.
(next_matching_output_section_statement): New function.
* ldlang.h (lang_output_section_statement_lookup): Update.
(next_matching_output_section_statement): Declare.
* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
combine orphan sections when input sections flags differ in
alloc or load.
* emultempl/pe.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
* emultempl/pep.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
ld/testsuite/
* ld-elf/orphan3.d, * ld-elf/orphan3a.s, * ld-elf/orphan3b.s,
* ld-elf/orphan3c.s, * ld-elf/orphan3d.s, * ld-elf/orphan3e.s,
* ld-elf/orphan3f.s: New test.
* ld-pe/orphan.d, * ld-pe/orphana.s, * ld-pe/orphanb.s,
* ld-pe/orphand.s, * ld-pe/orphane.s: New test.
* ld-pe/direct.exp: Use is_pecoff_format.
* ld-pe/longsecn.exp: Delete.
* ld-pe/pe.exp: Run new test and longsecn tests.
2009-05-15 16:22:36 +02:00
|
|
|
|
{
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#ifdef DLL_SUPPORT
|
ld/
* ldlang.c (lang_output_section_statement_lookup): Add function
comment. Make "name" non-const. Ensure duplicate entries use
the same string, allowing simple comparison in hash bucket loop.
Tweak constraint check.
(next_matching_output_section_statement): New function.
* ldlang.h (lang_output_section_statement_lookup): Update.
(next_matching_output_section_statement): Declare.
* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
combine orphan sections when input sections flags differ in
alloc or load.
* emultempl/pe.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
* emultempl/pep.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
ld/testsuite/
* ld-elf/orphan3.d, * ld-elf/orphan3a.s, * ld-elf/orphan3b.s,
* ld-elf/orphan3c.s, * ld-elf/orphan3d.s, * ld-elf/orphan3e.s,
* ld-elf/orphan3f.s: New test.
* ld-pe/orphan.d, * ld-pe/orphana.s, * ld-pe/orphanb.s,
* ld-pe/orphand.s, * ld-pe/orphane.s: New test.
* ld-pe/direct.exp: Use is_pecoff_format.
* ld-pe/longsecn.exp: Delete.
* ld-pe/pe.exp: Run new test and longsecn tests.
2009-05-15 16:22:36 +02:00
|
|
|
|
init[IMAGEBASEOFF].value = (pep_enable_auto_image_base
|
|
|
|
|
? compute_dll_image_base (output_filename)
|
|
|
|
|
: NT_DLL_IMAGE_BASE);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#else
|
ld/
* ldlang.c (lang_output_section_statement_lookup): Add function
comment. Make "name" non-const. Ensure duplicate entries use
the same string, allowing simple comparison in hash bucket loop.
Tweak constraint check.
(next_matching_output_section_statement): New function.
* ldlang.h (lang_output_section_statement_lookup): Update.
(next_matching_output_section_statement): Declare.
* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
combine orphan sections when input sections flags differ in
alloc or load.
* emultempl/pe.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
* emultempl/pep.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
ld/testsuite/
* ld-elf/orphan3.d, * ld-elf/orphan3a.s, * ld-elf/orphan3b.s,
* ld-elf/orphan3c.s, * ld-elf/orphan3d.s, * ld-elf/orphan3e.s,
* ld-elf/orphan3f.s: New test.
* ld-pe/orphan.d, * ld-pe/orphana.s, * ld-pe/orphanb.s,
* ld-pe/orphand.s, * ld-pe/orphane.s: New test.
* ld-pe/direct.exp: Use is_pecoff_format.
* ld-pe/longsecn.exp: Delete.
* ld-pe/pe.exp: Run new test and longsecn tests.
2009-05-15 16:22:36 +02:00
|
|
|
|
init[IMAGEBASEOFF].value = NT_DLL_IMAGE_BASE;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#endif
|
ld/
* ldlang.c (lang_output_section_statement_lookup): Add function
comment. Make "name" non-const. Ensure duplicate entries use
the same string, allowing simple comparison in hash bucket loop.
Tweak constraint check.
(next_matching_output_section_statement): New function.
* ldlang.h (lang_output_section_statement_lookup): Update.
(next_matching_output_section_statement): Declare.
* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
combine orphan sections when input sections flags differ in
alloc or load.
* emultempl/pe.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
* emultempl/pep.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
ld/testsuite/
* ld-elf/orphan3.d, * ld-elf/orphan3a.s, * ld-elf/orphan3b.s,
* ld-elf/orphan3c.s, * ld-elf/orphan3d.s, * ld-elf/orphan3e.s,
* ld-elf/orphan3f.s: New test.
* ld-pe/orphan.d, * ld-pe/orphana.s, * ld-pe/orphanb.s,
* ld-pe/orphand.s, * ld-pe/orphane.s: New test.
* ld-pe/direct.exp: Use is_pecoff_format.
* ld-pe/longsecn.exp: Delete.
* ld-pe/pe.exp: Run new test and longsecn tests.
2009-05-15 16:22:36 +02:00
|
|
|
|
}
|
2006-09-20 13:35:11 +02:00
|
|
|
|
else
|
|
|
|
|
init[IMAGEBASEOFF].value = NT_EXE_IMAGE_BASE;
|
ld/
* ldlang.c (lang_output_section_statement_lookup): Add function
comment. Make "name" non-const. Ensure duplicate entries use
the same string, allowing simple comparison in hash bucket loop.
Tweak constraint check.
(next_matching_output_section_statement): New function.
* ldlang.h (lang_output_section_statement_lookup): Update.
(next_matching_output_section_statement): Declare.
* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
combine orphan sections when input sections flags differ in
alloc or load.
* emultempl/pe.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
* emultempl/pep.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
ld/testsuite/
* ld-elf/orphan3.d, * ld-elf/orphan3a.s, * ld-elf/orphan3b.s,
* ld-elf/orphan3c.s, * ld-elf/orphan3d.s, * ld-elf/orphan3e.s,
* ld-elf/orphan3f.s: New test.
* ld-pe/orphan.d, * ld-pe/orphana.s, * ld-pe/orphanb.s,
* ld-pe/orphand.s, * ld-pe/orphane.s: New test.
* ld-pe/direct.exp: Use is_pecoff_format.
* ld-pe/longsecn.exp: Delete.
* ld-pe/pe.exp: Run new test and longsecn tests.
2009-05-15 16:22:36 +02:00
|
|
|
|
init[MSIMAGEBASEOFF].value = init[IMAGEBASEOFF].value;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Don't do any symbol assignments if this is a relocatable link. */
|
|
|
|
|
if (link_info.relocatable)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* Glue the assignments into the abs section. */
|
2009-02-16 08:25:52 +01:00
|
|
|
|
push_stat_ptr (&abs_output_section->children);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
for (j = 0; init[j].ptr; j++)
|
|
|
|
|
{
|
2008-05-09 13:56:31 +02:00
|
|
|
|
bfd_vma val = init[j].value;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
lang_assignment_statement_type *rv;
|
2010-04-05 11:04:09 +02:00
|
|
|
|
|
PR ld/12356
* ldexp.h (exp_assop): Delete.
(exp_assign, exp_defsym): Declare.
* ldexp.c (exp_assop): Make static, handle all assignment variations.
(exp_assign, exp_defsym): New functions.
(exp_provide): Use exp_assop.
* ldgram.y (defsym_expr): Use exp_defsym.
* ldctor.c, * ldgram.y, * ldlang.c, * mri.c, * emultempl/beos.em,
* emultempl/pe.em, * emultempl/pep.em, * emultempl/spuelf.em,
* emultempl/xtensaelf.em: Update exp_assop -> exp_assign.
2011-01-13 14:06:22 +01:00
|
|
|
|
rv = lang_add_assignment (exp_assign (GET_INIT_SYMBOL_NAME (j),
|
|
|
|
|
exp_intop (val)));
|
2006-09-20 13:35:11 +02:00
|
|
|
|
if (init[j].size == sizeof (short))
|
2008-05-09 13:56:31 +02:00
|
|
|
|
*(short *) init[j].ptr = (short) val;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
else if (init[j].size == sizeof (int))
|
2008-05-09 13:56:31 +02:00
|
|
|
|
*(int *) init[j].ptr = (int) val;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
else if (init[j].size == sizeof (long))
|
2008-05-09 13:56:31 +02:00
|
|
|
|
*(long *) init[j].ptr = (long) val;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
/* This might be a long long or other special type. */
|
|
|
|
|
else if (init[j].size == sizeof (bfd_vma))
|
|
|
|
|
*(bfd_vma *) init[j].ptr = val;
|
|
|
|
|
else abort ();
|
|
|
|
|
if (j == IMAGEBASEOFF)
|
|
|
|
|
image_base_statement = rv;
|
|
|
|
|
}
|
|
|
|
|
/* Restore the pointer. */
|
2009-02-16 08:25:52 +01:00
|
|
|
|
pop_stat_ptr ();
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
if (pep.FileAlignment > pep.SectionAlignment)
|
|
|
|
|
{
|
|
|
|
|
einfo (_("%P: warning, file alignment > section alignment.\n"));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is called after the linker script and the command line options
|
|
|
|
|
have been read. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
gld_${EMULATION_NAME}_after_parse (void)
|
|
|
|
|
{
|
2009-04-02 16:42:41 +02:00
|
|
|
|
/* PR ld/6744: Warn the user if they have used an ELF-only
|
|
|
|
|
option hoping it will work on PE+. */
|
|
|
|
|
if (link_info.export_dynamic)
|
|
|
|
|
einfo (_("%P: warning: --export-dynamic is not supported for PE+ "
|
|
|
|
|
"targets, did you mean --export-all-symbols?\n"));
|
2009-09-13 09:19:18 +02:00
|
|
|
|
|
2009-11-04 19:13:05 +01:00
|
|
|
|
set_entry_point ();
|
|
|
|
|
|
2009-09-13 09:19:18 +02:00
|
|
|
|
after_parse_default ();
|
2006-09-20 13:35:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* pep-dll.c directly accesses pep_data_import_dll,
|
|
|
|
|
so it must be defined outside of #ifdef DLL_SUPPORT.
|
|
|
|
|
Note - this variable is deliberately not initialised.
|
|
|
|
|
This allows it to be treated as a common varaible, and only
|
|
|
|
|
exist in one incarnation in a multiple target enabled linker. */
|
|
|
|
|
char * pep_data_import_dll;
|
|
|
|
|
|
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
static struct bfd_link_hash_entry *pep_undef_found_sym;
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
pep_undef_cdecl_match (struct bfd_link_hash_entry *h, void *inf)
|
|
|
|
|
{
|
|
|
|
|
int sl;
|
|
|
|
|
char *string = inf;
|
2009-11-15 08:52:45 +01:00
|
|
|
|
const char *hs = h->root.string;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
sl = strlen (string);
|
|
|
|
|
if (h->type == bfd_link_hash_defined
|
2009-11-15 08:52:45 +01:00
|
|
|
|
&& ((*hs == '@' && *string == '_'
|
|
|
|
|
&& strncmp (hs + 1, string + 1, sl - 1) == 0)
|
|
|
|
|
|| strncmp (hs, string, sl) == 0)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
&& h->root.string[sl] == '@')
|
|
|
|
|
{
|
|
|
|
|
pep_undef_found_sym = h;
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
pep_fixup_stdcalls (void)
|
|
|
|
|
{
|
|
|
|
|
static int gave_warning_message = 0;
|
|
|
|
|
struct bfd_link_hash_entry *undef, *sym;
|
|
|
|
|
|
|
|
|
|
if (pep_dll_extra_pe_debug)
|
|
|
|
|
printf ("%s\n", __FUNCTION__);
|
|
|
|
|
|
|
|
|
|
for (undef = link_info.hash->undefs; undef; undef=undef->u.undef.next)
|
|
|
|
|
if (undef->type == bfd_link_hash_undefined)
|
|
|
|
|
{
|
|
|
|
|
char* at = strchr (undef->root.string, '@');
|
|
|
|
|
int lead_at = (*undef->root.string == '@');
|
2009-11-15 08:52:45 +01:00
|
|
|
|
if (lead_at)
|
|
|
|
|
at = strchr (undef->root.string + 1, '@');
|
|
|
|
|
if (at || lead_at)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{
|
|
|
|
|
/* The symbol is a stdcall symbol, so let's look for a
|
|
|
|
|
cdecl symbol with the same name and resolve to that. */
|
2009-11-15 08:52:45 +01:00
|
|
|
|
char *cname = xstrdup (undef->root.string);
|
|
|
|
|
|
|
|
|
|
if (lead_at)
|
|
|
|
|
*cname = '_';
|
2006-09-20 13:35:11 +02:00
|
|
|
|
at = strchr (cname, '@');
|
2009-11-15 08:52:45 +01:00
|
|
|
|
if (at)
|
|
|
|
|
*at = 0;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
sym = bfd_link_hash_lookup (link_info.hash, cname, 0, 0, 1);
|
|
|
|
|
|
|
|
|
|
if (sym && sym->type == bfd_link_hash_defined)
|
|
|
|
|
{
|
|
|
|
|
undef->type = bfd_link_hash_defined;
|
|
|
|
|
undef->u.def.value = sym->u.def.value;
|
|
|
|
|
undef->u.def.section = sym->u.def.section;
|
|
|
|
|
|
|
|
|
|
if (pep_enable_stdcall_fixup == -1)
|
|
|
|
|
{
|
|
|
|
|
einfo (_("Warning: resolving %s by linking to %s\n"),
|
|
|
|
|
undef->root.string, cname);
|
|
|
|
|
if (! gave_warning_message)
|
|
|
|
|
{
|
|
|
|
|
gave_warning_message = 1;
|
|
|
|
|
einfo (_("Use --enable-stdcall-fixup to disable these warnings\n"));
|
|
|
|
|
einfo (_("Use --disable-stdcall-fixup to disable these fixups\n"));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* The symbol is a cdecl symbol, so we look for stdcall
|
|
|
|
|
symbols - which means scanning the whole symbol table. */
|
|
|
|
|
pep_undef_found_sym = 0;
|
|
|
|
|
bfd_link_hash_traverse (link_info.hash, pep_undef_cdecl_match,
|
|
|
|
|
(char *) undef->root.string);
|
|
|
|
|
sym = pep_undef_found_sym;
|
|
|
|
|
if (sym)
|
|
|
|
|
{
|
|
|
|
|
undef->type = bfd_link_hash_defined;
|
|
|
|
|
undef->u.def.value = sym->u.def.value;
|
|
|
|
|
undef->u.def.section = sym->u.def.section;
|
|
|
|
|
|
|
|
|
|
if (pep_enable_stdcall_fixup == -1)
|
|
|
|
|
{
|
|
|
|
|
einfo (_("Warning: resolving %s by linking to %s\n"),
|
|
|
|
|
undef->root.string, sym->root.string);
|
|
|
|
|
if (! gave_warning_message)
|
|
|
|
|
{
|
|
|
|
|
gave_warning_message = 1;
|
|
|
|
|
einfo (_("Use --enable-stdcall-fixup to disable these warnings\n"));
|
|
|
|
|
einfo (_("Use --disable-stdcall-fixup to disable these fixups\n"));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
make_import_fixup (arelent *rel, asection *s)
|
|
|
|
|
{
|
|
|
|
|
struct bfd_symbol *sym = *rel->sym_ptr_ptr;
|
2008-11-14 16:13:05 +01:00
|
|
|
|
char addend[8];
|
|
|
|
|
bfd_vma _addend = 0;
|
|
|
|
|
int suc = 0;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
if (pep_dll_extra_pe_debug)
|
|
|
|
|
printf ("arelent: %s@%#lx: add=%li\n", sym->name,
|
2008-07-30 06:34:58 +02:00
|
|
|
|
(unsigned long) rel->address, (long) rel->addend);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
2008-11-14 16:13:05 +01:00
|
|
|
|
memset (addend, 0, sizeof (addend));
|
|
|
|
|
switch ((rel->howto->bitsize))
|
|
|
|
|
{
|
|
|
|
|
case 8:
|
|
|
|
|
suc = bfd_get_section_contents (s->owner, s, addend, rel->address, 1);
|
|
|
|
|
if (suc && rel->howto->pc_relative)
|
|
|
|
|
_addend = (bfd_vma) ((bfd_signed_vma) ((char) bfd_get_8 (s->owner, addend)));
|
|
|
|
|
else if (suc)
|
|
|
|
|
_addend = ((bfd_vma) bfd_get_8 (s->owner, addend)) & 0xff;
|
|
|
|
|
break;
|
|
|
|
|
case 16:
|
|
|
|
|
suc = bfd_get_section_contents (s->owner, s, addend, rel->address, 2);
|
|
|
|
|
if (suc && rel->howto->pc_relative)
|
|
|
|
|
_addend = (bfd_vma) ((bfd_signed_vma) ((short) bfd_get_16 (s->owner, addend)));
|
|
|
|
|
else if (suc)
|
|
|
|
|
_addend = ((bfd_vma) bfd_get_16 (s->owner, addend)) & 0xffff;
|
|
|
|
|
break;
|
|
|
|
|
case 32:
|
|
|
|
|
suc = bfd_get_section_contents (s->owner, s, addend, rel->address, 4);
|
|
|
|
|
if (suc && rel->howto->pc_relative)
|
|
|
|
|
_addend = (bfd_vma) ((bfd_signed_vma) ((int) bfd_get_32 (s->owner, addend)));
|
|
|
|
|
else if (suc)
|
|
|
|
|
_addend = ((bfd_vma) bfd_get_32 (s->owner, addend)) & 0xffffffff;
|
|
|
|
|
break;
|
|
|
|
|
case 64:
|
|
|
|
|
suc = bfd_get_section_contents (s->owner, s, addend, rel->address, 8);
|
|
|
|
|
if (suc)
|
|
|
|
|
_addend = ((bfd_vma) bfd_get_64 (s->owner, addend));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (! suc)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
einfo (_("%C: Cannot get section contents - auto-import exception\n"),
|
|
|
|
|
s->owner, s, rel->address);
|
|
|
|
|
|
2008-11-14 16:13:05 +01:00
|
|
|
|
if (pep_dll_extra_pe_debug)
|
|
|
|
|
{
|
|
|
|
|
printf ("import of 0x%lx(0x%lx) sec_addr=0x%lx", (long) _addend, (long) rel->addend, (long) rel->address);
|
|
|
|
|
if (rel->howto->pc_relative) printf (" pcrel");
|
|
|
|
|
printf (" %d bit rel.\n",(int) rel->howto->bitsize);
|
|
|
|
|
}
|
|
|
|
|
pep_create_import_fixup (rel, s, _addend);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
pep_find_data_imports (void)
|
|
|
|
|
{
|
|
|
|
|
struct bfd_link_hash_entry *undef, *sym;
|
|
|
|
|
|
|
|
|
|
if (link_info.pei386_auto_import == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
for (undef = link_info.hash->undefs; undef; undef=undef->u.undef.next)
|
|
|
|
|
{
|
|
|
|
|
if (undef->type == bfd_link_hash_undefined)
|
|
|
|
|
{
|
|
|
|
|
/* C++ symbols are *long*. */
|
|
|
|
|
char buf[4096];
|
|
|
|
|
|
|
|
|
|
if (pep_dll_extra_pe_debug)
|
|
|
|
|
printf ("%s:%s\n", __FUNCTION__, undef->root.string);
|
|
|
|
|
|
|
|
|
|
sprintf (buf, "__imp_%s", undef->root.string);
|
|
|
|
|
|
|
|
|
|
sym = bfd_link_hash_lookup (link_info.hash, buf, 0, 0, 1);
|
|
|
|
|
|
|
|
|
|
if (sym && sym->type == bfd_link_hash_defined)
|
|
|
|
|
{
|
|
|
|
|
bfd *b = sym->u.def.section->owner;
|
|
|
|
|
asymbol **symbols;
|
2008-08-17 05:12:50 +02:00
|
|
|
|
int nsyms, i;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
2008-08-17 05:12:50 +02:00
|
|
|
|
if (!bfd_generic_link_read_symbols (b))
|
|
|
|
|
{
|
|
|
|
|
einfo (_("%B%F: could not read symbols: %E\n"), b);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
symbols = bfd_get_outsymbols (b);
|
|
|
|
|
nsyms = bfd_get_symcount (b);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
for (i = 0; i < nsyms; i++)
|
|
|
|
|
{
|
2010-04-05 11:04:09 +02:00
|
|
|
|
if (! CONST_STRNEQ (symbols[i]->name, U ("_head_")))
|
2006-09-20 13:35:11 +02:00
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (pep_dll_extra_pe_debug)
|
|
|
|
|
printf ("->%s\n", symbols[i]->name);
|
|
|
|
|
|
|
|
|
|
pep_data_import_dll = (char*) (symbols[i]->name +
|
2010-04-05 11:04:09 +02:00
|
|
|
|
U_SIZE ("_head_") - 1);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pep_walk_relocs_of_symbol (&link_info, undef->root.string,
|
ld/
* ldlang.c (lang_output_section_statement_lookup): Add function
comment. Make "name" non-const. Ensure duplicate entries use
the same string, allowing simple comparison in hash bucket loop.
Tweak constraint check.
(next_matching_output_section_statement): New function.
* ldlang.h (lang_output_section_statement_lookup): Update.
(next_matching_output_section_statement): Declare.
* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
combine orphan sections when input sections flags differ in
alloc or load.
* emultempl/pe.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
* emultempl/pep.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
ld/testsuite/
* ld-elf/orphan3.d, * ld-elf/orphan3a.s, * ld-elf/orphan3b.s,
* ld-elf/orphan3c.s, * ld-elf/orphan3d.s, * ld-elf/orphan3e.s,
* ld-elf/orphan3f.s: New test.
* ld-pe/orphan.d, * ld-pe/orphana.s, * ld-pe/orphanb.s,
* ld-pe/orphand.s, * ld-pe/orphane.s: New test.
* ld-pe/direct.exp: Use is_pecoff_format.
* ld-pe/longsecn.exp: Delete.
* ld-pe/pe.exp: Run new test and longsecn tests.
2009-05-15 16:22:36 +02:00
|
|
|
|
make_import_fixup);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
/* Let's differentiate it somehow from defined. */
|
|
|
|
|
undef->type = bfd_link_hash_defweak;
|
|
|
|
|
/* We replace original name with __imp_ prefixed, this
|
|
|
|
|
1) may trash memory 2) leads to duplicate symbol generation.
|
|
|
|
|
Still, IMHO it's better than having name poluted. */
|
|
|
|
|
undef->root.string = sym->root.string;
|
|
|
|
|
undef->u.def.value = sym->u.def.value;
|
|
|
|
|
undef->u.def.section = sym->u.def.section;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
pr_sym (struct bfd_hash_entry *h, void *inf ATTRIBUTE_UNUSED)
|
|
|
|
|
{
|
|
|
|
|
if (pep_dll_extra_pe_debug)
|
|
|
|
|
printf ("+%s\n", h->string);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
#endif /* DLL_SUPPORT */
|
|
|
|
|
|
2009-03-03 19:22:11 +01:00
|
|
|
|
static void
|
|
|
|
|
debug_section_p (bfd *abfd ATTRIBUTE_UNUSED, asection *sect, void *obj)
|
|
|
|
|
{
|
|
|
|
|
int *found = (int *) obj;
|
|
|
|
|
if (strncmp (".debug_", sect->name, sizeof (".debug_") - 1) == 0)
|
|
|
|
|
*found = 1;
|
|
|
|
|
}
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
gld_${EMULATION_NAME}_after_open (void)
|
|
|
|
|
{
|
* ld.texinfo (Expression Section): Describe treatment of numbers
and absolute symbols.
* ldemul.c (after_open_default): Look up __ld_compatibility.
* ldexp.c (fold_name): Convert absolute symbols to numbers when
inside output section definitions, or when __ld_compatibility >= 221.
(exp_fold_tree_1): Convert numbers to absolute when not in output
section definition and __ld_compatibility < 221. Don't always
convert values outside an output section definition to absolute.
* ldexp.h (uses_defined): Comment.
* ldlang.c (ld_compatibility): New variable.
* ldlang.h (ld_compatibility): Declare.
* emultempl/aix.em, * emultempl/armcoff.em, * emultempl/beos.em,
* emultempl/elf32.em, * emultempl/genelf.em, * emultempl/lnk960.em,
* emultempl/m68kcoff.em, * emultempl/mmo.em, * emultempl/pe.em,
* emultempl/pep.em, * emultempl/sunos.em, * emultempl/z80.em: Call
after_open_default from after_open function.
2010-12-20 14:00:14 +01:00
|
|
|
|
after_open_default ();
|
|
|
|
|
|
2010-05-15 21:50:44 +02:00
|
|
|
|
is_underscoring ();
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
if (pep_dll_extra_pe_debug)
|
|
|
|
|
{
|
|
|
|
|
bfd *a;
|
|
|
|
|
struct bfd_link_hash_entry *sym;
|
|
|
|
|
|
|
|
|
|
printf ("%s()\n", __FUNCTION__);
|
|
|
|
|
|
|
|
|
|
for (sym = link_info.hash->undefs; sym; sym=sym->u.undef.next)
|
|
|
|
|
printf ("-%s\n", sym->root.string);
|
|
|
|
|
bfd_hash_traverse (&link_info.hash->table, pr_sym, NULL);
|
|
|
|
|
|
|
|
|
|
for (a = link_info.input_bfds; a; a = a->link_next)
|
|
|
|
|
printf ("*%s\n",a->filename);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Pass the wacky PE command line options into the output bfd.
|
|
|
|
|
FIXME: This should be done via a function, rather than by
|
|
|
|
|
including an internal BFD header. */
|
|
|
|
|
|
2008-02-15 04:35:53 +01:00
|
|
|
|
if (coff_data (link_info.output_bfd) == NULL
|
|
|
|
|
|| coff_data (link_info.output_bfd)->pe == 0)
|
|
|
|
|
einfo (_("%F%P: cannot perform PE operations on non PE output file '%B'.\n"),
|
|
|
|
|
link_info.output_bfd);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
2008-02-15 04:35:53 +01:00
|
|
|
|
pe_data (link_info.output_bfd)->pe_opthdr = pep;
|
|
|
|
|
pe_data (link_info.output_bfd)->dll = init[DLLOFF].value;
|
|
|
|
|
pe_data (link_info.output_bfd)->real_flags |= real_flags;
|
2009-03-03 19:22:11 +01:00
|
|
|
|
|
|
|
|
|
/* At this point we must decide whether to use long section names
|
|
|
|
|
in the output or not. If the user hasn't explicitly specified
|
|
|
|
|
on the command line, we leave it to the default for the format
|
|
|
|
|
(object files yes, image files no), except if there is debug
|
|
|
|
|
information present; GDB relies on the long section names to
|
|
|
|
|
find it, so enable it in that case. */
|
|
|
|
|
if (pep_use_coff_long_section_names < 0 && link_info.strip == strip_none)
|
|
|
|
|
{
|
|
|
|
|
/* Iterate over all sections of all input BFDs, checking
|
|
|
|
|
for any that begin 'debug_' and are long names. */
|
|
|
|
|
LANG_FOR_EACH_INPUT_STATEMENT (is)
|
|
|
|
|
{
|
|
|
|
|
int found_debug = 0;
|
|
|
|
|
bfd_map_over_sections (is->the_bfd, debug_section_p, &found_debug);
|
|
|
|
|
if (found_debug)
|
|
|
|
|
{
|
|
|
|
|
pep_use_coff_long_section_names = 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-02-18 19:23:08 +01:00
|
|
|
|
pep_output_file_set_long_section_names (link_info.output_bfd);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
if (pep_enable_stdcall_fixup) /* -1=warn or 1=disable */
|
|
|
|
|
pep_fixup_stdcalls ();
|
|
|
|
|
|
2008-02-15 04:35:53 +01:00
|
|
|
|
pep_process_import_defs (link_info.output_bfd, &link_info);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
pep_find_data_imports ();
|
|
|
|
|
|
2009-11-15 08:52:45 +01:00
|
|
|
|
/* As possibly new symbols are added by imports, we rerun
|
|
|
|
|
stdcall/fastcall fixup here. */
|
|
|
|
|
if (pep_enable_stdcall_fixup) /* -1=warn or 1=disable */
|
|
|
|
|
pep_fixup_stdcalls ();
|
|
|
|
|
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#ifndef TARGET_IS_i386pep
|
|
|
|
|
if (link_info.shared)
|
|
|
|
|
#else
|
|
|
|
|
if (!link_info.relocatable)
|
|
|
|
|
#endif
|
2008-02-15 04:35:53 +01:00
|
|
|
|
pep_dll_build_sections (link_info.output_bfd, &link_info);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
#ifndef TARGET_IS_i386pep
|
|
|
|
|
else
|
2008-02-15 04:35:53 +01:00
|
|
|
|
pep_exe_build_sections (link_info.output_bfd, &link_info);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#endif
|
|
|
|
|
#endif /* DLL_SUPPORT */
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
/* This next chunk of code tries to detect the case where you have
|
|
|
|
|
two import libraries for the same DLL (specifically,
|
|
|
|
|
symbolically linking libm.a and libc.a in cygwin to
|
|
|
|
|
libcygwin.a). In those cases, it's possible for function
|
|
|
|
|
thunks from the second implib to be used but without the
|
|
|
|
|
head/tail objects, causing an improper import table. We detect
|
|
|
|
|
those cases and rename the "other" import libraries to match
|
|
|
|
|
the one the head/tail come from, so that the linker will sort
|
|
|
|
|
things nicely and produce a valid import table. */
|
|
|
|
|
|
|
|
|
|
LANG_FOR_EACH_INPUT_STATEMENT (is)
|
|
|
|
|
{
|
|
|
|
|
if (is->the_bfd->my_archive)
|
|
|
|
|
{
|
|
|
|
|
int idata2 = 0, reloc_count=0, is_imp = 0;
|
|
|
|
|
asection *sec;
|
|
|
|
|
|
|
|
|
|
/* See if this is an import library thunk. */
|
|
|
|
|
for (sec = is->the_bfd->sections; sec; sec = sec->next)
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (sec->name, ".idata\$2") == 0)
|
|
|
|
|
idata2 = 1;
|
|
|
|
|
if (CONST_STRNEQ (sec->name, ".idata\$"))
|
|
|
|
|
is_imp = 1;
|
|
|
|
|
reloc_count += sec->reloc_count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_imp && !idata2 && reloc_count)
|
|
|
|
|
{
|
|
|
|
|
/* It is, look for the reference to head and see if it's
|
|
|
|
|
from our own library. */
|
|
|
|
|
for (sec = is->the_bfd->sections; sec; sec = sec->next)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
long relsize;
|
|
|
|
|
asymbol **symbols;
|
|
|
|
|
arelent **relocs;
|
|
|
|
|
int nrelocs;
|
|
|
|
|
|
|
|
|
|
relsize = bfd_get_reloc_upper_bound (is->the_bfd, sec);
|
|
|
|
|
if (relsize < 1)
|
|
|
|
|
break;
|
|
|
|
|
|
2008-08-17 05:12:50 +02:00
|
|
|
|
if (!bfd_generic_link_read_symbols (is->the_bfd))
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{
|
2008-08-17 05:12:50 +02:00
|
|
|
|
einfo (_("%B%F: could not read symbols: %E\n"),
|
|
|
|
|
is->the_bfd);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
2008-08-17 05:12:50 +02:00
|
|
|
|
symbols = bfd_get_outsymbols (is->the_bfd);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
relocs = xmalloc ((size_t) relsize);
|
|
|
|
|
nrelocs = bfd_canonicalize_reloc (is->the_bfd, sec,
|
|
|
|
|
relocs, symbols);
|
|
|
|
|
if (nrelocs < 0)
|
|
|
|
|
{
|
|
|
|
|
free (relocs);
|
2008-09-09 11:45:31 +02:00
|
|
|
|
einfo ("%X%P: unable to process relocs: %E\n");
|
2006-09-20 13:35:11 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < nrelocs; i++)
|
|
|
|
|
{
|
|
|
|
|
struct bfd_symbol *s;
|
|
|
|
|
struct bfd_link_hash_entry * blhe;
|
|
|
|
|
char *other_bfd_filename;
|
|
|
|
|
char *n;
|
|
|
|
|
|
|
|
|
|
s = (relocs[i]->sym_ptr_ptr)[0];
|
|
|
|
|
|
|
|
|
|
if (s->flags & BSF_LOCAL)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* Thunk section with reloc to another bfd. */
|
|
|
|
|
blhe = bfd_link_hash_lookup (link_info.hash,
|
|
|
|
|
s->name,
|
|
|
|
|
FALSE, FALSE, TRUE);
|
|
|
|
|
|
|
|
|
|
if (blhe == NULL
|
|
|
|
|
|| blhe->type != bfd_link_hash_defined)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
other_bfd_filename
|
|
|
|
|
= blhe->u.def.section->owner->my_archive
|
|
|
|
|
? bfd_get_filename (blhe->u.def.section->owner->my_archive)
|
|
|
|
|
: bfd_get_filename (blhe->u.def.section->owner);
|
|
|
|
|
|
2011-02-28 19:34:52 +01:00
|
|
|
|
if (filename_cmp (bfd_get_filename
|
|
|
|
|
(is->the_bfd->my_archive),
|
|
|
|
|
other_bfd_filename) == 0)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* Rename this implib to match the other one. */
|
|
|
|
|
n = xmalloc (strlen (other_bfd_filename) + 1);
|
|
|
|
|
strcpy (n, other_bfd_filename);
|
|
|
|
|
is->the_bfd->my_archive->filename = n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free (relocs);
|
|
|
|
|
/* Note - we do not free the symbols,
|
|
|
|
|
they are now cached in the BFD. */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
int is_ms_arch = 0;
|
|
|
|
|
bfd *cur_arch = 0;
|
|
|
|
|
lang_input_statement_type *is2;
|
|
|
|
|
lang_input_statement_type *is3;
|
|
|
|
|
|
|
|
|
|
/* Careful - this is a shell script. Watch those dollar signs! */
|
|
|
|
|
/* Microsoft import libraries have every member named the same,
|
|
|
|
|
and not in the right order for us to link them correctly. We
|
|
|
|
|
must detect these and rename the members so that they'll link
|
|
|
|
|
correctly. There are three types of objects: the head, the
|
|
|
|
|
thunks, and the sentinel(s). The head is easy; it's the one
|
|
|
|
|
with idata2. We assume that the sentinels won't have relocs,
|
|
|
|
|
and the thunks will. It's easier than checking the symbol
|
|
|
|
|
table for external references. */
|
|
|
|
|
LANG_FOR_EACH_INPUT_STATEMENT (is)
|
|
|
|
|
{
|
|
|
|
|
if (is->the_bfd->my_archive)
|
|
|
|
|
{
|
|
|
|
|
char *pnt;
|
|
|
|
|
bfd *arch = is->the_bfd->my_archive;
|
|
|
|
|
|
|
|
|
|
if (cur_arch != arch)
|
|
|
|
|
{
|
|
|
|
|
cur_arch = arch;
|
|
|
|
|
is_ms_arch = 1;
|
|
|
|
|
|
|
|
|
|
for (is3 = is;
|
|
|
|
|
is3 && is3->the_bfd->my_archive == arch;
|
|
|
|
|
is3 = (lang_input_statement_type *) is3->next)
|
|
|
|
|
{
|
|
|
|
|
/* A MS dynamic import library can also contain static
|
|
|
|
|
members, so look for the first element with a .dll
|
|
|
|
|
extension, and use that for the remainder of the
|
|
|
|
|
comparisons. */
|
|
|
|
|
pnt = strrchr (is3->the_bfd->filename, '.');
|
2011-02-28 19:34:52 +01:00
|
|
|
|
if (pnt != NULL && filename_cmp (pnt, ".dll") == 0)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is3 == NULL)
|
|
|
|
|
is_ms_arch = 0;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* OK, found one. Now look to see if the remaining
|
|
|
|
|
(dynamic import) members use the same name. */
|
|
|
|
|
for (is2 = is;
|
|
|
|
|
is2 && is2->the_bfd->my_archive == arch;
|
|
|
|
|
is2 = (lang_input_statement_type *) is2->next)
|
|
|
|
|
{
|
|
|
|
|
/* Skip static members, ie anything with a .obj
|
|
|
|
|
extension. */
|
|
|
|
|
pnt = strrchr (is2->the_bfd->filename, '.');
|
2011-02-28 19:34:52 +01:00
|
|
|
|
if (pnt != NULL && filename_cmp (pnt, ".obj") == 0)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
continue;
|
|
|
|
|
|
2011-02-28 19:34:52 +01:00
|
|
|
|
if (filename_cmp (is3->the_bfd->filename,
|
|
|
|
|
is2->the_bfd->filename))
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{
|
|
|
|
|
is_ms_arch = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This fragment might have come from an .obj file in a Microsoft
|
|
|
|
|
import, and not an actual import record. If this is the case,
|
|
|
|
|
then leave the filename alone. */
|
|
|
|
|
pnt = strrchr (is->the_bfd->filename, '.');
|
|
|
|
|
|
2011-02-28 19:34:52 +01:00
|
|
|
|
if (is_ms_arch && (filename_cmp (pnt, ".dll") == 0))
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{
|
|
|
|
|
int idata2 = 0, reloc_count=0;
|
|
|
|
|
asection *sec;
|
|
|
|
|
char *new_name, seq;
|
|
|
|
|
|
|
|
|
|
for (sec = is->the_bfd->sections; sec; sec = sec->next)
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (sec->name, ".idata\$2") == 0)
|
|
|
|
|
idata2 = 1;
|
|
|
|
|
reloc_count += sec->reloc_count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (idata2) /* .idata2 is the TOC */
|
|
|
|
|
seq = 'a';
|
|
|
|
|
else if (reloc_count > 0) /* thunks */
|
|
|
|
|
seq = 'b';
|
|
|
|
|
else /* sentinel */
|
|
|
|
|
seq = 'c';
|
|
|
|
|
|
|
|
|
|
new_name = xmalloc (strlen (is->the_bfd->filename) + 3);
|
|
|
|
|
sprintf (new_name, "%s.%c", is->the_bfd->filename, seq);
|
|
|
|
|
is->the_bfd->filename = new_name;
|
|
|
|
|
|
|
|
|
|
new_name = xmalloc (strlen (is->filename) + 3);
|
|
|
|
|
sprintf (new_name, "%s.%c", is->filename, seq);
|
|
|
|
|
is->filename = new_name;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
gld_${EMULATION_NAME}_before_allocation (void)
|
|
|
|
|
{
|
2010-05-15 21:50:44 +02:00
|
|
|
|
is_underscoring ();
|
2006-09-20 13:35:11 +02:00
|
|
|
|
before_allocation_default ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
/* This is called when an input file isn't recognized as a BFD. We
|
|
|
|
|
check here for .DEF files and pull them in automatically. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
saw_option (char *option)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2010-05-15 21:50:44 +02:00
|
|
|
|
is_underscoring ();
|
|
|
|
|
|
2006-09-20 13:35:11 +02:00
|
|
|
|
for (i = 0; init[i].ptr; i++)
|
2010-04-05 11:04:09 +02:00
|
|
|
|
if (strcmp (GET_INIT_SYMBOL_NAME (i), option) == 0)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
return init[i].inited;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif /* DLL_SUPPORT */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
gld_${EMULATION_NAME}_unrecognized_file (lang_input_statement_type *entry ATTRIBUTE_UNUSED)
|
|
|
|
|
{
|
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
const char *ext = entry->filename + strlen (entry->filename) - 4;
|
|
|
|
|
|
2011-02-28 19:34:52 +01:00
|
|
|
|
if (filename_cmp (ext, ".def") == 0 || filename_cmp (ext, ".DEF") == 0)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{
|
|
|
|
|
pep_def_file = def_file_parse (entry->filename, pep_def_file);
|
|
|
|
|
|
|
|
|
|
if (pep_def_file)
|
|
|
|
|
{
|
|
|
|
|
int i, buflen=0, len;
|
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < pep_def_file->num_exports; i++)
|
|
|
|
|
{
|
|
|
|
|
len = strlen (pep_def_file->exports[i].internal_name);
|
|
|
|
|
if (buflen < len + 2)
|
|
|
|
|
buflen = len + 2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
buf = xmalloc (buflen);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < pep_def_file->num_exports; i++)
|
|
|
|
|
{
|
|
|
|
|
struct bfd_link_hash_entry *h;
|
|
|
|
|
|
2010-04-05 11:04:09 +02:00
|
|
|
|
sprintf (buf, "%s%s", U (""),
|
|
|
|
|
pep_def_file->exports[i].internal_name);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
h = bfd_link_hash_lookup (link_info.hash, buf, TRUE, TRUE, TRUE);
|
|
|
|
|
if (h == (struct bfd_link_hash_entry *) NULL)
|
|
|
|
|
einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
|
|
|
|
|
if (h->type == bfd_link_hash_new)
|
|
|
|
|
{
|
|
|
|
|
h->type = bfd_link_hash_undefined;
|
|
|
|
|
h->u.undef.abfd = NULL;
|
|
|
|
|
bfd_link_add_undef (link_info.hash, h);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
free (buf);
|
|
|
|
|
|
|
|
|
|
/* def_file_print (stdout, pep_def_file); */
|
|
|
|
|
if (pep_def_file->is_dll == 1)
|
|
|
|
|
link_info.shared = 1;
|
|
|
|
|
|
|
|
|
|
if (pep_def_file->base_address != (bfd_vma)(-1))
|
|
|
|
|
{
|
2008-02-15 04:35:53 +01:00
|
|
|
|
pep.ImageBase
|
|
|
|
|
= pe_data (link_info.output_bfd)->pe_opthdr.ImageBase
|
|
|
|
|
= init[IMAGEBASEOFF].value
|
|
|
|
|
= pep_def_file->base_address;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
init[IMAGEBASEOFF].inited = 1;
|
|
|
|
|
if (image_base_statement)
|
PR ld/12356
* ldexp.h (exp_assop): Delete.
(exp_assign, exp_defsym): Declare.
* ldexp.c (exp_assop): Make static, handle all assignment variations.
(exp_assign, exp_defsym): New functions.
(exp_provide): Use exp_assop.
* ldgram.y (defsym_expr): Use exp_defsym.
* ldctor.c, * ldgram.y, * ldlang.c, * mri.c, * emultempl/beos.em,
* emultempl/pe.em, * emultempl/pep.em, * emultempl/spuelf.em,
* emultempl/xtensaelf.em: Update exp_assop -> exp_assign.
2011-01-13 14:06:22 +01:00
|
|
|
|
image_base_statement->exp = exp_assign ("__image_base__",
|
|
|
|
|
exp_intop (pep.ImageBase));
|
2006-09-20 13:35:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pep_def_file->stack_reserve != -1
|
|
|
|
|
&& ! saw_option ("__size_of_stack_reserve__"))
|
|
|
|
|
{
|
|
|
|
|
pep.SizeOfStackReserve = pep_def_file->stack_reserve;
|
|
|
|
|
if (pep_def_file->stack_commit != -1)
|
|
|
|
|
pep.SizeOfStackCommit = pep_def_file->stack_commit;
|
|
|
|
|
}
|
|
|
|
|
if (pep_def_file->heap_reserve != -1
|
|
|
|
|
&& ! saw_option ("__size_of_heap_reserve__"))
|
|
|
|
|
{
|
|
|
|
|
pep.SizeOfHeapReserve = pep_def_file->heap_reserve;
|
|
|
|
|
if (pep_def_file->heap_commit != -1)
|
|
|
|
|
pep.SizeOfHeapCommit = pep_def_file->heap_commit;
|
|
|
|
|
}
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
gld_${EMULATION_NAME}_recognized_file (lang_input_statement_type *entry ATTRIBUTE_UNUSED)
|
|
|
|
|
{
|
2010-05-15 21:50:44 +02:00
|
|
|
|
is_underscoring ();
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
#ifdef TARGET_IS_i386pep
|
|
|
|
|
pep_dll_id_target ("pei-x86-64");
|
|
|
|
|
#endif
|
2007-08-06 16:32:08 +02:00
|
|
|
|
if (pep_bfd_is_dll (entry->the_bfd))
|
|
|
|
|
return pep_implied_import_dll (entry->filename);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
#endif
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
gld_${EMULATION_NAME}_finish (void)
|
|
|
|
|
{
|
2010-05-15 21:50:44 +02:00
|
|
|
|
is_underscoring ();
|
2006-09-20 13:35:11 +02:00
|
|
|
|
finish_default ();
|
|
|
|
|
|
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
if (link_info.shared
|
|
|
|
|
|| (!link_info.relocatable && pep_def_file->num_exports != 0))
|
|
|
|
|
{
|
2008-02-15 04:35:53 +01:00
|
|
|
|
pep_dll_fill_sections (link_info.output_bfd, &link_info);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
if (pep_implib_filename)
|
2009-01-03 19:04:16 +01:00
|
|
|
|
pep_dll_generate_implib (pep_def_file, pep_implib_filename, &link_info);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pep_out_def_filename)
|
|
|
|
|
pep_dll_generate_def_file (pep_out_def_filename);
|
|
|
|
|
#endif /* DLL_SUPPORT */
|
|
|
|
|
|
|
|
|
|
/* I don't know where .idata gets set as code, but it shouldn't be. */
|
|
|
|
|
{
|
2008-02-15 04:35:53 +01:00
|
|
|
|
asection *asec = bfd_get_section_by_name (link_info.output_bfd, ".idata");
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
if (asec)
|
|
|
|
|
{
|
|
|
|
|
asec->flags &= ~SEC_CODE;
|
|
|
|
|
asec->flags |= SEC_DATA;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Place an orphan section.
|
|
|
|
|
|
|
|
|
|
We use this to put sections in a reasonable place in the file, and
|
|
|
|
|
to ensure that they are aligned as required.
|
|
|
|
|
|
2009-01-05 13:17:43 +01:00
|
|
|
|
We handle grouped sections here as well. A section named .foo\$nn
|
2006-09-20 13:35:11 +02:00
|
|
|
|
goes into the output section .foo. All grouped sections are sorted
|
|
|
|
|
by name.
|
|
|
|
|
|
|
|
|
|
Grouped sections for the default sections are handled by the
|
|
|
|
|
default linker script using wildcards, and are sorted by
|
|
|
|
|
sort_sections. */
|
|
|
|
|
|
2008-10-20 14:14:29 +02:00
|
|
|
|
static lang_output_section_statement_type *
|
2008-10-04 08:08:59 +02:00
|
|
|
|
gld_${EMULATION_NAME}_place_orphan (asection *s,
|
|
|
|
|
const char *secname,
|
|
|
|
|
int constraint)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{
|
2008-10-03 11:40:49 +02:00
|
|
|
|
const char *orig_secname = secname;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
char *dollar = NULL;
|
|
|
|
|
lang_output_section_statement_type *os;
|
|
|
|
|
lang_statement_list_type add_child;
|
2010-01-14 05:56:12 +01:00
|
|
|
|
lang_output_section_statement_type *match_by_name = NULL;
|
2009-05-14 04:21:45 +02:00
|
|
|
|
lang_statement_union_type **pl;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
/* Look through the script to see where to place this section. */
|
|
|
|
|
if (!link_info.relocatable
|
2009-01-05 13:17:43 +01:00
|
|
|
|
&& (dollar = strchr (secname, '\$')) != NULL)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{
|
2008-10-03 11:40:49 +02:00
|
|
|
|
size_t len = dollar - secname;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
char *newname = xmalloc (len + 1);
|
2008-10-03 11:40:49 +02:00
|
|
|
|
memcpy (newname, secname, len);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
newname[len] = '\0';
|
|
|
|
|
secname = newname;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
lang_list_init (&add_child);
|
|
|
|
|
|
ld/
* ldlang.c (lang_output_section_statement_lookup): Add function
comment. Make "name" non-const. Ensure duplicate entries use
the same string, allowing simple comparison in hash bucket loop.
Tweak constraint check.
(next_matching_output_section_statement): New function.
* ldlang.h (lang_output_section_statement_lookup): Update.
(next_matching_output_section_statement): Declare.
* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
combine orphan sections when input sections flags differ in
alloc or load.
* emultempl/pe.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
* emultempl/pep.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
ld/testsuite/
* ld-elf/orphan3.d, * ld-elf/orphan3a.s, * ld-elf/orphan3b.s,
* ld-elf/orphan3c.s, * ld-elf/orphan3d.s, * ld-elf/orphan3e.s,
* ld-elf/orphan3f.s: New test.
* ld-pe/orphan.d, * ld-pe/orphana.s, * ld-pe/orphanb.s,
* ld-pe/orphand.s, * ld-pe/orphane.s: New test.
* ld-pe/direct.exp: Use is_pecoff_format.
* ld-pe/longsecn.exp: Delete.
* ld-pe/pe.exp: Run new test and longsecn tests.
2009-05-15 16:22:36 +02:00
|
|
|
|
os = NULL;
|
|
|
|
|
if (constraint == 0)
|
|
|
|
|
for (os = lang_output_section_find (secname);
|
|
|
|
|
os != NULL;
|
|
|
|
|
os = next_matching_output_section_statement (os, 0))
|
|
|
|
|
{
|
|
|
|
|
/* If we don't match an existing output section, tell
|
|
|
|
|
lang_insert_orphan to create a new output section. */
|
|
|
|
|
constraint = SPECIAL;
|
|
|
|
|
|
|
|
|
|
if (os->bfd_section != NULL
|
|
|
|
|
&& (os->bfd_section->flags == 0
|
|
|
|
|
|| ((s->flags ^ os->bfd_section->flags)
|
|
|
|
|
& (SEC_LOAD | SEC_ALLOC)) == 0))
|
|
|
|
|
{
|
|
|
|
|
/* We already have an output section statement with this
|
|
|
|
|
name, and its bfd section has compatible flags.
|
|
|
|
|
If the section already exists but does not have any flags set,
|
|
|
|
|
then it has been created by the linker, probably as a result of
|
|
|
|
|
a --section-start command line switch. */
|
|
|
|
|
lang_add_section (&add_child, s, os);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2010-01-14 05:56:12 +01:00
|
|
|
|
|
|
|
|
|
/* Save unused output sections in case we can match them
|
|
|
|
|
against orphans later. */
|
|
|
|
|
if (os->bfd_section == NULL)
|
|
|
|
|
match_by_name = os;
|
ld/
* ldlang.c (lang_output_section_statement_lookup): Add function
comment. Make "name" non-const. Ensure duplicate entries use
the same string, allowing simple comparison in hash bucket loop.
Tweak constraint check.
(next_matching_output_section_statement): New function.
* ldlang.h (lang_output_section_statement_lookup): Update.
(next_matching_output_section_statement): Declare.
* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
combine orphan sections when input sections flags differ in
alloc or load.
* emultempl/pe.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
* emultempl/pep.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
ld/testsuite/
* ld-elf/orphan3.d, * ld-elf/orphan3a.s, * ld-elf/orphan3b.s,
* ld-elf/orphan3c.s, * ld-elf/orphan3d.s, * ld-elf/orphan3e.s,
* ld-elf/orphan3f.s: New test.
* ld-pe/orphan.d, * ld-pe/orphana.s, * ld-pe/orphanb.s,
* ld-pe/orphand.s, * ld-pe/orphane.s: New test.
* ld-pe/direct.exp: Use is_pecoff_format.
* ld-pe/longsecn.exp: Delete.
* ld-pe/pe.exp: Run new test and longsecn tests.
2009-05-15 16:22:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
2010-01-14 05:56:12 +01:00
|
|
|
|
/* If we didn't match an active output section, see if we matched an
|
|
|
|
|
unused one and use that. */
|
|
|
|
|
if (os == NULL && match_by_name)
|
|
|
|
|
{
|
|
|
|
|
lang_add_section (&match_by_name->children, s, match_by_name);
|
|
|
|
|
return match_by_name;
|
|
|
|
|
}
|
|
|
|
|
|
ld/
* ldlang.c (lang_output_section_statement_lookup): Add function
comment. Make "name" non-const. Ensure duplicate entries use
the same string, allowing simple comparison in hash bucket loop.
Tweak constraint check.
(next_matching_output_section_statement): New function.
* ldlang.h (lang_output_section_statement_lookup): Update.
(next_matching_output_section_statement): Declare.
* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
combine orphan sections when input sections flags differ in
alloc or load.
* emultempl/pe.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
* emultempl/pep.em: Formatting throughout.
(gld${EMULATION_NAME}_place_orphan): As for elf32.em.
ld/testsuite/
* ld-elf/orphan3.d, * ld-elf/orphan3a.s, * ld-elf/orphan3b.s,
* ld-elf/orphan3c.s, * ld-elf/orphan3d.s, * ld-elf/orphan3e.s,
* ld-elf/orphan3f.s: New test.
* ld-pe/orphan.d, * ld-pe/orphana.s, * ld-pe/orphanb.s,
* ld-pe/orphand.s, * ld-pe/orphane.s: New test.
* ld-pe/direct.exp: Use is_pecoff_format.
* ld-pe/longsecn.exp: Delete.
* ld-pe/pe.exp: Run new test and longsecn tests.
2009-05-15 16:22:36 +02:00
|
|
|
|
if (os == NULL)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{
|
|
|
|
|
static struct orphan_save hold[] =
|
|
|
|
|
{
|
|
|
|
|
{ ".text",
|
|
|
|
|
SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE,
|
|
|
|
|
0, 0, 0, 0 },
|
2010-09-22 10:03:42 +02:00
|
|
|
|
{ ".idata",
|
|
|
|
|
SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_DATA,
|
|
|
|
|
0, 0, 0, 0 },
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{ ".rdata",
|
|
|
|
|
SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_DATA,
|
|
|
|
|
0, 0, 0, 0 },
|
|
|
|
|
{ ".data",
|
|
|
|
|
SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_DATA,
|
|
|
|
|
0, 0, 0, 0 },
|
|
|
|
|
{ ".bss",
|
|
|
|
|
SEC_ALLOC,
|
|
|
|
|
0, 0, 0, 0 }
|
|
|
|
|
};
|
|
|
|
|
enum orphan_save_index
|
|
|
|
|
{
|
|
|
|
|
orphan_text = 0,
|
2010-09-22 10:03:42 +02:00
|
|
|
|
orphan_idata,
|
2006-09-20 13:35:11 +02:00
|
|
|
|
orphan_rodata,
|
|
|
|
|
orphan_data,
|
|
|
|
|
orphan_bss
|
|
|
|
|
};
|
|
|
|
|
static int orphan_init_done = 0;
|
|
|
|
|
struct orphan_save *place;
|
|
|
|
|
lang_output_section_statement_type *after;
|
|
|
|
|
etree_type *address;
|
|
|
|
|
|
|
|
|
|
if (!orphan_init_done)
|
|
|
|
|
{
|
|
|
|
|
struct orphan_save *ho;
|
|
|
|
|
for (ho = hold; ho < hold + sizeof (hold) / sizeof (hold[0]); ++ho)
|
|
|
|
|
if (ho->name != NULL)
|
|
|
|
|
{
|
|
|
|
|
ho->os = lang_output_section_find (ho->name);
|
|
|
|
|
if (ho->os != NULL && ho->os->flags == 0)
|
|
|
|
|
ho->os->flags = ho->flags;
|
|
|
|
|
}
|
|
|
|
|
orphan_init_done = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Try to put the new output section in a reasonable place based
|
|
|
|
|
on the section name and section flags. */
|
|
|
|
|
|
|
|
|
|
place = NULL;
|
|
|
|
|
if ((s->flags & SEC_ALLOC) == 0)
|
|
|
|
|
;
|
|
|
|
|
else if ((s->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
|
|
|
|
|
place = &hold[orphan_bss];
|
|
|
|
|
else if ((s->flags & SEC_READONLY) == 0)
|
|
|
|
|
place = &hold[orphan_data];
|
|
|
|
|
else if ((s->flags & SEC_CODE) == 0)
|
2010-09-22 10:03:42 +02:00
|
|
|
|
{
|
|
|
|
|
place = (!strncmp (secname, ".idata\$", 7) ? &hold[orphan_idata]
|
|
|
|
|
: &hold[orphan_rodata]);
|
|
|
|
|
}
|
2006-09-20 13:35:11 +02:00
|
|
|
|
else
|
|
|
|
|
place = &hold[orphan_text];
|
|
|
|
|
|
|
|
|
|
after = NULL;
|
|
|
|
|
if (place != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (place->os == NULL)
|
|
|
|
|
place->os = lang_output_section_find (place->name);
|
|
|
|
|
after = place->os;
|
|
|
|
|
if (after == NULL)
|
|
|
|
|
after = lang_output_section_find_by_flags (s, &place->os, NULL);
|
|
|
|
|
if (after == NULL)
|
|
|
|
|
/* *ABS* is always the first output section statement. */
|
|
|
|
|
after = (&lang_output_section_statement.head
|
|
|
|
|
->output_section_statement);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* All sections in an executable must be aligned to a page boundary. */
|
|
|
|
|
address = exp_unop (ALIGN_K, exp_nameop (NAME, "__section_alignment__"));
|
2008-10-04 08:08:59 +02:00
|
|
|
|
os = lang_insert_orphan (s, secname, constraint, after, place, address,
|
|
|
|
|
&add_child);
|
2006-09-20 13:35:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-14 04:21:45 +02:00
|
|
|
|
/* If the section name has a '\$', sort it with the other '\$'
|
|
|
|
|
sections. */
|
|
|
|
|
for (pl = &os->children.head; *pl != NULL; pl = &(*pl)->header.next)
|
|
|
|
|
{
|
|
|
|
|
lang_input_section_type *ls;
|
|
|
|
|
const char *lname;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
2009-05-14 04:21:45 +02:00
|
|
|
|
if ((*pl)->header.type != lang_input_section_enum)
|
|
|
|
|
continue;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
2009-05-14 04:21:45 +02:00
|
|
|
|
ls = &(*pl)->input_section;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
2009-05-14 04:21:45 +02:00
|
|
|
|
lname = bfd_get_section_name (ls->section->owner, ls->section);
|
|
|
|
|
if (strchr (lname, '\$') != NULL
|
|
|
|
|
&& (dollar == NULL || strcmp (orig_secname, lname) < 0))
|
|
|
|
|
break;
|
|
|
|
|
}
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
2009-05-14 04:21:45 +02:00
|
|
|
|
if (add_child.head != NULL)
|
|
|
|
|
{
|
|
|
|
|
*add_child.tail = *pl;
|
|
|
|
|
*pl = add_child.head;
|
|
|
|
|
}
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
2008-10-20 14:14:29 +02:00
|
|
|
|
return os;
|
2006-09-20 13:35:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
gld_${EMULATION_NAME}_open_dynamic_archive
|
|
|
|
|
(const char *arch ATTRIBUTE_UNUSED,
|
|
|
|
|
search_dirs_type *search,
|
|
|
|
|
lang_input_statement_type *entry)
|
|
|
|
|
{
|
|
|
|
|
static const struct
|
|
|
|
|
{
|
|
|
|
|
const char * format;
|
|
|
|
|
bfd_boolean use_prefix;
|
|
|
|
|
}
|
|
|
|
|
libname_fmt [] =
|
|
|
|
|
{
|
|
|
|
|
/* Preferred explicit import library for dll's. */
|
|
|
|
|
{ "lib%s.dll.a", FALSE },
|
|
|
|
|
/* Alternate explicit import library for dll's. */
|
|
|
|
|
{ "%s.dll.a", FALSE },
|
|
|
|
|
/* "libfoo.a" could be either an import lib or a static lib.
|
|
|
|
|
For backwards compatibility, libfoo.a needs to precede
|
|
|
|
|
libfoo.dll and foo.dll in the search. */
|
|
|
|
|
{ "lib%s.a", FALSE },
|
2007-07-19 21:56:10 +02:00
|
|
|
|
/* The 'native' spelling of an import lib name is "foo.lib". */
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{ "%s.lib", FALSE },
|
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
/* Try "<prefix>foo.dll" (preferred dll name, if specified). */
|
|
|
|
|
{ "%s%s.dll", TRUE },
|
|
|
|
|
#endif
|
|
|
|
|
/* Try "libfoo.dll" (default preferred dll name). */
|
|
|
|
|
{ "lib%s.dll", FALSE },
|
|
|
|
|
/* Finally try 'native' dll name "foo.dll". */
|
|
|
|
|
{ "%s.dll", FALSE },
|
|
|
|
|
/* Note: If adding more formats to this table, make sure to check to
|
|
|
|
|
see if their length is longer than libname_fmt[0].format, and if
|
|
|
|
|
so, update the call to xmalloc() below. */
|
|
|
|
|
{ NULL, FALSE }
|
|
|
|
|
};
|
|
|
|
|
static unsigned int format_max_len = 0;
|
|
|
|
|
const char * filename;
|
|
|
|
|
char * full_string;
|
|
|
|
|
char * base_string;
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
|
|
|
2010-12-06 01:07:06 +01:00
|
|
|
|
if (! entry->maybe_archive)
|
2006-09-20 13:35:11 +02:00
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
filename = entry->filename;
|
|
|
|
|
|
|
|
|
|
if (format_max_len == 0)
|
|
|
|
|
/* We need to allow space in the memory that we are going to allocate
|
|
|
|
|
for the characters in the format string. Since the format array is
|
|
|
|
|
static we only need to calculate this information once. In theory
|
|
|
|
|
this value could also be computed statically, but this introduces
|
|
|
|
|
the possibility for a discrepancy and hence a possible memory
|
|
|
|
|
corruption. The lengths we compute here will be too long because
|
|
|
|
|
they will include any formating characters (%s) in the strings, but
|
|
|
|
|
this will not matter. */
|
|
|
|
|
for (i = 0; libname_fmt[i].format; i++)
|
|
|
|
|
if (format_max_len < strlen (libname_fmt[i].format))
|
|
|
|
|
format_max_len = strlen (libname_fmt[i].format);
|
|
|
|
|
|
|
|
|
|
full_string = xmalloc (strlen (search->name)
|
|
|
|
|
+ strlen (filename)
|
|
|
|
|
+ format_max_len
|
|
|
|
|
#ifdef DLL_SUPPORT
|
|
|
|
|
+ (pep_dll_search_prefix
|
|
|
|
|
? strlen (pep_dll_search_prefix) : 0)
|
|
|
|
|
#endif
|
|
|
|
|
/* Allow for the terminating NUL and for the path
|
|
|
|
|
separator character that is inserted between
|
|
|
|
|
search->name and the start of the format string. */
|
|
|
|
|
+ 2);
|
|
|
|
|
|
|
|
|
|
sprintf (full_string, "%s/", search->name);
|
|
|
|
|
base_string = full_string + strlen (full_string);
|
|
|
|
|
|
|
|
|
|
for (i = 0; libname_fmt[i].format; i++)
|
|
|
|
|
{
|
2007-07-19 21:56:10 +02:00
|
|
|
|
#ifdef DLL_SUPPORT
|
2006-09-20 13:35:11 +02:00
|
|
|
|
if (libname_fmt[i].use_prefix)
|
|
|
|
|
{
|
|
|
|
|
if (!pep_dll_search_prefix)
|
|
|
|
|
continue;
|
|
|
|
|
sprintf (base_string, libname_fmt[i].format, pep_dll_search_prefix, filename);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif
|
|
|
|
|
sprintf (base_string, libname_fmt[i].format, filename);
|
|
|
|
|
|
|
|
|
|
if (ldfile_try_open_bfd (full_string, entry))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!libname_fmt[i].format)
|
|
|
|
|
{
|
|
|
|
|
free (full_string);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
entry->filename = full_string;
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
gld_${EMULATION_NAME}_find_potential_libraries
|
|
|
|
|
(char *name, lang_input_statement_type *entry)
|
|
|
|
|
{
|
|
|
|
|
return ldfile_open_file_search (name, entry, "", ".lib");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
gld_${EMULATION_NAME}_get_script (int *isfile)
|
|
|
|
|
EOF
|
|
|
|
|
# Scripts compiled in.
|
|
|
|
|
# sed commands to quote an ld script as a C string.
|
|
|
|
|
sc="-f stringify.sed"
|
|
|
|
|
|
2007-07-19 21:56:10 +02:00
|
|
|
|
fragment <<EOF
|
2006-09-20 13:35:11 +02:00
|
|
|
|
{
|
|
|
|
|
*isfile = 0;
|
|
|
|
|
|
|
|
|
|
if (link_info.relocatable && config.build_constructors)
|
|
|
|
|
return
|
|
|
|
|
EOF
|
|
|
|
|
sed $sc ldscripts/${EMULATION_NAME}.xu >> e${EMULATION_NAME}.c
|
|
|
|
|
echo ' ; else if (link_info.relocatable) return' >> e${EMULATION_NAME}.c
|
|
|
|
|
sed $sc ldscripts/${EMULATION_NAME}.xr >> e${EMULATION_NAME}.c
|
|
|
|
|
echo ' ; else if (!config.text_read_only) return' >> e${EMULATION_NAME}.c
|
|
|
|
|
sed $sc ldscripts/${EMULATION_NAME}.xbn >> e${EMULATION_NAME}.c
|
|
|
|
|
echo ' ; else if (!config.magic_demand_paged) return' >> e${EMULATION_NAME}.c
|
|
|
|
|
sed $sc ldscripts/${EMULATION_NAME}.xn >> e${EMULATION_NAME}.c
|
2007-10-01 11:54:58 +02:00
|
|
|
|
if test -n "$GENERATE_AUTO_IMPORT_SCRIPT" ; then
|
2010-05-25 12:03:01 +02:00
|
|
|
|
echo ' ; else if (link_info.pei386_auto_import == 1 && link_info.pei386_runtime_pseudo_reloc != 2) return' >> e${EMULATION_NAME}.c
|
2007-10-01 11:54:58 +02:00
|
|
|
|
sed $sc ldscripts/${EMULATION_NAME}.xa >> e${EMULATION_NAME}.c
|
|
|
|
|
fi
|
2006-09-20 13:35:11 +02:00
|
|
|
|
echo ' ; else return' >> e${EMULATION_NAME}.c
|
|
|
|
|
sed $sc ldscripts/${EMULATION_NAME}.x >> e${EMULATION_NAME}.c
|
|
|
|
|
echo '; }' >> e${EMULATION_NAME}.c
|
|
|
|
|
|
2007-07-19 21:56:10 +02:00
|
|
|
|
fragment <<EOF
|
2006-09-20 13:35:11 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation =
|
|
|
|
|
{
|
|
|
|
|
gld_${EMULATION_NAME}_before_parse,
|
|
|
|
|
syslib_default,
|
|
|
|
|
hll_default,
|
|
|
|
|
gld_${EMULATION_NAME}_after_parse,
|
|
|
|
|
gld_${EMULATION_NAME}_after_open,
|
|
|
|
|
after_allocation_default,
|
|
|
|
|
set_output_arch_default,
|
|
|
|
|
ldemul_default_target,
|
|
|
|
|
gld_${EMULATION_NAME}_before_allocation,
|
|
|
|
|
gld_${EMULATION_NAME}_get_script,
|
|
|
|
|
"${EMULATION_NAME}",
|
|
|
|
|
"${OUTPUT_FORMAT}",
|
|
|
|
|
gld_${EMULATION_NAME}_finish,
|
|
|
|
|
NULL, /* Create output section statements. */
|
|
|
|
|
gld_${EMULATION_NAME}_open_dynamic_archive,
|
|
|
|
|
gld_${EMULATION_NAME}_place_orphan,
|
|
|
|
|
gld_${EMULATION_NAME}_set_symbols,
|
|
|
|
|
NULL, /* parse_args */
|
|
|
|
|
gld${EMULATION_NAME}_add_options,
|
|
|
|
|
gld${EMULATION_NAME}_handle_option,
|
|
|
|
|
gld_${EMULATION_NAME}_unrecognized_file,
|
|
|
|
|
gld_${EMULATION_NAME}_list_options,
|
|
|
|
|
gld_${EMULATION_NAME}_recognized_file,
|
|
|
|
|
gld_${EMULATION_NAME}_find_potential_libraries,
|
|
|
|
|
NULL /* new_vers_pattern. */
|
|
|
|
|
};
|
|
|
|
|
EOF
|